From 1a1263d9d866eb2b84b5ba7d24a3129325cc3572 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 10 Jul 2014 11:09:48 +0200
Subject: [PATCH 001/277] Rename Icinga\Web\Form\Decorator\BootstrapForm

We do not use bootstrap anymore but do not want the default Zend
decorators either so this decorator got a more common name.

refs #5525
---
 .../Web/Form/Decorator/BootstrapForm.php      | 105 ------------------
 .../Web/Form/Decorator/ElementWrapper.php     |  70 ++++++++++++
 public/css/icinga/forms.less                  |   6 +-
 3 files changed, 71 insertions(+), 110 deletions(-)
 delete mode 100644 library/Icinga/Web/Form/Decorator/BootstrapForm.php
 create mode 100644 library/Icinga/Web/Form/Decorator/ElementWrapper.php

diff --git a/library/Icinga/Web/Form/Decorator/BootstrapForm.php b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
deleted file mode 100644
index 89ad82780..000000000
--- a/library/Icinga/Web/Form/Decorator/BootstrapForm.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2013 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  2013 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>
- *
- */
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Form\Decorator;
-
-use Zend_Form_Decorator_Abstract;
-
-/**
- *  Decorator that styles forms in the DOM Bootstrap wants for it's forms
- *
- *  This component replaces the dt/dd wrapping of elements with the approach used by bootstrap.
- *
- *  Labels are drawn for all elements, except hidden, button and submit elements. If you want a
- *  placeholder for this elements, set the 'addLabelPlaceholder' property. This can be useful in
- *  cases where you want to put inputs with and inputs without labels on the same line and don't
- *  want buttons to 'jump'
- */
-class BootstrapForm extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * An array of elements that won't get a <label> dom added per default
-     *
-     * @var array
-     */
-    private static $noLabel = array(
-        'Zend_Form_Element_Hidden',
-        'Zend_Form_Element_Button',
-        'Zend_Form_Element_Submit'
-    );
-
-    /**
-     * Return the DOM for the element label
-     *
-     * @param   String $elementName     The name of the element
-     *
-     * @return  String                  The DOM for the form element's label
-     */
-    public function getLabel($elementName)
-    {
-        $label = $this->getElement()->getLabel();
-        if (!$label) {
-            $label = '&nbsp;';
-        }
-        if (in_array($this->getElement()->getType(), self::$noLabel)
-            && !$this->getElement()->getAttrib('addLabelPlaceholder', false)) {
-            $label = '';
-        } else {
-            if (in_array($this->getElement()->getType(), self::$noLabel)) {
-                $label = '&nbsp;';
-            }
-            $label = '<label for="' . $elementName . '">' . $label . '</label>';
-        }
-        return $label;
-    }
-
-    /**
-     * Render this element
-     *
-     * Renders as the following:
-     * <div class="form-group">
-     *      $dtLabel
-     *      $dtElement
-     * </div>
-     *
-     * @param  String $content      The content of the form element
-     *
-     * @return String               The decorated form element
-     */
-    public function render($content)
-    {
-        $el = $this->getElement();
-        $elementName = $el->getName();
-        $label = $this->getLabel($elementName);
-        return '<div class="form-group" id="' . $elementName . '-element">'
-                    . $label
-                    . $content
-               . '</div>';
-    }
-}
diff --git a/library/Icinga/Web/Form/Decorator/ElementWrapper.php b/library/Icinga/Web/Form/Decorator/ElementWrapper.php
new file mode 100644
index 000000000..b9c6e0ba7
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/ElementWrapper.php
@@ -0,0 +1,70 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Decorator_Abstract;
+
+/**
+ * Decorator that wraps form elements with their labels to allow easier styling
+ *
+ * Labels are drawn for all elements, except hidden, button and submit elements. If you want a
+ * placeholder for these elements, set the 'addLabelPlaceholder' property. This can be useful in
+ * cases where you want to put inputs with and inputs without labels on the same line and don't
+ * want buttons to 'jump'
+ */
+class ElementWrapper extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * An array of elements that won't get a <label> dom added per default
+     *
+     * @var array
+     */
+    protected static $noLabel = array(
+        'Zend_Form_Element_Hidden',
+        'Zend_Form_Element_Button',
+        'Zend_Form_Element_Submit'
+    );
+
+    /**
+     * Return the DOM for the element label
+     *
+     * @param   String  $elementName    The name of the element
+     *
+     * @return  String                  The DOM for the form element's label
+     */
+    public function getLabel($elementName)
+    {
+        $label = $this->getElement()->getLabel();
+        if (! $label) {
+            $label = '&nbsp;';
+        }
+
+        if (in_array($this->getElement()->getType(), self::$noLabel)
+            && false === $this->getElement()->getAttrib('addLabelPlaceholder', false)) {
+            $label = '';
+        } else {
+            if (in_array($this->getElement()->getType(), self::$noLabel)) {
+                $label = '&nbsp;';
+            }
+            $label = '<label for="' . $elementName . '">' . $label . '</label>';
+        }
+
+        return $label;
+    }
+
+    /**
+     * Render this element
+     *
+     * @param   String  $content    The content of the form element
+     *
+     * @return  String              The decorated form element
+     */
+    public function render($content)
+    {
+        $elementName = $this->getElement()->getName();
+        $label = $this->getLabel($elementName);
+        return '<div class="form-element" id="' . $elementName . '-element">' . $label . $content . '</div>';
+    }
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 54aa7937a..88d9bcefb 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -15,11 +15,7 @@ td.configTable {
   min-width: 300px;
 }
 
-div.config-form-group {
-  float: right;
-}
-
-.form-group {
+.form-element {
   margin-bottom: 1em;
 }
 

From 0dce204651c43314ab8dfa445aced4eb2c57dfe0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 10 Jul 2014 11:13:45 +0200
Subject: [PATCH 002/277] Refactor Icinga\Web\Form

We eagerly waited badly for a new approach to build forms, so here it is.
Should be the best compromise between the Zend_Form functionality and
our requirements regarding automatic submits.

refs #5525
---
 library/Icinga/Test/BaseTestCase.php |   8 +-
 library/Icinga/Web/Form.php          | 822 ++++++++++++---------------
 2 files changed, 350 insertions(+), 480 deletions(-)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 50f7bc1b9..9cc8ba519 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -315,13 +315,7 @@ namespace Icinga\Test {
         public function createForm($formClass, array $requestData = array())
         {
             $form = new $formClass;
-            // If the form has CSRF protection enabled, add the token to the request data, else all calls to
-            // isSubmittedAndValid will fail
-            $form->initCsrfToken();
-            $token = $form->getValue($form->getTokenElementName());
-            if ($token !== null) {
-                $requestData[$form->getTokenElementName()] = $token;
-            }
+            $form->setTokenDisabled(); // Disable CSRF protection else all calls to isSubmittedAndValid will fail
             $request = $this->getRequest();
             $request->setMethod('POST');
             $request->setPost($requestData);
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 6e276b1b3..f71f73119 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,46 +1,14 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2013 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  2013 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>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
-use Zend_Controller_Request_Abstract;
 use Zend_Form;
-use Zend_Config;
-use Zend_Form_Element_Submit;
-use Zend_Form_Element_Reset;
-use Zend_View_Interface;
-use Icinga\Web\Form\Element\Note;
-use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\BootstrapForm;
+use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\InvalidCSRFTokenException;
-use Icinga\Application\Config as IcingaConfig;
+use Icinga\Exception\ProgrammingError;
 
 /**
  * Base class for forms providing CSRF protection, confirmation logic and auto submission
@@ -48,57 +16,18 @@ use Icinga\Application\Config as IcingaConfig;
 class Form extends Zend_Form
 {
     /**
-     * The form's request object
-     *
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $request;
-
-    /**
-     * Main configuration
-     *
-     * Used as fallback if user preferences are not available.
-     *
-     * @var IcingaConfig
-     */
-    protected $config;
-
-    /**
-     * The preference object to use instead of the one from the user (used for testing)
-     *
-     * @var Zend_Config
-     */
-    protected $preferences;
-
-    /**
-     * Whether this form should NOT add random generated "challenge" tokens that are associated with the user's current
-     * session in order to prevent Cross-Site Request Forgery (CSRF). It is the form's responsibility to verify the
-     * existence and correctness of this token
-     *
-     * @var bool
-     */
-    protected $tokenDisabled = false;
-
-    /**
-     * Name of the CSRF token element (used to create non-colliding hashes)
+     * The title of this form
      *
      * @var string
      */
-    protected $tokenElementName = 'CSRFToken';
+    protected $title;
 
     /**
-     * Flag to indicate that form is already build
-     *
-     * @var bool
-     */
-    protected $created = false;
-
-    /**
-     * Session id used for CSRF token generation
+     * The view script to use when rendering this form
      *
      * @var string
      */
-    protected $sessionId;
+    protected $viewScript;
 
     /**
      * Label for submit button
@@ -119,44 +48,156 @@ class Form extends Zend_Form
     protected $cancelLabel;
 
     /**
-     * Last used note-id
+     * Whether this form should NOT add random generated "challenge" tokens that are associated with the user's current
+     * session in order to prevent Cross-Site Request Forgery (CSRF). It is the form's responsibility to verify the
+     * existence and correctness of this token
      *
-     * Helper to generate unique names for note elements
-     *
-     * @var int
+     * @var bool
      */
-    protected $last_note_id = 0;
+    protected $tokenDisabled = false;
 
     /**
-     * Getter for the session ID
+     * Name of the CSRF token element
      *
-     * If the ID has never been set, the ID from session_id() is returned
+     * @var string
+     */
+    protected $tokenElementName = 'CSRFToken';
+
+    /**
+     * Set this form's title
+     *
+     * @param   string  $title  The title to set
+     *
+     * @return  self
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * Return this form's title
      *
      * @return  string
      */
-    public function getSessionId()
+    public function getTitle()
     {
-        if (!$this->sessionId) {
-            $this->sessionId = session_id();
+        return $this->title;
+    }
+
+    /**
+     * Set the view script to use when rendering this form
+     *
+     * @param   string  $viewScript     The view script to use
+     *
+     * @return  self
+     */
+    public function setViewScript($viewScript)
+    {
+        $this->viewScript = $viewScript;
+        return $this;
+    }
+
+    /**
+     * Return the view script being used when rendering this form
+     *
+     * @return  string
+     */
+    public function getViewScript()
+    {
+        return $this->viewScript;
+    }
+
+    /**
+     * Set the label for the submit button of this form
+     *
+     * @param   string  $submitLabel    The label to set
+     *
+     * @return  self
+     */
+    public function setSubmitLabel($submitLabel)
+    {
+        $this->submitLabel = $submitLabel;
+        return $this;
+    }
+
+    /**
+     * Return the label for the submit button of this form
+     *
+     * @return  string
+     */
+    public function getSubmitLabel()
+    {
+        return $this->submitLabel;
+    }
+
+    /**
+     * Set the label for the cancel button of this form
+     *
+     * @param   string  $cancelLabel    The label to set
+     *
+     * @return  self
+     */
+    public function setCancelLabel($cancelLabel)
+    {
+        $this->cancelLabel = $cancelLabel;
+        return $this;
+    }
+
+    /**
+     * Return the label for the cancel button of this form
+     *
+     * @return  string
+     */
+    public function getCancelLabel()
+    {
+        return $this->cancelLabel;
+    }
+
+    /**
+     * Disable CSRF counter measure and remove its field if already added
+     *
+     * @param   bool    $disabled   Set true in order to disable CSRF protection for this form, otherwise false
+     *
+     * @return  self
+     */
+    public function setTokenDisabled($disabled = true)
+    {
+        $this->tokenDisabled = (bool) $disabled;
+
+        if ($disabled && $this->getElement($this->tokenElementName) !== null) {
+            $this->removeElement($this->tokenElementName);
         }
 
-        return $this->sessionId;
+        return $this;
     }
 
     /**
-     * Setter for the session ID
+     * Return whether CSRF counter measures are disabled for this form
      *
-     * This method should be used for testing purposes only
-     *
-     * @param   string      $sessionId
+     * @return  bool
      */
-    public function setSessionId($sessionId)
+    public function getTokenDisabled()
     {
-        $this->sessionId = $sessionId;
+        return $this->tokenDisabled;
     }
 
     /**
-     * Return the HTML element name of the CSRF token field
+     * Set the name to use for the CSRF element
+     *
+     * @param   string  $name   The name to set
+     *
+     * @return  self
+     */
+    public function setTokenElementName($name)
+    {
+        $this->tokenElementName = $name;
+        return $this;
+    }
+
+    /**
+     * Return the name of the CSRF element
      *
      * @return  string
      */
@@ -166,400 +207,40 @@ class Form extends Zend_Form
     }
 
     /**
-     * Render the form to HTML
+     * Return the current configuration for this form
      *
-     * @param   Zend_View_Interface     $view
-     *
-     * @return  string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        // Elements must be there to render the form
-        $this->buildForm();
-        return parent::render($view);
-    }
-
-    /**
-     * Add elements to this form (used by extending classes)
-     */
-    protected function create()
-    {
-
-    }
-
-    /**
-     * Method called before validation
-     */
-    protected function preValidation(array $data)
-    {
-
-    }
-
-    /**
-     * Setter for the request
-     *
-     * @param   Zend_Controller_Request_Abstract    $request
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * Getter for the request
-     *
-     * @return  Zend_Controller_Request_Abstract
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Set the configuration to be used for this form when no preferences are set yet
-     *
-     * @param   IcingaConfig    $cfg
-     *
-     * @return  self
-     */
-    public function setConfiguration($cfg)
-    {
-        $this->config = $cfg;
-        return $this;
-    }
-
-    /**
-     * Get the main configuration
-     *
-     * Returns the set configuration or an empty default one.
-     *
-     * @return  Zend_Config
-     */
-    public function getConfiguration()
-    {
-        if ($this->config === null) {
-            $this->config = new Zend_Config(array(), true);
-        }
-
-        return $this->config;
-    }
-
-    /**
-     * Set preferences to be used instead of the one from the user object (used for testing)
-     *
-     * @param   Zend_Config     $prefs
-     */
-    public function setUserPreferences($prefs)
-    {
-        $this->preferences = $prefs;
-    }
-
-    /**
-     * Return the preferences of the user or the overwritten ones
-     *
-     * @return  Zend_Config
-     */
-    public function getUserPreferences()
-    {
-        if ($this->preferences) {
-            return $this->preferences;
-        }
-
-        return $this->getRequest()->getUser()->getPreferences();
-    }
-
-    /**
-     * Create the form if not done already
-     *
-     * Adds all elements to the form
-     */
-    public function buildForm()
-    {
-        if ($this->created === false) {
-            $this->initCsrfToken();
-            $this->create();
-
-            if ($this->submitLabel) {
-                $this->addSubmitButton();
-            }
-
-            if ($this->cancelLabel) {
-                $this->addCancelButton();
-            }
-
-            // Empty action if not safe
-            if (!$this->getAction() && $this->getRequest()) {
-                $this->setAction($this->getRequest()->getRequestUri());
-            }
-
-            $this->created = true;
-        }
-    }
-
-    /**
-     * Setter for the cancel label
-     *
-     * @param   string  $cancelLabel
-     */
-    public function setCancelLabel($cancelLabel)
-    {
-        $this->cancelLabel = $cancelLabel;
-    }
-
-    /**
-     * Add cancel button to form
-     */
-    protected function addCancelButton()
-    {
-        $this->addElement(
-            new Zend_Form_Element_Reset(
-                array(
-                    'name' => 'btn_reset',
-                    'label' => $this->cancelLabel,
-                    'class' => 'btn pull-right'
-                )
-            )
-        );
-    }
-
-    /**
-     * Setter for the submit label
-     *
-     * @param   string  $submitLabel
-     */
-    public function setSubmitLabel($submitLabel)
-    {
-        $this->submitLabel = $submitLabel;
-    }
-
-    /**
-     * Add submit button to form
-     */
-    protected function addSubmitButton()
-    {
-        $this->addElement(
-            new Zend_Form_Element_Submit(
-                array(
-                    'name'  => 'btn_submit',
-                    'label' => $this->submitLabel
-                )
-            )
-        );
-    }
-
-    /**
-     * Add message to form
-     *
-     * @param   string      $message        The message to be displayed
-     * @param   int         $headingType    Whether it should be displayed as heading (1-6) or not (null)
-     */
-    public function addNote($message, $headingType = null)
-    {
-        $this->addElement(
-            new Note(
-                array(
-                    'escape'    => $headingType === null ? false : true,
-                    'name'      => sprintf('note_%s', $this->last_note_id++),
-                    'value'     => $headingType === null ? $message : sprintf(
-                        '<h%1$s>%2$s</h%1$s>',
-                        $headingType,
-                        $message
-                    )
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable automatic form submission on the given elements
-     *
-     * Enables automatic submission of this form once the user edits specific elements
-     *
-     * @param   array   $triggerElements    The element names which should auto-submit the form
-     *
-     * @throws  ProgrammingError            When an element is found which does not yet exist
-     */
-    public function enableAutoSubmit($triggerElements)
-    {
-        foreach ($triggerElements as $elementName) {
-            $element = $this->getElement($elementName);
-            if ($element !== null) {
-                $class = $element->getAttrib('class');
-                if ($class === null) {
-                    $class = 'autosubmit';
-                } else {
-                    $class .= ' autosubmit';
-                }
-                $element->setAttrib('class', $class);
-            } else {
-                throw new ProgrammingError(
-                    'You need to add the element "' . $elementName . '" to' .
-                    ' the form before automatic submission can be enabled!'
-                );
-            }
-        }
-    }
-
-    /**
-     * Check whether the form was submitted with a valid request
-     *
-     * Ensures that the current request method is POST, that the form was manually submitted and that the data provided
-     * in the request is valid and gets repopulated in case its invalid.
-     *
-     * @return  bool    True when the form is submitted and valid, otherwise false
-     */
-    public function isSubmittedAndValid()
-    {
-        if ($this->getRequest()->isPost() === false) {
-            return false;
-        }
-
-        $this->buildForm();
-        $checkData = $this->getRequest()->getParams();
-        $this->assertValidCsrfToken($checkData);
-
-        if ($this->isSubmitted()) {
-            // perform full validation if submitted
-            $this->preValidation($checkData);
-            return $this->isValid($checkData);
-        } else {
-            // only populate if not submitted
-            $this->populate($checkData);
-            $this->setAttrib('data-icinga-form-modified', 'true');
-            return false;
-        }
-    }
-
-    /**
-     * Check whether this form has been submitted
-     *
-     * Per default, this checks whether the button set with the 'setSubmitLabel' method
-     * is being submitted. For custom submission logic, this method must be overwritten
-     *
-     * @return  bool    True when the form is marked as submitted, otherwise false
-     */
-    public function isSubmitted()
-    {
-        // TODO: There are some missunderstandings and missconceptions to be
-        //       found in this class. If populate() etc would have been used as
-        //       designed this function would read as simple as:
-        //       return $this->getElement('btn_submit')->isChecked();
-
-        if ($this->submitLabel) {
-            $checkData = $this->getRequest()->getParams();
-            return isset($checkData['btn_submit']) && $checkData['btn_submit'];
-        }
-        return true;
-    }
-
-    /**
-     * Disable CSRF counter measure and remove its field if already added
-     *
-     * This method should be used for testing purposes only
-     *
-     * @param   bool    $disabled   Set true in order to disable CSRF tokens in
-     *                              this form (default: true), otherwise false
-     */
-    public function setTokenDisabled($disabled = true)
-    {
-        $this->tokenDisabled = (boolean) $disabled;
-
-        if ($disabled === true) {
-            $this->removeElement($this->tokenElementName);
-        }
-    }
-
-    /**
-     * Add CSRF counter measure field to form
-     */
-    public function initCsrfToken()
-    {
-        if (!$this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
-            $this->addElement(
-                'hidden',
-                $this->tokenElementName,
-                array(
-                    'value' => $this->generateCsrfTokenAsString()
-                )
-            );
-        }
-    }
-
-    /**
-     * Test the submitted data for a correct CSRF token
-     *
-     * @param   array   $checkData          The POST data send by the user
-     *
-     * @throws  InvalidCSRFTokenException   When CSRF Validation fails
-     */
-    public function assertValidCsrfToken(array $checkData)
-    {
-        if (!$this->tokenDisabled) {
-            if (!isset($checkData[$this->tokenElementName])
-                || !$this->hasValidCsrfToken($checkData[$this->tokenElementName])
-            ) {
-                throw new InvalidCSRFTokenException();
-            }
-        }
-    }
-
-    /**
-     * Check whether the form's CSRF token-field has a valid value
-     *
-     * @param   string  $elementValue   Value from the form element
-     *
-     * @return  bool
-     */
-    protected function hasValidCsrfToken($elementValue)
-    {
-        if ($this->getElement($this->tokenElementName) === null || strpos($elementValue, '|') === false) {
-            return false;
-        }
-
-        list($seed, $token) = explode('|', $elementValue);
-
-        if (!is_numeric($seed)) {
-            return false;
-        }
-
-        return $token === hash('sha256', $this->getSessionId() . $seed);
-    }
-
-    /**
-     * Generate a new (seed, token) pair
+     * Intended to be implemented by concrete form classes.
      *
      * @return  array
      */
-    public function generateCsrfToken()
+    public function getConfiguration()
     {
-        $seed = mt_rand();
-        $hash = hash('sha256', $this->getSessionId() . $seed);
-
-        return array($seed, $hash);
+        return array();
     }
 
     /**
-     * Return the string representation of the CSRF seed/token pair
+     * Create and return the elements to add to this form
      *
-     * @return  string
+     * Intended to be implemented by concrete form classes.
+     *
+     * @return  array
      */
-    public function generateCsrfTokenAsString()
+    public function createElements()
     {
-        list ($seed, $token) = $this->generateCsrfToken($this->getSessionId());
-        return sprintf('%s|%s', $seed, $token);
+        return array();
     }
 
     /**
      * Add a new element
      *
-     * Additionally, all DtDd tags will be removed and the Bootstrap compatible
-     * BootstrapForm decorator will be added to the elements
+     * Additionally, all structural form element decorators by Zend are replaced with our own ones.
      *
      * @param   string|Zend_Form_Element    $element    String element type, or an object of type Zend_Form_Element
      * @param   string                      $name       The name of the element to add if $element is a string
-     * @param   array                       $options    The settings for the element if $element is a string
+     * @param   array                       $options    The options for the element if $element is a string
      *
      * @return  self
+     *
      * @see     Zend_Form::addElement()
      */
     public function addElement($element, $name = null, $options = null)
@@ -569,13 +250,12 @@ class Form extends Zend_Form
 
         if ($el) {
             if (strpos(strtolower(get_class($el)), 'hidden') !== false) {
-                // Do not add structural elements to invisible elements which produces ugly views
                 $el->setDecorators(array('ViewHelper'));
             } else {
                 $el->removeDecorator('HtmlTag');
                 $el->removeDecorator('Label');
                 $el->removeDecorator('DtDdWrapper');
-                $el->addDecorator(new BootstrapForm());
+                $el->addDecorator(new ElementWrapper());
                 $el->addDecorator(new HelpText());
             }
         }
@@ -598,11 +278,207 @@ class Form extends Zend_Form
 
         $decorators = $this->getDecorators();
         if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
-                ->addDecorator('Form');
+            if ($this->viewScript) {
+                $this->addDecorator('ViewScript', array('viewScript' => $this->viewScript));
+            } else {
+                $this->addDecorator('FormElements')
+                    //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
+                    ->addDecorator('Form');
+            }
         }
 
         return $this;
     }
+
+    /**
+     * Create, add this form's elements and populate them with the given values
+     *
+     * @param   array   $values     The values with which to populate the elements
+     *
+     * @return  self
+     *
+     * @throws  ProgrammingError    In case the parent for a dependent field cannot be found
+     */
+    public function applyValues(array $values)
+    {
+        foreach ($this->createElements() as $element) {
+            $parentName = $element->getAttrib('depends');
+            if ($parentName !== null) {
+                $parent = $this->getElement($parentName);
+                if ($parent) {
+                    $parentValue = isset($values[$parentName]) ? $values[$parentName] : $parent->getValue();
+                    if ($parentValue != $element->getAttrib('requires')) {
+                        if ($element->getAttrib('action') === 'disable') {
+                            $this->addElement($element->setAttrib('disabled', 'disabled'));
+                        }
+                    } else {
+                        $this->addElement($element);
+                    }
+                } else {
+                    throw new ProgrammingError(
+                        'Cannot find parent "' . $parentName . '" for dependent field "' . $element->getName() . '"'
+                        . '(Correct usage of field dependencies requires their parents to occur beforehand in order)'
+                    );
+                }
+            } else {
+                $this->addElement($element);
+            }
+        }
+
+        $this->initCsrfToken();
+        $this->initSubmitButton();
+        $this->initCancelButton();
+        $this->populate($values);
+        return $this;
+    }
+
+    /**
+     * Check whether the form was submitted with a valid request
+     *
+     * Create and add this form's elements, populate them with the given request data and
+     * run a full validation if the form was submitted or a partial validation if not.
+     *
+     * @param   array   The request data to validate
+     *
+     * @return  bool    True when the form is submitted and valid, otherwise false
+     */
+    public function isSubmittedAndValid(array $data)
+    {
+        $this->applyValues(array_merge($this->getConfiguration(), $data));
+
+        if ($this->isSubmitted()) {
+            $this->assertValidCsrfToken($data);
+            return $this->isValid($data); // Run full validation once this form's data is going to be processed
+        } else {
+            $this->isValidPartial($data); // Run a partial validation to not to overwrite default values
+            return false;
+        }
+    }
+
+    /**
+     * Check whether this form has been submitted
+     *
+     * Per default, this checks whether the button set with the 'setSubmitLabel' method
+     * is being submitted. For custom submission logic, this method must be overwritten.
+     *
+     * @return  bool                True when the form has been submitted, otherwise false
+     *
+     * @throws  ProgrammingError    In case the submit button has not yet been created
+     */
+    public function isSubmitted()
+    {
+        if ($this->submitLabel) {
+            $submitBtn = $this->getElement('btn_submit');
+            if ($submitBtn) {
+                return $submitBtn->isChecked();
+            }
+
+            throw new ProgrammingError(
+                'Submit button not created yet. You need to call isSubmittedAndValid or applyValues beforehand!'
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Add submit button to this form
+     */
+    protected function initSubmitButton()
+    {
+        if ($this->submitLabel) {
+            $this->addElement(
+                'submit',
+                'btn_submit',
+                array(
+                    'label' => $this->submitLabel
+                )
+            );
+        }
+    }
+
+    /**
+     * Add cancel button to this form
+     */
+    protected function initCancelButton()
+    {
+        if ($this->cancelLabel) {
+            $this->addElement(
+                'reset',
+                'btn_reset',
+                array(
+                    'label' => $this->cancelLabel,
+                    'class' => 'pull-right'
+                )
+            );
+        }
+    }
+
+    /**
+     * Add CSRF counter measure field to this form
+     */
+    protected function initCsrfToken()
+    {
+        if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
+            $this->addElement(
+                'hidden',
+                $this->tokenElementName,
+                array(
+                    'value' => $this->generateCsrfToken()
+                )
+            );
+        }
+    }
+
+    /**
+     * Generate a new (seed, token) pair
+     *
+     * @return  string
+     */
+    protected function generateCsrfToken()
+    {
+        $seed = mt_rand();
+        $hash = hash('sha256', session_id() . $seed);
+        return sprintf('%s|%s', $seed, $hash);
+    }
+
+    /**
+     * Test the submitted data for a correct CSRF token
+     *
+     * @param   array   $requestData        The POST data sent by the user
+     *
+     * @throws  InvalidCSRFTokenException   When CSRF Validation fails
+     */
+    protected function assertValidCsrfToken(array $requestData)
+    {
+        if (false === $this->tokenDisabled) {
+            if (false === isset($requestData[$this->tokenElementName])
+                || false === $this->isValidCsrfToken($requestData[$this->tokenElementName])
+            ) {
+                throw new InvalidCSRFTokenException();
+            }
+        }
+    }
+
+    /**
+     * Check whether the given value is a valid CSRF token for the current session
+     *
+     * @param   string  $token  Value from the CSRF form element
+     *
+     * @return  bool
+     */
+    protected function isValidCsrfToken($token)
+    {
+        if (strpos($token, '|') === false) {
+            return false;
+        }
+
+        list($seed, $hash) = explode('|', $token);
+
+        if (false === is_numeric($seed)) {
+            return false;
+        }
+
+        return $hash === hash('sha256', session_id() . $seed);
+    }
 }

From 630b36e706b9b241554eb203f60d48ea55dfedc4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 10 Jul 2014 11:15:46 +0200
Subject: [PATCH 003/277] Adjust Icinga\Form\Authentication\LoginForm to suit
 the new form builder

refs #5525
---
 .../controllers/AuthenticationController.php  | 27 ++++----
 .../forms/Authentication/LoginForm.php        | 61 +++++++++++++------
 2 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index cfbbafe4d..eaca4e97b 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -60,7 +60,6 @@ class AuthenticationController extends ActionController
     {
         $auth = $this->Auth();
         $this->view->form = new LoginForm();
-        $this->view->form->setRequest($this->_request);
         $this->view->title = $this->translate('Icingaweb Login');
 
         try {
@@ -85,18 +84,7 @@ class AuthenticationController extends ActionController
             }
 
             $chain = new AuthChain($config);
-            if ($this->getRequest()->isGet()) {
-                $user = new User('');
-                foreach ($chain as $backend) {
-                    if ($backend instanceof AutoLoginBackend) {
-                        $authenticated  = $backend->authenticate($user);
-                        if ($authenticated === true) {
-                            $auth->setAuthenticated($user);
-                            $this->rerenderLayout()->redirectNow($redirectUrl);
-                        }
-                    }
-                }
-            } elseif ($this->view->form->isSubmittedAndValid()) {
+            if ($this->view->form->isSubmittedAndValid($this->_request->getParams())) {
                 $user = new User($this->view->form->getValue('username'));
                 $password = $this->view->form->getValue('password');
                 $backendsTried = 0;
@@ -136,7 +124,7 @@ class AuthenticationController extends ActionController
                     );
                 }
                 if ($backendsWithError) {
-                    $this->view->form->addNote(
+                    $this->view->form->getElement('username')->addError(
                         $this->translate(
                             'Note that not all authentication backends are available for authentication because they'
                             . ' have errors. Please check the system log or Icinga Web 2 log for more information'
@@ -144,6 +132,17 @@ class AuthenticationController extends ActionController
                     );
                 }
                 $this->view->form->getElement('password')->addError($this->translate('Incorrect username or password'));
+            } elseif (false === $this->view->form->isSubmitted()) {
+                $user = new User('');
+                foreach ($chain as $backend) {
+                    if ($backend instanceof AutoLoginBackend) {
+                        $authenticated  = $backend->authenticate($user);
+                        if ($authenticated === true) {
+                            $auth->setAuthenticated($user);
+                            $this->rerenderLayout()->redirectNow($redirectUrl);
+                        }
+                    }
+                }
             }
         } catch (Exception $e) {
             $this->view->errorInfo = $e->getMessage();
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index b9eb2f27d..c6e5b23da 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Form\Authentication;
 
@@ -10,34 +12,55 @@ use Icinga\Web\Form;
 class LoginForm extends Form
 {
     /**
-     * Disable CSRF protection
-     * @var bool
+     * Initialize this login form
      */
-    protected $tokenDisabled = true;
+    public function init()
+    {
+        $this->setTokenDisabled();
+        $this->setName('form_login');
+        $this->setSubmitLabel('Login');
+    }
 
     /**
-     * Interface how the form should be created
+     * @see Form::createElements()
      */
-    protected function create()
+    public function createElements()
     {
-        $this->setName('form_login');
-        $this->addElement('text', 'username', array(
-            'label'       => t('Username'),
-            'placeholder' => t('Please enter your username...'),
-            'required'    => true,
-        ));
+        return array(
+            $this->createElement(
+                'text',
+                'username',
+                array(
+                    'label'       => t('Username'),
+                    'placeholder' => t('Please enter your username...'),
+                    'required'    => true
+                )
+            ),
+            $this->createElement(
+                'password',
+                'password',
+                array(
+                    'label'       => t('Password'),
+                    'placeholder' => t('...and your password'),
+                    'required'    => true
+                )
+            )
+        );
+    }
 
-        $this->addElement('password', 'password', array(
-            'label'       => t('Password'),
-            'placeholder' => t('...and your password'),
-            'required'    => true
-        ));
-        // TODO: We need a place to intercept filled forms before rendering
-        if (isset($_POST['username'])) {
+    /**
+     * @see Form::applyValues()
+     */
+    public function applyValues(array $values)
+    {
+        parent::applyValues($values);
+
+        if (isset($values['username'])) {
             $this->getElement('password')->setAttrib('class', 'autofocus');
         } else {
             $this->getElement('username')->setAttrib('class', 'autofocus');
         }
-        $this->setSubmitLabel('Login');
+
+        return $this;
     }
 }

From 6690410c4256831e95f4167eabbdb9243a742160 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 10 Jul 2014 11:16:31 +0200
Subject: [PATCH 004/277] Adjust Icinga\Form\Config\LoggingForm to suit the new
 form builder

refs #5525
---
 application/controllers/ConfigController.php |  11 +-
 application/forms/Config/LoggingForm.php     | 229 ++++++++-----------
 2 files changed, 102 insertions(+), 138 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index ce87f4bf7..0e048a2ed 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -113,16 +113,17 @@ class ConfigController extends BaseConfigController
         $this->view->tabs->activate('logging');
 
         $form = new LoggingForm();
-        $form->setConfiguration(IcingaConfig::app());
-        $form->setRequest($this->_request);
-        if ($form->isSubmittedAndValid()) {
-            if (!$this->writeConfigFile($form->getConfig(), 'config')) {
+        if ($form->isSubmittedAndValid($this->_request->getParams())) {
+            $appConfig = IcingaConfig::app();
+            $appConfig['logging'] = $form->getValues();
+            if (false === $this->writeConfigFile($appConfig, 'config')) {
                 return;
             }
+
             Notification::success('New configuration has sucessfully been stored');
-            $form->setConfiguration(IcingaConfig::app(), true);
             $this->redirectNow('config/logging');
         }
+
         $this->view->form = $form;
     }
 
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index 0a343a7c0..286a6b335 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -1,35 +1,10 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2013 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  2013 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>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Form\Config;
 
-use \Zend_Config;
+use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Application\Icinga;
 use Icinga\Web\Form\Validator\WritablePathValidator;
@@ -40,47 +15,39 @@ use Icinga\Web\Form\Validator\WritablePathValidator;
 class LoggingForm extends Form
 {
     /**
-     * Return the default logging directory for type "file"
-     *
-     * @return  string
+     * Initialize this logging configuration form
      */
-    protected function getDefaultLogDir()
+    public function init()
     {
-        return realpath(Icinga::app()->getApplicationDir() . '/../var/log/icingaweb.log');
+        $this->setName('form_config_logging');
+        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
     }
 
     /**
-     * Create this logging configuration form
-     *
-     * @see Form::create()
+     * @see Form::createElements()
      */
-    public function create()
+    public function createElements()
     {
-        $this->setName('form_config_logging');
+        $elements = array();
 
-        $config = $this->getConfiguration();
-        if (($loggingConfig = $config->logging) === null) {
-            $loggingConfig = new Zend_Config(array());
-        }
-
-        $this->addElement(
+        $elements[] = $this->createElement(
             'checkbox',
-            'logging_enable',
+            'enable',
             array(
                 'required'  => true,
                 'label'     => t('Logging Enabled'),
                 'helptext'  => t('Check this to enable logging.'),
-                'value'     => $loggingConfig->enable ? 1 : 0
+                'value'     => 0
             )
         );
-        $this->addElement(
+        $elements[] = $this->createElement(
             'select',
-            'logging_level',
+            'level',
             array(
                 'required'      => true,
                 'label'         => t('Logging Level'),
                 'helptext'      => t('The maximum loglevel to emit.'),
-                'value'         => intval($loggingConfig->get('level', 0)),
+                'value'         => 0,
                 'multiOptions'  => array(
                     0 => t('Error'),
                     1 => t('Warning'),
@@ -89,115 +56,111 @@ class LoggingForm extends Form
                 )
             )
         );
-        $this->addElement(
+        $elements[] = $this->createElement(
             'select',
-            'logging_type',
+            'type',
             array(
                 'required'      => true,
+                'class'         => 'autosubmit',
                 'label'         => t('Logging Type'),
                 'helptext'      => t('The type of logging to utilize.'),
-                'value'         => $loggingConfig->get('type', 'file'),
+                'value'         => 'file',
                 'multiOptions'  => array(
                     'file'      => t('File'),
                     'syslog'    => 'Syslog'
                 )
             )
         );
-        $this->enableAutoSubmit(array('logging_type'));
-
-        switch ($this->getRequest()->getParam('logging_type', $loggingConfig->get('type', 'file')))
-        {
-            case 'syslog':
-                $this->addElement(
-                    'text',
-                    'logging_application',
+        $elements[] = $this->createElement(
+            'text',
+            'application',
+            array(
+                'depends'       => 'type',
+                'requires'      => 'syslog',
+                'required'      => true,
+                'label'         => t('Application Prefix'),
+                'helptext'      => t('The name of the application by which to prefix syslog messages.'),
+                'value'         => 'icingaweb',
+                'validators'    => array(
                     array(
-                        'required'  => true,
-                        'label'     => t('Application Prefix'),
-                        'helptext'  => t('The name of the application by which to prefix syslog messages.'),
-                        'value'     => $loggingConfig->get('application', 'icingaweb'),
-                        'validators' => array(
-                            array(
-                                'Regex',
-                                false,
-                                array(
-                                    'pattern'  => '/^[^\W]+$/',
-                                    'messages' => array(
-                                        'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
-                                    )
-                                )
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\W]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
                             )
                         )
                     )
-                );
-                $this->addElement(
-                    'select',
-                    'logging_facility',
-                    array(
-                        'required'      => true,
-                        'label'         => t('Facility'),
-                        'helptext'      => t('The Syslog facility to utilize.'),
-                        'value'         => $loggingConfig->get('facility', 'LOG_USER'),
-                        'multiOptions'  => array(
-                            'LOG_USER' => 'LOG_USER'
-                        )
-                    )
-                );
-                break;
-            case 'file':
-            default:
-                $this->addElement(
-                    'text',
-                    'logging_target',
-                    array(
-                        'required'      => true,
-                        'label'         => t('Filepath'),
-                        'helptext'      => t('The logfile to write messages to.'),
-                        'value'         => $loggingConfig->target ? $loggingConfig->target : $this->getDefaultLogDir(),
-                        'validators'    => array(new WritablePathValidator())
-                    )
-                );
-        }
+                )
+            )
+        );
+        $elements[] = $this->createElement(
+            'select',
+            'facility',
+            array(
+                'depends'       => 'type',
+                'requires'      => 'syslog',
+                'required'      => true,
+                'label'         => t('Facility'),
+                'helptext'      => t('The Syslog facility to utilize.'),
+                'value'         => 'LOG_USER',
+                'multiOptions'  => array(
+                    'LOG_USER'  => 'LOG_USER'
+                )
+            )
+        );
+        $elements[] = $this->createElement(
+            'text',
+            'target',
+            array(
+                'depends'       => 'type',
+                'requires'      => 'file',
+                'required'      => true,
+                'label'         => t('Filepath'),
+                'helptext'      => t('The logfile to write messages to.'),
+                'value'         => $this->getDefaultLogDir(),
+                'validators'    => array(new WritablePathValidator())
+            )
+        );
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
-    }
-
-    public function isValid($data) {
-        foreach ($this->getElements() as $key => $element) {
-            // Initialize all empty elements with their default values.
-            if (!isset($data[$key])) {
-                $data[$key] = $element->getValue();
-            }
-        }
-        return parent::isValid($data);
+        return $elements;
     }
 
     /**
-     * Return a Zend_Config object containing the state defined in this form
+     * Return the current logging configuration
      *
-     * @return  Zend_Config     The config defined in this form
+     * @return  array
      */
-    public function getConfig()
+    public function getConfiguration()
     {
-        $values = $this->getValues();
-        $cfg = $this->getConfiguration()->toArray();
-
-        $cfg['logging']['enable'] = $values['logging_enable'] == 1;
-        $cfg['logging']['level'] = $values['logging_level'];
-
-        switch ($values['logging_type'])
-        {
-            case 'file':
-                $cfg['logging']['type'] = 'file';
-                $cfg['logging']['target'] = $values['logging_target'];
-                break;
-            case 'syslog':
-                $cfg['logging']['type'] = 'syslog';
-                $cfg['logging']['application'] = $values['logging_application'];
-                $cfg['logging']['facility'] = $values['logging_facility'];
-                break;
+        $loggingConfig = Icinga::app()->getConfig()->logging;
+        if ($loggingConfig === null) {
+            $loggingConfig = new Zend_Config(array());
         }
 
-        return new Zend_Config($cfg);
+        $config = array();
+        $config['enable'] = $loggingConfig->enable ? 1 : 0;
+        $config['level'] = $loggingConfig->level;
+        $config['type'] = $loggingConfig->type;
+
+        if ($loggingConfig->type === 'file') {
+            $config['target'] = $loggingConfig->target;
+        } elseif ($loggingConfig->type === 'syslog') {
+            $config['application'] = $loggingConfig->application;
+            $config['facility'] = $loggingConfig->facility;
+        }
+
+        return $config;
+    }
+
+    /**
+     * Return the default logging directory for type "file"
+     *
+     * @return  string
+     */
+    protected function getDefaultLogDir()
+    {
+        return realpath(Icinga::app()->getApplicationDir() . '/../var/log/icingaweb.log');
     }
 }

From 47ae4d79dc03d0e4f4690aa54dfe5b5136afc75f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:21:11 +0200
Subject: [PATCH 005/277] Forms do not need a special title property

As our upcoming wizard has no menu and our tabs are hardcoded we do not
need a special "title" property anymore.

refs #5525
---
 library/Icinga/Web/Form.php | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 84d17bbbf..d291a7c63 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -16,13 +16,6 @@ use Icinga\Exception\ProgrammingError;
  */
 class Form extends Zend_Form
 {
-    /**
-     * The title of this form
-     *
-     * @var string
-     */
-    protected $title;
-
     /**
      * The view script to use when rendering this form
      *
@@ -64,29 +57,6 @@ class Form extends Zend_Form
      */
     protected $tokenElementName = 'CSRFToken';
 
-    /**
-     * Set this form's title
-     *
-     * @param   string  $title  The title to set
-     *
-     * @return  self
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-        return $this;
-    }
-
-    /**
-     * Return this form's title
-     *
-     * @return  string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
     /**
      * Set the view script to use when rendering this form
      *

From 21cd503ee79aced9b12bba9f4f9fadd5fdd2c287 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:24:49 +0200
Subject: [PATCH 006/277] Form buttons need to be added explicitly

We either demand the user to add a submit button or provide a implicit
function call to be implemented by him, adding additional elements once
the form gets rendered.

refs #5525
---
 library/Icinga/Web/Form.php | 97 -------------------------------------
 1 file changed, 97 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index d291a7c63..6a90e3139 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -23,24 +23,6 @@ class Form extends Zend_Form
      */
     protected $viewScript;
 
-    /**
-     * Label for submit button
-     *
-     * If omitted, no button will be shown
-     *
-     * @var string
-     */
-    protected $submitLabel;
-
-    /**
-     * Label for cancel button
-     *
-     * If omitted, no button will be shown
-     *
-     * @var string
-     */
-    protected $cancelLabel;
-
     /**
      * Whether this form should NOT add random generated "challenge" tokens that are associated with the user's current
      * session in order to prevent Cross-Site Request Forgery (CSRF). It is the form's responsibility to verify the
@@ -80,52 +62,6 @@ class Form extends Zend_Form
         return $this->viewScript;
     }
 
-    /**
-     * Set the label for the submit button of this form
-     *
-     * @param   string  $submitLabel    The label to set
-     *
-     * @return  self
-     */
-    public function setSubmitLabel($submitLabel)
-    {
-        $this->submitLabel = $submitLabel;
-        return $this;
-    }
-
-    /**
-     * Return the label for the submit button of this form
-     *
-     * @return  string
-     */
-    public function getSubmitLabel()
-    {
-        return $this->submitLabel;
-    }
-
-    /**
-     * Set the label for the cancel button of this form
-     *
-     * @param   string  $cancelLabel    The label to set
-     *
-     * @return  self
-     */
-    public function setCancelLabel($cancelLabel)
-    {
-        $this->cancelLabel = $cancelLabel;
-        return $this;
-    }
-
-    /**
-     * Return the label for the cancel button of this form
-     *
-     * @return  string
-     */
-    public function getCancelLabel()
-    {
-        return $this->cancelLabel;
-    }
-
     /**
      * Disable CSRF counter measure and remove its field if already added
      *
@@ -352,39 +288,6 @@ class Form extends Zend_Form
         return false;
     }
 
-    /**
-     * Add submit button to this form
-     */
-    protected function initSubmitButton()
-    {
-        if ($this->submitLabel) {
-            $this->addElement(
-                'submit',
-                'btn_submit',
-                array(
-                    'label' => $this->submitLabel
-                )
-            );
-        }
-    }
-
-    /**
-     * Add cancel button to this form
-     */
-    protected function initCancelButton()
-    {
-        if ($this->cancelLabel) {
-            $this->addElement(
-                'reset',
-                'btn_reset',
-                array(
-                    'label' => $this->cancelLabel,
-                    'class' => 'pull-right'
-                )
-            );
-        }
-    }
-
     /**
      * Add CSRF counter measure field to this form
      */

From 802c095bf845640edb81edf53c929e8f59829e26 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:27:10 +0200
Subject: [PATCH 007/277] Configuration values need to be inserted to forms
 explicitly

It's the controllers' responsibility to ensure that forms are populated with
configuration values on GET requests.

refs #5525
---
 library/Icinga/Web/Form.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 6a90e3139..73ec27331 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -113,18 +113,6 @@ class Form extends Zend_Form
         return $this->tokenElementName;
     }
 
-    /**
-     * Return the current configuration for this form
-     *
-     * Intended to be implemented by concrete form classes.
-     *
-     * @return  array
-     */
-    public function getConfiguration()
-    {
-        return array();
-    }
-
     /**
      * Create and return the elements to add to this form
      *

From 58188c5cc1a05c4d30129a4aed74340deedf49d7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:33:09 +0200
Subject: [PATCH 008/277] We only want to rely on Form::isValid() when about to
 process forms

As the new auto-submission implementation does not depend on whether
a submit button was pressed or not we need another way to determine
whether a form should be processed.

refs #5525
---
 library/Icinga/Web/Form.php | 92 -------------------------------------
 1 file changed, 92 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 73ec27331..026db2abe 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -9,7 +9,6 @@ use Icinga\Web\Session;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\InvalidCSRFTokenException;
-use Icinga\Exception\ProgrammingError;
 
 /**
  * Base class for forms providing CSRF protection, confirmation logic and auto submission
@@ -185,97 +184,6 @@ class Form extends Zend_Form
         return $this;
     }
 
-    /**
-     * Create, add this form's elements and populate them with the given values
-     *
-     * @param   array   $values     The values with which to populate the elements
-     *
-     * @return  self
-     *
-     * @throws  ProgrammingError    In case the parent for a dependent field cannot be found
-     */
-    public function applyValues(array $values)
-    {
-        foreach ($this->createElements() as $element) {
-            $parentName = $element->getAttrib('depends');
-            if ($parentName !== null) {
-                $parent = $this->getElement($parentName);
-                if ($parent) {
-                    $parentValue = isset($values[$parentName]) ? $values[$parentName] : $parent->getValue();
-                    if ($parentValue != $element->getAttrib('requires')) {
-                        if ($element->getAttrib('action') === 'disable') {
-                            $this->addElement($element->setAttrib('disabled', 'disabled'));
-                        }
-                    } else {
-                        $this->addElement($element);
-                    }
-                } else {
-                    throw new ProgrammingError(
-                        'Cannot find parent "' . $parentName . '" for dependent field "' . $element->getName() . '"'
-                        . '(Correct usage of field dependencies requires their parents to occur beforehand in order)'
-                    );
-                }
-            } else {
-                $this->addElement($element);
-            }
-        }
-
-        $this->initCsrfToken();
-        $this->initSubmitButton();
-        $this->initCancelButton();
-        $this->populate($values);
-        return $this;
-    }
-
-    /**
-     * Check whether the form was submitted with a valid request
-     *
-     * Create and add this form's elements, populate them with the given request data and
-     * run a full validation if the form was submitted or a partial validation if not.
-     *
-     * @param   array   The request data to validate
-     *
-     * @return  bool    True when the form is submitted and valid, otherwise false
-     */
-    public function isSubmittedAndValid(array $data)
-    {
-        $this->applyValues(array_merge($this->getConfiguration(), $data));
-
-        if ($this->isSubmitted()) {
-            $this->assertValidCsrfToken($data);
-            return $this->isValid($data); // Run full validation once this form's data is going to be processed
-        } else {
-            $this->isValidPartial($data); // Run a partial validation to not to overwrite default values
-            return false;
-        }
-    }
-
-    /**
-     * Check whether this form has been submitted
-     *
-     * Per default, this checks whether the button set with the 'setSubmitLabel' method
-     * is being submitted. For custom submission logic, this method must be overwritten.
-     *
-     * @return  bool                True when the form has been submitted, otherwise false
-     *
-     * @throws  ProgrammingError    In case the submit button has not yet been created
-     */
-    public function isSubmitted()
-    {
-        if ($this->submitLabel) {
-            $submitBtn = $this->getElement('btn_submit');
-            if ($submitBtn) {
-                return $submitBtn->isChecked();
-            }
-
-            throw new ProgrammingError(
-                'Submit button not created yet. You need to call isSubmittedAndValid or applyValues beforehand!'
-            );
-        }
-
-        return false;
-    }
-
     /**
      * Add CSRF counter measure field to this form
      */

From 37fd3deb677768300811bd8c7b2c2d6019b20501 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:43:03 +0200
Subject: [PATCH 009/277] Rename initCsrfToken to addCsrfToken and move it
 upwards

Form::addCsrfToken() should be public and fluent to ensure more
flexibility.

refs #5525
---
 library/Icinga/Web/Form.php | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 026db2abe..e939d558e 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -157,6 +157,26 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Add CSRF counter measure field to this form
+     *
+     * @return  self
+     */
+    public function addCsrfToken()
+    {
+        if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
+            $this->addElement(
+                'hidden',
+                $this->tokenElementName,
+                array(
+                    'value' => $this->generateCsrfToken()
+                )
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Load the default decorators
      *
@@ -184,22 +204,6 @@ class Form extends Zend_Form
         return $this;
     }
 
-    /**
-     * Add CSRF counter measure field to this form
-     */
-    protected function initCsrfToken()
-    {
-        if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
-            $this->addElement(
-                'hidden',
-                $this->tokenElementName,
-                array(
-                    'value' => $this->generateCsrfToken()
-                )
-            );
-        }
-    }
-
     /**
      * Generate a new (seed, token) pair
      *

From 78a6175acc9faed7378b54c4741aa40e4728c094 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:51:15 +0200
Subject: [PATCH 010/277] Make form creation lazy and implement the new
 validation mechanism

Form creation must not depend on specific function calls. If a forms' elements are required and missing, create them. Form::isValid() must be
able to determine whether a form can be processed or not without to rely
on a particular button value.

refs #5525
---
 library/Icinga/Web/Form.php | 120 +++++++++++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index e939d558e..c9e3e7bcf 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -4,7 +4,9 @@
 
 namespace Icinga\Web;
 
+use LogicException;
 use Zend_Form;
+use Zend_View_Interface;
 use Icinga\Web\Session;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
@@ -15,6 +17,13 @@ use Icinga\Web\Form\InvalidCSRFTokenException;
  */
 class Form extends Zend_Form
 {
+    /**
+     * Whether this form has been created
+     *
+     * @var bool
+     */
+    protected $created = false;
+
     /**
      * The view script to use when rendering this form
      *
@@ -112,14 +121,34 @@ class Form extends Zend_Form
         return $this->tokenElementName;
     }
 
+    /**
+     * Create this form
+     *
+     * @param   array   $formData   The data to populate the form with
+     *
+     * @return  self
+     */
+    public function create(array $formData = array())
+    {
+        if (false === $this->created) {
+            $this->addElements($this->createElements($formData));
+            $this->addCsrfToken();
+            $this->created = true;
+        }
+
+        return $this;
+    }
+
     /**
      * Create and return the elements to add to this form
      *
      * Intended to be implemented by concrete form classes.
      *
+     * @param   array   $formData   The data to populate the elements with
+     *
      * @return  array
      */
-    public function createElements()
+    public function createElements(array $formData)
     {
         return array();
     }
@@ -177,6 +206,82 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Populate the elements with the given values
+     *
+     * @param   array   $defaults   The values to populate the elements with
+     */
+    public function setDefaults(array $defaults)
+    {
+        $this->create($defaults);
+        return parent::setDefaults($defaults);
+    }
+
+    /**
+     * Return whether the given data provides a value for each element of this form
+     *
+     * @param   array   $formData   The data to check
+     *
+     * @return  bool
+     *
+     * @throws  LogicException      In case this form has no elements
+     */
+    public function isComplete(array $formData)
+    {
+        $elements = $this->create($formData)->getElements();
+        if (empty($elements)) {
+            throw new LogicException('Forms without elements cannot be complete');
+        }
+
+        $missingValues = array_diff_key($elements, $formData);
+        return empty($missingValues);
+    }
+
+    /**
+     * Return whether the given values (possibly incomplete) are valid
+     *
+     * Unlike Zend_Form::isValid() this will not set NULL as value for
+     * an element that is not present in the given data.
+     *
+     * @param   array   $formData   The data to validate
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        $this->create($formData);
+        return parent::isValidPartial($formData);
+    }
+
+    /**
+     * Return whether the given values are complete and valid
+     *
+     * @param   array   $formData   The data to validate
+     *
+     * @return  bool
+     */
+    public function isValid($formData)
+    {
+        if ($this->isComplete($formData)) {
+            $this->assertValidCsrfToken($formData);
+            return parent::isValid($formData);
+        }
+
+        $this->isValidPartial($formData); // The form can't be processed but we want to show validation errors though
+        return false;
+    }
+
+    /**
+     * Remove all elements of this form
+     *
+     * @return  self
+     */
+    public function clearElements()
+    {
+        $this->created = false;
+        return parent::clearElements();
+    }
+
     /**
      * Load the default decorators
      *
@@ -204,6 +309,19 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Render this form
+     *
+     * @param   Zend_View_Interface     $view   The view context to use
+     *
+     * @return  string
+     */
+    public function render(Zend_View_Interface $view = null)
+    {
+        $this->create();
+        return parent::render($view);
+    }
+
     /**
      * Generate a new (seed, token) pair
      *

From 8f0b9899a30cdf0505ba0943e2e2bb67d9b3f33c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:52:05 +0200
Subject: [PATCH 011/277] We cannot know what kind of data is passed to
 Form::isValid()

refs #5525
---
 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 c9e3e7bcf..070d31d23 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -337,7 +337,7 @@ class Form extends Zend_Form
     /**
      * Test the submitted data for a correct CSRF token
      *
-     * @param   array   $requestData        The POST data sent by the user
+     * @param   array   $requestData        The data sent by the user
      *
      * @throws  InvalidCSRFTokenException   When CSRF Validation fails
      */

From 6ac471c598056edd2872ed5f218efeace13c7eae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:52:50 +0200
Subject: [PATCH 012/277] Also mention the viewscript functionality of
 Form::loadDefaultDecorators()

refs #5525
---
 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 070d31d23..110376c08 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -285,7 +285,8 @@ class Form extends Zend_Form
     /**
      * Load the default decorators
      *
-     * Overwrites Zend_Form::loadDefaultDecorators to avoid having the HtmlTag-Decorator added
+     * Overwrites Zend_Form::loadDefaultDecorators to avoid having
+     * the HtmlTag-Decorator added and to provide viewscript usage
      *
      * @return  self
      */

From f4ff2c90f2331926a42a3e0a1bbde7955b89052e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 09:54:36 +0200
Subject: [PATCH 013/277] It's a form's responsibility how its submit button
 should look like

refs #5525
---
 library/Icinga/Web/Form.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 110376c08..11eab413a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -132,7 +132,7 @@ class Form extends Zend_Form
     {
         if (false === $this->created) {
             $this->addElements($this->createElements($formData));
-            $this->addCsrfToken();
+            $this->addCsrfToken()->addSubmitButton();
             $this->created = true;
         }
 
@@ -153,6 +153,18 @@ class Form extends Zend_Form
         return array();
     }
 
+    /**
+     * Add a submit button to this form
+     *
+     * Intended to be implemented by concrete form classes.
+     *
+     * @return  self
+     */
+    public function addSubmitButton()
+    {
+        return $this;
+    }
+
     /**
      * Add a new element
      *

From 5da14d3fc58e5a1ee98a4a965bcbdeae3cd3abc7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 10:23:04 +0200
Subject: [PATCH 014/277] Adjust LoginForm to suit the "final" form builder
 implementation

refs #5525
---
 .../controllers/AuthenticationController.php  |  5 ++-
 .../forms/Authentication/LoginForm.php        | 38 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 9ec057484..8812a21fc 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -59,7 +59,8 @@ class AuthenticationController extends ActionController
             }
 
             $chain = new AuthChain($config);
-            if ($this->view->form->isSubmittedAndValid($this->_request->getParams())) {
+            $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;
@@ -107,7 +108,7 @@ class AuthenticationController extends ActionController
                     );
                 }
                 $this->view->form->getElement('password')->addError($this->translate('Incorrect username or password'));
-            } elseif (false === $this->view->form->isSubmitted()) {
+            } elseif ($request->isGet()) {
                 $user = new User('');
                 foreach ($chain as $backend) {
                     if ($backend instanceof AutoLoginBackend) {
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index c6e5b23da..bbf65d22b 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -16,51 +16,49 @@ class LoginForm extends Form
      */
     public function init()
     {
-        $this->setTokenDisabled();
         $this->setName('form_login');
-        $this->setSubmitLabel('Login');
     }
 
     /**
      * @see Form::createElements()
      */
-    public function createElements()
+    public function createElements($formData)
     {
         return array(
             $this->createElement(
                 'text',
                 'username',
                 array(
-                    'label'       => t('Username'),
-                    'placeholder' => t('Please enter your username...'),
-                    'required'    => true
+                    'required'      => true,
+                    'label'         => t('Username'),
+                    'placeholder'   => t('Please enter your username...'),
+                    'class'         => false === isset($formData['username']) ? 'autofocus' : ''
                 )
             ),
             $this->createElement(
                 'password',
                 'password',
                 array(
-                    'label'       => t('Password'),
-                    'placeholder' => t('...and your password'),
-                    'required'    => true
+                    'required'      => true,
+                    'label'         => t('Password'),
+                    'placeholder'   => t('...and your password'),
+                    'class'         => isset($formData['username']) ? 'autofocus' : ''
                 )
             )
         );
     }
 
     /**
-     * @see Form::applyValues()
+     * @see Form::addSubmitButton()
      */
-    public function applyValues(array $values)
+    public function addSubmitButton()
     {
-        parent::applyValues($values);
-
-        if (isset($values['username'])) {
-            $this->getElement('password')->setAttrib('class', 'autofocus');
-        } else {
-            $this->getElement('username')->setAttrib('class', 'autofocus');
-        }
-
-        return $this;
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Login')
+            )
+        );
     }
 }

From 7157b11f9727123fae4bb7abbe8a2f60b9efadff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 10:29:23 +0200
Subject: [PATCH 015/277] Adjust LoggingForm to suit the "final" form builder
 implementation

refs #5525
---
 application/controllers/ConfigController.php |  23 ++-
 application/forms/Config/LoggingForm.php     | 146 ++++++++++---------
 2 files changed, 89 insertions(+), 80 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 8a485404b..6bde51cdc 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -89,15 +89,22 @@ class ConfigController extends BaseConfigController
         $this->view->tabs->activate('logging');
 
         $form = new LoggingForm();
-        if ($form->isSubmittedAndValid($this->_request->getParams())) {
-            $appConfig = IcingaConfig::app();
-            $appConfig['logging'] = $form->getValues();
-            if (false === $this->writeConfigFile($appConfig, 'config')) {
-                return;
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                $appConfig = IcingaConfig::app();
+                $appConfig->logging = new Zend_Config($form->getValues());
+                if ($this->writeConfigFile($appConfig, 'config')) {
+                    $this->addSuccessMessage($this->translate('Logging configuration has sucessfully been stored'));
+                    $this->redirectNow('config/logging');
+                }
             }
-
-            Notification::success('New configuration has sucessfully been stored');
-            $this->redirectNow('config/logging');
+        } else {
+            $loggingConfig = Icinga::app()->getConfig()->logging;
+            if ($loggingConfig === null) {
+                $loggingConfig = new Zend_Config(array());
+            }
+            $form->populate($loggingConfig->toArray());
         }
 
         $this->view->form = $form;
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index 286a6b335..475d65fb2 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Form\Config;
 
-use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Application\Icinga;
 use Icinga\Web\Form\Validator\WritablePathValidator;
@@ -16,17 +15,18 @@ class LoggingForm extends Form
 {
     /**
      * Initialize this logging configuration form
+     *
+     * Sets actually only the name.
      */
     public function init()
     {
         $this->setName('form_config_logging');
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
     }
 
     /**
      * @see Form::createElements()
      */
-    public function createElements()
+    public function createElements(array $formData)
     {
         $elements = array();
 
@@ -37,7 +37,7 @@ class LoggingForm extends Form
                 'required'  => true,
                 'label'     => t('Logging Enabled'),
                 'helptext'  => t('Check this to enable logging.'),
-                'value'     => 0
+                'value'     => isset($formData['enable']) ? $formData['enable'] : 0
             )
         );
         $elements[] = $this->createElement(
@@ -47,7 +47,7 @@ class LoggingForm extends Form
                 'required'      => true,
                 'label'         => t('Logging Level'),
                 'helptext'      => t('The maximum loglevel to emit.'),
-                'value'         => 0,
+                'value'         => isset($formData['level']) ? $formData['level'] : 0,
                 'multiOptions'  => array(
                     0 => t('Error'),
                     1 => t('Warning'),
@@ -64,94 +64,96 @@ class LoggingForm extends Form
                 'class'         => 'autosubmit',
                 'label'         => t('Logging Type'),
                 'helptext'      => t('The type of logging to utilize.'),
-                'value'         => 'file',
+                'value'         => isset($formData['type']) ? $formData['type'] : 'syslog',
                 'multiOptions'  => array(
                     'file'      => t('File'),
                     'syslog'    => 'Syslog'
                 )
             )
         );
-        $elements[] = $this->createElement(
-            'text',
-            'application',
-            array(
-                'depends'       => 'type',
-                'requires'      => 'syslog',
-                'required'      => true,
-                'label'         => t('Application Prefix'),
-                'helptext'      => t('The name of the application by which to prefix syslog messages.'),
-                'value'         => 'icingaweb',
-                'validators'    => array(
-                    array(
-                        'Regex',
-                        false,
+
+        if (false === isset($formData['type']) || $formData['type'] === 'syslog') {
+            $elements[] = $this->createElement(
+                'text',
+                'application',
+                array(
+                    'required'      => true,
+                    'label'         => t('Application Prefix'),
+                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
+                    'value'         => isset($formData['application']) ? $formData['application'] : 'icingaweb',
+                    'validators'    => array(
                         array(
-                            'pattern'  => '/^[^\W]+$/',
-                            'messages' => array(
-                                'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
+                            'Regex',
+                            false,
+                            array(
+                                'pattern'  => '/^[^\W]+$/',
+                                'messages' => array(
+                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
+                                )
                             )
                         )
                     )
                 )
-            )
-        );
-        $elements[] = $this->createElement(
-            'select',
-            'facility',
-            array(
-                'depends'       => 'type',
-                'requires'      => 'syslog',
-                'required'      => true,
-                'label'         => t('Facility'),
-                'helptext'      => t('The Syslog facility to utilize.'),
-                'value'         => 'LOG_USER',
-                'multiOptions'  => array(
-                    'LOG_USER'  => 'LOG_USER'
+            );
+            $elements[] = $this->createElement(
+                'select',
+                'facility',
+                array(
+                    'required'      => true,
+                    'label'         => t('Facility'),
+                    'helptext'      => t('The Syslog facility to utilize.'),
+                    'value'         => isset($formData['facility']) ? $formData['facility'] : 'LOG_USER',
+                    'multiOptions'  => array(
+                        'LOG_USER'  => 'LOG_USER'
+                    )
                 )
-            )
-        );
-        $elements[] = $this->createElement(
-            'text',
-            'target',
-            array(
-                'depends'       => 'type',
-                'requires'      => 'file',
-                'required'      => true,
-                'label'         => t('Filepath'),
-                'helptext'      => t('The logfile to write messages to.'),
-                'value'         => $this->getDefaultLogDir(),
-                'validators'    => array(new WritablePathValidator())
-            )
-        );
+            );
+        } elseif ($formData['type'] === 'file') {
+            $elements[] = $this->createElement(
+                'text',
+                'target',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('The logfile to write messages to.'),
+                    'value'         => isset($formData['target']) ? $formData['target'] : $this->getDefaultLogDir(),
+                    'validators'    => array(new WritablePathValidator())
+                )
+            );
+        }
 
         return $elements;
     }
 
     /**
-     * Return the current logging configuration
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * Returns all configuration relevant element values.
      *
      * @return  array
      */
-    public function getConfiguration()
+    public function getValues()
     {
-        $loggingConfig = Icinga::app()->getConfig()->logging;
-        if ($loggingConfig === null) {
-            $loggingConfig = new Zend_Config(array());
-        }
-
-        $config = array();
-        $config['enable'] = $loggingConfig->enable ? 1 : 0;
-        $config['level'] = $loggingConfig->level;
-        $config['type'] = $loggingConfig->type;
-
-        if ($loggingConfig->type === 'file') {
-            $config['target'] = $loggingConfig->target;
-        } elseif ($loggingConfig->type === 'syslog') {
-            $config['application'] = $loggingConfig->application;
-            $config['facility'] = $loggingConfig->facility;
-        }
-
-        return $config;
+        $values = parent::getValues();
+        unset($values['btn_submit']);
+        unset($values[$this->getTokenElementName()]);
+        return $values;
     }
 
     /**

From 6ed3d5fdbdd043f175fbc01e23ad68a60b549376 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 18 Jul 2014 10:40:37 +0200
Subject: [PATCH 016/277] Remove Icinga\Form\Install\LoggingPage

---
 application/forms/Install/LoggingPage.php | 65 -----------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 application/forms/Install/LoggingPage.php

diff --git a/application/forms/Install/LoggingPage.php b/application/forms/Install/LoggingPage.php
deleted file mode 100644
index e41faa43e..000000000
--- a/application/forms/Install/LoggingPage.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Install;
-
-use Zend_Config;
-use Icinga\Web\Wizard\Page;
-use Icinga\Form\Config\LoggingForm;
-
-class LoggingPage extends Page
-{
-    /**
-     * The logging form
-     *
-     * @var LoggingForm
-     */
-    protected $loggingForm;
-
-    /**
-     * Initialize this LoggingPage
-     */
-    public function init()
-    {
-        $this->setName('logging');
-    }
-
-    /**
-     * Create and return the logging form
-     *
-     * @return  LoggingForm
-     */
-    protected function createForm()
-    {
-        if ($this->loggingForm === null) {
-            $this->loggingForm = new LoggingForm();
-            $this->loggingForm->hideButtons();
-            $this->loggingForm->setTokenDisabled();
-            $this->loggingForm->setRequest($this->getRequest());
-            $this->loggingForm->setConfiguration($this->getConfiguration());
-        }
-
-        return $this->loggingForm;
-    }
-
-    /**
-     * Create this wizard page
-     */
-    protected function create()
-    {
-        $loggingForm = $this->createForm();
-        $loggingForm->buildForm(); // Needs to get called manually as it's nothing that Zend knows about
-        $this->addSubForm($loggingForm, $loggingForm->getName());
-    }
-
-    /**
-     * Return a config containing all values provided by the user
-     *
-     * @return  Zend_Config
-     */
-    public function getConfig()
-    {
-        return $this->createForm()->getConfig();
-    }
-}

From f5ac592645d8986f70bacd9487b25c2ac31a1437 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 21 Jul 2014 08:57:41 +0200
Subject: [PATCH 017/277] Do not consider disabled elements when checking form
 completion

Values of disabled inputs are not sent by browsers.

refs #5525
---
 library/Icinga/Web/Form.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 11eab413a..9dc064eed 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -245,7 +245,15 @@ class Form extends Zend_Form
             throw new LogicException('Forms without elements cannot be complete');
         }
 
-        $missingValues = array_diff_key($elements, $formData);
+        $missingValues = array_diff_key(
+            array_filter(
+                $elements,
+                function ($el) {
+                    return $el->getAttrib('disabled') === null;
+                }
+            ),
+            $formData
+        );
         return empty($missingValues);
     }
 

From a9f0b95e51814b8901b28c10de16643f869194fb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 21 Jul 2014 10:20:04 +0200
Subject: [PATCH 018/277] Adjust preferences form to suit the new form builder
 implementation

refs #5525
---
 .../controllers/PreferenceController.php      |  35 +--
 application/forms/Preference/GeneralForm.php  | 209 +++++++++++-------
 2 files changed, 145 insertions(+), 99 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index cc2ea4e95..0eb45dca0 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -4,7 +4,6 @@
 
 use Icinga\Web\Controller\BasePreferenceController;
 use Icinga\Web\Widget\Tab;
-use Icinga\Application\Config as IcingaConfig;
 use Icinga\Web\Url;
 use Icinga\Form\Preference\GeneralForm;
 use Icinga\Web\Notification;
@@ -38,23 +37,29 @@ class PreferenceController extends BasePreferenceController
      */
     public function indexAction()
     {
-        $form = new GeneralForm();
         $this->getTabs()->activate('general');
-        $form->setConfiguration(IcingaConfig::app())
-            ->setRequest($this->getRequest());
-        if ($form->isSubmittedAndValid()) {
-            try {
-                $this->savePreferences($form->getPreferences());
-                Notification::success(t('Preferences updated successfully'));
-                // Recreate form to show new values
-                // TODO(el): It must sufficient to call $form->populate(...)
-                $form = new GeneralForm();
-                $form->setConfiguration(IcingaConfig::app());
-                $form->setRequest($this->getRequest());
-            } catch (Exception $e) {
-                Notification::error(sprintf(t('Failed to persist preferences. (%s)'), $e->getMessage()));
+
+        $form = new GeneralForm();
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                try {
+                    $this->savePreferences($form->getPreferences()->toArray());
+                    Notification::success($this->translate('Preferences updated successfully'));
+                    $this->redirectNow('preference');
+                } catch (Exception $e) {
+                    Notification::error(
+                        sprintf(
+                            $this->translate('Failed to persist preferences. (%s)'),
+                            $e->getMessage()
+                        )
+                    );
+                }
             }
+        } else {
+            $form->setPreferences($request->getUser()->getPreferences());
         }
+
         $this->view->form = $form;
     }
 }
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index fbc8f8d74..6f79ebb34 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -4,148 +4,189 @@
 
 namespace Icinga\Form\Preference;
 
-use \DateTimeZone;
-use \Zend_Config;
-use \Zend_Form_Element_Text;
-use \Zend_Form_Element_Select;
-use \Zend_View_Helper_DateFormat;
-use \Icinga\Web\Form;
-use \Icinga\Web\Form\Validator\TimeFormatValidator;
-use \Icinga\Web\Form\Validator\DateFormatValidator;
-use \Icinga\Util\Translator;
+use DateTimeZone;
+use Icinga\Web\Form;
+use Icinga\Util\Translator;
+use Icinga\User\Preferences;
 
 /**
  * General user preferences
  */
 class GeneralForm extends Form
 {
+    /**
+     * Initialize this preferences config form
+     */
+    public function init()
+    {
+        $this->setName('form_preference_set');
+    }
+
     /**
      * Add a select field for setting the user's language
      *
      * Possible values are determined by Translator::getAvailableLocaleCodes.
-     * Also, a 'use default format' checkbox is added in order to allow a user to discard his overwritten setting
+     * Also, a 'use browser language' checkbox is added in order to allow a user to discard his setting
      *
-     * @param   Zend_Config     $cfg    The "global" section of the config.ini to be used as default value
+     * @param   array   $formData   The data to populate the elements with
      */
-    private function addLanguageSelection(Zend_Config $cfg)
+    protected function getLanguageElements(array $formData)
     {
         $languages = array();
         foreach (Translator::getAvailableLocaleCodes() as $language) {
             $languages[$language] = $language;
         }
         $languages[Translator::DEFAULT_LOCALE] = Translator::DEFAULT_LOCALE;
-        $prefs = $this->getUserPreferences();
-        $useDefaultLanguage = $this->getRequest()->getParam('default_language', !$prefs->has('app.language'));
 
-        $this->addElement(
-            'checkbox',
-            'default_language',
-            array(
-                'label'     => t('Use Default Language'),
-                'value'     => $useDefaultLanguage,
-                'required'  => true
-            )
-        );
+        $useBrowserLanguage = isset($formData['browser_language']) ? $formData['browser_language'] == 1 : true;
         $selectOptions = array(
             'label'         => t('Your Current Language'),
-            'required'      => !$useDefaultLanguage,
+            'required'      => false === $useBrowserLanguage,
             'multiOptions'  => $languages,
             'helptext'      => t('Use the following language to display texts and messages'),
-            'value'         => $prefs->get('app.language', $cfg->get('language', Translator::DEFAULT_LOCALE))
+            'value'         => isset($formData['language'])
+                ? $formData['language']
+                : substr(setlocale(LC_ALL, 0), 0, 5)
         );
-        if ($useDefaultLanguage) {
+        if ($useBrowserLanguage) {
             $selectOptions['disabled'] = 'disabled';
         }
-        $this->addElement('select', 'language', $selectOptions);
-        $this->enableAutoSubmit(array('default_language'));
+
+        return array(
+            $this->createElement(
+                'checkbox',
+                'browser_language',
+                array(
+                    'required'  => true,
+                    'class'     => 'autosubmit',
+                    'label'     => t('Use your browser\'s language suggestions'),
+                    'value'     => $useBrowserLanguage
+                )
+            ),
+            $this->createElement('select', 'language', $selectOptions)
+        );
     }
 
     /**
-     * Add a select field for setting the user's timezone.
+     * Add a select field for setting the user's timezone
      *
-     * Possible values are determined by DateTimeZone::listIdentifiers
-     * Also, a 'use default format' checkbox is added in order to allow a user to discard his overwritten setting
+     * Possible values are determined by DateTimeZone::listIdentifiers.
+     * Also, a 'use local timezone' checkbox is added in order to allow a user to discard his overwritten setting
      *
-     * @param Zend_Config $cfg The "global" section of the config.ini to be used as default value
+     * @param   array   $formData   The data to populate the elements with
      */
-    private function addTimezoneSelection(Zend_Config $cfg)
+    protected function getTimezoneElements(array $formData)
     {
         $tzList = array();
         foreach (DateTimeZone::listIdentifiers() as $tz) {
             $tzList[$tz] = $tz;
         }
-        $helptext = 'Use the following timezone for dates and times';
-        $prefs = $this->getUserPreferences();
-        $useGlobalTimezone = $this->getRequest()->getParam('default_timezone', !$prefs->has('app.timezone'));
 
-        $selectTimezone = new Zend_Form_Element_Select(
-            array(
-                'name'          => 'timezone',
-                'label'         =>  'Your Current Timezone',
-                'required'      =>  !$useGlobalTimezone,
-                'multiOptions'  =>  $tzList,
-                'helptext'      =>  $helptext,
-                'value'         =>  $prefs->get('app.timezone', $cfg->get('timezone', date_default_timezone_get()))
-            )
+        $useLocalTimezone = isset($formData['local_timezone']) ? $formData['local_timezone'] == 1 : true;
+        $selectOptions = array(
+            'label'         => 'Your Current Timezone',
+            'required'      => false === $useLocalTimezone,
+            'multiOptions'  => $tzList,
+            'helptext'      => t('Use the following timezone for dates and times'),
+            'value'         => isset($formData['timezone'])
+                ? $formData['timezone']
+                : date_default_timezone_get()
         );
-        $this->addElement(
-            'checkbox',
-            'default_timezone',
-            array(
-                'label'         => 'Use Default Timezone',
-                'value'         => $useGlobalTimezone,
-                'required'      => true
-            )
-        );
-        if ($useGlobalTimezone) {
-            $selectTimezone->setAttrib('disabled', 1);
+        if ($useLocalTimezone) {
+            $selectOptions['disabled'] = 'disabled';
         }
-        $this->addElement($selectTimezone);
-        $this->enableAutoSubmit(array('default_timezone'));
+
+        return array(
+            $this->createElement(
+                'checkbox',
+                'local_timezone',
+                array(
+                    'required'  => true,
+                    'class'     => 'autosubmit',
+                    'label'     => t('Use your local timezone'),
+                    'value'     => $useLocalTimezone,
+                )
+            ),
+            $this->createElement('select', 'timezone', $selectOptions)
+        );
     }
 
     /**
-     * Create the general form, using the global configuration as fallback values for preferences
-     *
-     * @see Form::create()
+     * @see Form::createElements()
      */
-    public function create()
+    public function createElements(array $formData)
     {
-        $this->setName('form_preference_set');
-
-        $config = $this->getConfiguration();
-        $global = $config->global;
-        if ($global === null) {
-            $global = new Zend_Config(array());
-        }
-
-        $this->addLanguageSelection($global);
-        $this->addTimezoneSelection($global);
-
-        $this->setSubmitLabel('Save Changes');
-
-        $this->addElement(
+        $elements = array_merge($this->getLanguageElements($formData), $this->getTimezoneElements($formData));
+        $elements[] = $this->createElement(
             'checkbox',
             'show_benchmark',
             array(
-                'label' => 'Use benchmark',
-                'value' => $this->getUserPreferences()->get('app.show_benchmark')
+                'label' => t('Use benchmark'),
+                'value' => isset($formData['show_benchmark']) ? $formData['show_benchmark'] : 0
             )
         );
+
+        return $elements;
     }
 
     /**
-     * Return an array containing the preferences set in this form
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Populate the form with the given preferences
      *
-     * @return array
+     * @param   Preferences     $preferences    The preferences to populate the form with
+     *
+     * @return  self
+     */
+    public function setPreferences(Preferences $preferences)
+    {
+        $defaults = array(
+            'browser_language'  => $preferences->get('app.language') === null,
+            'local_timezone'    => $preferences->get('app.timezone') === null
+        );
+
+        if ($preferences->get('app.language') !== null) {
+            $defaults['language'] = $preferences->get('app.language');
+        }
+        if ($preferences->get('app.timezone') !== null) {
+            $defaults['timezone'] = $preferences->get('app.timezone');
+        }
+        if ($preferences->get('app.show_benchmark')) {
+            $defaults['show_benchmark'] = $preferences->get('app.show_benchmark');
+        }
+
+        $this->setDefaults($defaults);
+        return $this;
+    }
+
+    /**
+     * Return the configured preferences
+     *
+     * @return  Preferences
      */
     public function getPreferences()
     {
         $values = $this->getValues();
-        return array(
-            'app.language'          => $values['default_language'] ? null : $values['language'],
-            'app.timezone'          => $values['default_timezone'] ? null : $values['timezone'],
-            'app.show_benchmark'    => $values['show_benchmark'] === '1' ? true : false
+        return new Preferences(
+            array(
+                'app.language'          => $values['browser_language'] ? null : $values['language'],
+                'app.timezone'          => $values['local_timezone'] ? null : $values['timezone'],
+                'app.show_benchmark'    => $values['show_benchmark'] ? $values['show_benchmark'] : null
+            )
         );
     }
 }

From a73e2ee654746320e11dcf7a27438fdddf3c3990 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 21 Jul 2014 14:33:52 +0200
Subject: [PATCH 019/277] Adjust general config form to suit the new form
 builder implementation

refs #5525
---
 application/controllers/ConfigController.php |  24 +-
 application/forms/Config/GeneralForm.php     | 298 ++++++++-----------
 2 files changed, 147 insertions(+), 175 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 6bde51cdc..b9c48ac78 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -66,17 +66,25 @@ class ConfigController extends BaseConfigController
     {
         $this->view->messageBox = new AlertMessageBox(true);
         $this->view->tabs->activate('index');
+
         $form = new GeneralForm();
-        $form->setConfiguration(IcingaConfig::app());
-        $form->setRequest($this->_request);
-        if ($form->isSubmittedAndValid()) {
-            if (!$this->writeConfigFile($form->getConfig(), 'config'))  {
-                return;
+        $request = $this->getRequest();
+        $currentConfig = IcingaConfig::app();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                $formConfig = $form->getConfiguration();
+                $newConfig = new Zend_Config($currentConfig->toArray(), true);
+                $newConfig->global = $formConfig->global;
+                $newConfig->preferences = $formConfig->preferences;
+                if ($this->writeConfigFile($newConfig, 'config')) {
+                    Notification::success($this->translate('New configuration has successfully been stored'));
+                    $this->redirectNow('config');
+                }
             }
-            Notification::success('New configuration has successfully been stored');
-            $form->setConfiguration(IcingaConfig::app(), true);
-            $this->redirectNow('config/index');
+        } else {
+            $form->setConfiguration($currentConfig);
         }
+
         $this->view->form = $form;
     }
 
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index ced24401c..90a4f4ea4 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -4,15 +4,11 @@
 
 namespace Icinga\Form\Config;
 
-use Icinga\Application\Config as IcingaConfig;
-use Icinga\Data\ResourceFactory;
+use DateTimeZone;
+use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Util\Translator;
-use Icinga\Web\Form\Validator\WritablePathValidator;
-use Icinga\Web\Form\Decorator\ConditionalHidden;
-use DateTimeZone;
-use Zend_Form_Element_Select;
-use Zend_Config;
+use Icinga\Data\ResourceFactory;
 
 /**
  * Configuration form for general, application-wide settings
@@ -20,74 +16,94 @@ use Zend_Config;
 class GeneralForm extends Form
 {
     /**
-     * The base directory of the icingaweb configuration
-     *
-     * @var string
+     * Initialize this configuration form
      */
-    private $configDir = null;
-
-    /**
-     * The resources to use instead of the factory provided ones (use for testing)
-     *
-     * @var null
-     */
-    private $resources;
-
-    /**
-     * Set a specific configuration directory to use for configuration specific default paths
-     *
-     * @param string    $dir
-     */
-    public function setConfigDir($dir)
+    public function init()
     {
-        $this->configDir = $dir;
+        $this->setName('form_config_general');
     }
 
     /**
-     * Return the config path set for this form or the application wide config path if none is set
-     *
-     * @return  string
-     *
-     * @see     IcingaConfig::configDir
+     * @see Form::createElements()
      */
-    public function getConfigDir()
+    public function createElements(array $formData)
     {
-        return $this->configDir === null ? IcingaConfig::$configDir : $this->configDir;
+        $elements = array(
+            $this->getLanguageSelection($formData),
+            $this->getTimezoneSelection($formData),
+            $this->getModulePathInput($formData)
+        );
+
+        return array_merge($elements, $this->getPreferencesElements($formData));
     }
 
     /**
-     * Set an alternative array of resources that should be used instead of the DBFactory resource set
-     * (used for testing)
-     *
-     * @param array $resources  The resources to use for populating the db selection field
+     * @see Form::addSubmitButton()
      */
-    public function setResources(array $resources)
+    public function addSubmitButton()
     {
-        $this->resources = $resources;
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
     }
 
     /**
-     * Return content of the resources.ini or previously set resources for displaying in the database selection field
+     * Populate this form with the given configuration
      *
-     * @return array
+     * @param   Zend_Config     $config     The configuration to populate this form with
+     *
+     * @return  self
      */
-    public function getResources()
+    public function setConfiguration(Zend_Config $config)
     {
-        if ($this->resources === null) {
-            return ResourceFactory::getResourceConfigs()->toArray();
-        } else {
-            return $this->resources;
+        $defaults = $config->get('global', new Zend_Config(array()))->toArray();
+        if ($config->get('preferences', new Zend_Config(array()))->type !== null) {
+            $defaults['preferences_type'] = $config->get('preferences')->type;
+            $defaults['preferences_resource'] = $config->get('preferences')->resource;
         }
+
+        $this->setDefaults($defaults);
+        return $this;
     }
 
     /**
-     * Add a select field for setting the default language
+     * Return the configured configuration values
+     *
+     * @return  Zend_Config
+     */
+    public function getConfiguration()
+    {
+        $values = $this->getValues();
+        $globalData = array(
+            'language'   => $values['language'],
+            'timezone'   => $values['timezone'],
+            'modulePath' => $values['modulePath']
+        );
+
+        $preferencesData = array('type' => $values['preferences_type']);
+        if ($values['preferences_type'] === 'db') {
+            $preferencesData['resource'] = $values['preferences_resource'];
+        }
+
+        return new Zend_Config(array('global' => $globalData, 'preferences' => $preferencesData));
+    }
+
+    /**
+     * Return a select field for setting the default language
      *
      * Possible values are determined by Translator::getAvailableLocaleCodes.
      *
-     * @param   Zend_Config     $cfg    The "global" section of the config.ini
+     * @param   array   $formData   The data to populate the elements with
+     *
+     * @return  Zend_Form_Element
      */
-    private function addLanguageSelection(Zend_Config $cfg)
+    protected function getLanguageSelection(array $formData)
     {
         $languages = array();
         foreach (Translator::getAvailableLocaleCodes() as $language) {
@@ -95,7 +111,7 @@ class GeneralForm extends Form
         }
         $languages[Translator::DEFAULT_LOCALE] = Translator::DEFAULT_LOCALE;
 
-        $this->addElement(
+        return $this->createElement(
             'select',
             'language',
             array(
@@ -105,167 +121,115 @@ class GeneralForm extends Form
                 'helptext'      => t(
                     'Select the language to use by default. Can be overwritten by a user in his preferences.'
                 ),
-                'value'         => $cfg->get('language', Translator::DEFAULT_LOCALE)
+                'value'         => isset($formData['language']) ? $formData['language'] : Translator::DEFAULT_LOCALE
             )
         );
     }
 
     /**
-     * Add a select field for setting the default timezone.
+     * Return a select field for setting the default timezone
      *
-     * Possible values are determined by DateTimeZone::listIdentifiers
+     * Possible values are determined by DateTimeZone::listIdentifiers.
      *
-     * @param Zend_Config   $cfg    The "global" section of the config.ini
+     * @param   array   $formData   The data to populate the elements with
+     *
+     * @return  Zend_Form_Element
      */
-    private function addTimezoneSelection(Zend_Config $cfg)
+    protected function getTimezoneSelection(array $formData)
     {
         $tzList = array();
         foreach (DateTimeZone::listIdentifiers() as $tz) {
             $tzList[$tz] = $tz;
         }
-        $helptext = 'Select the timezone to be used as the default. User\'s can set their own timezone if'
-            . ' they like to, but this is the timezone to be used as the default setting .';
 
         $this->addElement(
             'select',
             'timezone',
             array(
-                'label'         =>  'Default Application Timezone',
-                'required'      =>  true,
-                'multiOptions'  =>  $tzList,
-                'helptext'      =>  $helptext,
-                'value'         =>  $cfg->get('timezone', date_default_timezone_get())
+                'label'         => t('Default Application Timezone'),
+                'required'      => true,
+                'multiOptions'  => $tzList,
+                'helptext'      => t(
+                    'Select the timezone to be used as the default. User\'s can set their own timezone if'
+                    . ' they like to, but this is the timezone to be used as the default setting .'
+                ),
+                'value'         => isset($formData['timezone']) ? $formData['timezone'] : date_default_timezone_get()
             )
         );
     }
 
     /**
-     * Add configuration settings for module paths
+     * Return a input field for setting the module path
      *
-     * @param Zend_Config   $cfg    The "global" section of the config.ini
+     * @param   array   $formData   The data to populate the elements with
      */
-    private function addModuleSettings(Zend_Config $cfg)
+    protected function getModulePathInput(array $formData)
     {
         $this->addElement(
             'text',
-            'module_path',
+            'modulePath',
             array(
-                'label'     => 'Module Path',
+                'label'     => t('Module Path'),
                 'required'  => true,
-                'helptext'  => '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.',
-                'value'     => $cfg->get('modulePath', realpath(ICINGAWEB_APPDIR . '/../modules'))
+                'helptext'  => t(
+                    '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.'
+                ),
+                'value'     => isset($formData['modulePath'])
+                    ? $formData['modulePath']
+                    : realpath(ICINGAWEB_APPDIR . '/../modules')
             )
         );
     }
 
     /**
-     * Add form elements for setting the user preference storage backend
+     * Return form elements for setting the user preference storage backend
      *
-     * @param Zend_Config   $cfg    The Zend_config object of preference section
+     * @param   array   $formData   The data to populate the elements with
      */
-    public function addUserPreferencesDialog(Zend_Config $cfg)
+    protected function getPreferencesElements(array $formData)
     {
-        $backend = $cfg->get('type', 'ini');
-        if ($this->getRequest()->get('preferences_type', null) !== null) {
-            $backend = $this->getRequest()->get('preferences_type');
-        }
-        $this->addElement(
-            'select',
-            'preferences_type',
-            array(
-                'label'         => 'User Preference Storage Type',
-                'required'      => true,
-                'value'         => $backend,
-                'multiOptions'  => array(
-                    'ini'   => 'File System (INI Files)',
-                    'db'    => 'Database',
-                    'null'  => 'Don\'t Store Preferences'
+        $elements = array(
+            $this->createElement(
+                'select',
+                'preferences_type',
+                array(
+                    'required'      => true,
+                    'class'         => 'autosubmit',
+                    'label'         => t('User Preference Storage Type'),
+                    'value'         => isset($formData['preferences_type']) ? $formData['preferences_type'] : 'ini',
+                    'multiOptions'  => array(
+                        'ini'   => t('File System (INI Files)'),
+                        'db'    => t('Database'),
+                        'null'  => t('Don\'t Store Preferences')
+                    )
                 )
             )
         );
 
-        $backends = array();
-        foreach ($this->getResources() as $name => $resource) {
-            if ($resource['type'] !== 'db') {
-                continue;
+        if (isset($formData['preferences_type']) && $formData['preferences_type'] === 'db') {
+            $backends = array();
+            foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
+                if ($resource['type'] === 'db') {
+                    $backends[$name] = $name;
+                }
             }
-            $backends[$name] = $name;
+
+            $elements[] = $this->createElement(
+                'select',
+                'preferences_resource',
+                array(
+                    'required'      => true,
+                    'multiOptions'  => $backends,
+                    'label'         => t('Database Connection'),
+                    'value'         => isset($formData['preferences_resource'])
+                        ? $formData['preferences_resource']
+                        : null
+                )
+            );
         }
 
-        $txtPreferencesDbResource = new Zend_Form_Element_Select(
-            array(
-                'name'          =>  'preferences_db_resource',
-                'label'         =>  'Database Connection',
-                'required'      =>  $backend === 'db',
-                'condition'     =>  $backend === 'db',
-                'value'         =>  $cfg->get('resource'),
-                'multiOptions'  =>  $backends
-            )
-        );
-        $validator = new WritablePathValidator();
-        $validator->setRequireExistence();
-        $this->addElement($txtPreferencesDbResource);
-
-        $txtPreferencesDbResource->addDecorator(new ConditionalHidden());
-        $this->enableAutoSubmit(
-            array(
-                'preferences_type'
-            )
-        );
-    }
-
-    /**
-     * Create the general form, using the provided configuration
-     *
-     * @see Form::create()
-     */
-    public function create()
-    {
-        $config = $this->getConfiguration();
-        $global = $config->global;
-        if ($global === null) {
-            $global = new Zend_Config(array());
-        }
-        $preferences = $config->preferences;
-        if ($preferences === null) {
-            $preferences = new Zend_Config(array());
-        }
-        $this->setName('form_config_general');
-        $this->addLanguageSelection($global);
-        $this->addTimezoneSelection($global);
-        $this->addModuleSettings($global);
-        $this->addUserPreferencesDialog($preferences);
-
-        $this->setSubmitLabel('Save Changes');
-    }
-
-    /**
-     * Return an Zend_Config object containing the configuration set in this form
-     *
-     * @return Zend_Config
-     */
-    public function getConfig()
-    {
-        $config = $this->getConfiguration();
-        if ($config->global === null) {
-            $config->global = new Zend_Config(array(), true);
-        }
-        if ($config->preferences === null) {
-            $config->preferences = new Zend_Config(array(), true);
-        }
-
-        $values = $this->getValues();
-        $cfg = clone $config;
-        $cfg->global->language     = $values['language'];
-        $cfg->global->timezone     = $values['timezone'];
-        $cfg->global->modulePath   = $values['module_path'];
-        $cfg->preferences->type = $values['preferences_type'];
-        if ($cfg->preferences->type === 'db') {
-            $cfg->preferences->resource = $values['preferences_db_resource'];
-        }
-
-        return $cfg;
+        return $elements;
     }
 }

From 75e09f2c699c3f2e994e4650cea9c9ba78126328 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 21 Jul 2014 15:25:00 +0200
Subject: [PATCH 020/277] Do not consider submit buttons when checking form
 completion

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

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 9dc064eed..4c57a6438 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -232,6 +232,8 @@ class Form extends Zend_Form
     /**
      * Return whether the given data provides a value for each element of this form
      *
+     * Note that elements that are disabled or of type submit are not taken into consideration.
+     *
      * @param   array   $formData   The data to check
      *
      * @return  bool
@@ -249,7 +251,7 @@ class Form extends Zend_Form
             array_filter(
                 $elements,
                 function ($el) {
-                    return $el->getAttrib('disabled') === null;
+                    return $el->getAttrib('disabled') === null && $el->getType() !== 'submit';
                 }
             ),
             $formData

From 25c9ee567d03faab44c125f413baeacbbe929ae8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 10:54:22 +0200
Subject: [PATCH 021/277] Add missing use statement for Zend_View_Abstract

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

diff --git a/library/Icinga/Web/Widget/AlertMessageBox.php b/library/Icinga/Web/Widget/AlertMessageBox.php
index 09016f490..13cf91068 100644
--- a/library/Icinga/Web/Widget/AlertMessageBox.php
+++ b/library/Icinga/Web/Widget/AlertMessageBox.php
@@ -6,6 +6,7 @@ namespace Icinga\Web\Widget;
 
 use Zend_Log;
 use Zend_Form;
+use Zend_View_Abstract;
 use Icinga\User;
 use Icinga\User\Message;
 use Icinga\Web\Session;

From 0bf021354764e34a7f084c4a8139e67905d3f48a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 10:57:46 +0200
Subject: [PATCH 022/277] Rename Form::addElement to Form::createElement

Since we are using mainly createElement and addElement is only an alias for
createElement if no object is passed our changes to addElement can safely
be moved to createElement.

refs #5525
---
 library/Icinga/Web/Form.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 4c57a6438..2440245b9 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -166,22 +166,21 @@ class Form extends Zend_Form
     }
 
     /**
-     * Add a new element
+     * Create a new element
      *
      * Additionally, all structural form element decorators by Zend are replaced with our own ones.
      *
-     * @param   string|Zend_Form_Element    $element    String element type, or an object of type Zend_Form_Element
-     * @param   string                      $name       The name of the element to add if $element is a string
-     * @param   array                       $options    The options for the element if $element is a string
+     * @param   string  $type       String element type
+     * @param   string  $name       The name of the element to add
+     * @param   array   $options    The options for the element
      *
-     * @return  self
+     * @return  Zend_Form_Element
      *
-     * @see     Zend_Form::addElement()
+     * @see     Zend_Form::createElement()
      */
-    public function addElement($element, $name = null, $options = null)
+    public function createElement($type, $name, $options = null)
     {
-        parent::addElement($element, $name, $options);
-        $el = $name !== null ? $this->getElement($name) : $element;
+        $el = parent::createElement($type, $name, $options);
 
         if ($el) {
             if (strpos(strtolower(get_class($el)), 'hidden') !== false) {
@@ -195,7 +194,7 @@ class Form extends Zend_Form
             }
         }
 
-        return $this;
+        return $el;
     }
 
     /**

From 8b2cc3a5581ea4eea1e7994667d4f40ef2795910 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 10:58:45 +0200
Subject: [PATCH 023/277] Do not consider <button type=submit> when checking
 form completion

refs #5525
---
 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 2440245b9..43dd62a41 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -250,7 +250,8 @@ class Form extends Zend_Form
             array_filter(
                 $elements,
                 function ($el) {
-                    return $el->getAttrib('disabled') === null && $el->getType() !== 'submit';
+                    return $el->getAttrib('disabled') === null
+                        && 0 === preg_match('@(submit|button)@', strtolower(get_class($el)));
                 }
             ),
             $formData

From 9cdd891866e4a84cee49aab692d5fbe67512fe07 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 12:35:39 +0200
Subject: [PATCH 024/277] Drop ReorderForm and handle its logic in the
 controller and view instead

refs #5525
---
 application/controllers/ConfigController.php  |  57 +++--
 .../Config/Authentication/ReorderForm.php     | 233 ------------------
 .../views/scripts/config/authentication.phtml |  92 +++----
 3 files changed, 82 insertions(+), 300 deletions(-)
 delete mode 100644 application/forms/Config/Authentication/ReorderForm.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index b9c48ac78..ffa87f035 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -8,12 +8,12 @@ use Icinga\Web\Widget\AlertMessageBox;
 use Icinga\Web\Notification;
 use Icinga\Application\Modules\Module;
 use Icinga\Web\Url;
+use Icinga\Web\Form;
 use Icinga\Web\Widget;
 use Icinga\Application\Icinga;
 use Icinga\Application\Config as IcingaConfig;
 use Icinga\Data\ResourceFactory;
 use Icinga\Form\Config\GeneralForm;
-use Icinga\Form\Config\Authentication\ReorderForm;
 use Icinga\Form\Config\Authentication\LdapBackendForm;
 use Icinga\Form\Config\Authentication\DbBackendForm;
 use Icinga\Form\Config\ResourceForm;
@@ -186,40 +186,47 @@ class ConfigController extends BaseConfigController
     }
 
     /**
-     * Action for creating a new authentication backend
+     * Action for reordering authentication backends
      */
     public function authenticationAction()
     {
-        $config = IcingaConfig::app('authentication', true);
+        $this->view->messageBox = new AlertMessageBox(true);
         $this->view->tabs->activate('authentication');
 
-        $order = array_keys($config->toArray());
-        $this->view->messageBox = new AlertMessageBox(true);
-
-        $backends = array();
-        foreach ($order as $backend) {
-            $form = new ReorderForm();
-            $form->setName('form_reorder_backend_' . $backend);
-            $form->setBackendName($backend);
-            $form->setCurrentOrder($order);
-            $form->setRequest($this->_request);
-
-            if ($form->isSubmittedAndValid()) {
-                if ($this->writeAuthenticationFile($form->getReorderedConfig($config))) {
-                    Notification::success('Authentication Order Updated');
-                    $this->redirectNow('config/authentication');
+        $config = IcingaConfig::app('authentication');
+        $backendOrder = array_keys($config->toArray());
+        $form = new Form();
+        $form->setName('form_reorder_authbackend');
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            $requestData = $request->getPost();
+            if ($form->isValid($requestData)) { // Validate the CSRF token
+                $reordered = false;
+                foreach ($backendOrder as $backendName) {
+                    if (isset($requestData[$backendName])) {
+                        array_splice($backendOrder, array_search($backendName, $backendOrder), 1);
+                        array_splice($backendOrder, $requestData[$backendName], 0, $backendName);
+                        $reordered = true;
+                        break;
+                    }
                 }
 
-                return;
-            }
+                if ($reordered) {
+                    $reorderedConfig = array();
+                    foreach ($backendOrder as $backendName) {
+                        $reorderedConfig[$backendName] = $config->{$backendName};
+                    }
 
-            $backends[] = (object) array(
-                'name'          => $backend,
-                'reorderForm'   => $form
-            );
+                    if ($this->writeAuthenticationFile($reorderedConfig)) {
+                        Notification::success($this->translate('Authentication order updated!'));
+                        $this->redirectNow('config/authentication');
+                    }
+                }
+            }
         }
 
-        $this->view->backends = $backends;
+        $this->view->form = $form->create(); // Necessary in case its a GET request
+        $this->view->backendNames = $backendOrder;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/ReorderForm.php b/application/forms/Config/Authentication/ReorderForm.php
deleted file mode 100644
index a074febea..000000000
--- a/application/forms/Config/Authentication/ReorderForm.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Config\Authentication;
-
-use \Zend_Config;
-use Icinga\Web\Form;
-
-/**
- * Form for modifying the authentication provider order
- */
-class ReorderForm extends Form
-{
-    /**
-     * The name of the current backend which will get action buttons for up and down movement
-     *
-     * @var string
-     */
-    protected $backend;
-
-    /**
-     * The current ordering of all backends, required to determine possible changes
-     *
-     * @var array
-     */
-    protected $currentOrder = array();
-
-    /**
-     * Set an array with the current order of all backends
-     *
-     * @param   array   $order      An array containing backend names in the order
-     *                              they are defined in the authentication.ini
-     */
-    public function setCurrentOrder(array $order)
-    {
-        $this->currentOrder = $order;
-    }
-
-    /**
-     * Set the name of the authentication backend for which to create the form
-     *
-     * @param   string      $backend    The name of the authentication backend
-     */
-    public function setBackendName($backend)
-    {
-        $this->backend = $backend;
-    }
-
-    /**
-     * Return the name of the currently set backend as it will appear in the form
-     *
-     * @return  string  The name of the backend
-     */
-    public function getBackendName()
-    {
-        return $this->filterName($this->backend);
-    }
-
-    /**
-     * Create this form
-     *
-     * @see Form::create
-     */
-    public function create()
-    {
-        if ($this->moveElementUp($this->backend, $this->currentOrder) !== $this->currentOrder) {
-            $upForm = new Form();
-
-            $upForm->addElement(
-                'hidden',
-                'form_backend_order',
-                array(
-                    'required'  => true,
-                    'value'     => join(',', $this->moveElementUp($this->backend, $this->currentOrder))
-                )
-            );
-            $upForm->addElement(
-                'button',
-                'btn_' . $this->getBackendName() . '_reorder_up',
-                array(
-                    'type'      => 'submit',
-                    'escape'    => false,
-                    'value'     => 'btn_' . $this->getBackendName() . '_reorder_up',
-                    'name'      => 'btn_' . $this->getBackendName() . '_reorder_up',
-                    'label'     => $this->getView()->icon('up.png', t('Move up in authentication order'))
-                )
-            );
-
-            $this->addSubForm($upForm, 'btn_reorder_up');
-        }
-
-        if ($this->moveElementDown($this->backend, $this->currentOrder) !== $this->currentOrder) {
-            $downForm = new Form();
-
-            $downForm->addElement(
-                'hidden',
-                'form_backend_order',
-                array(
-                    'required'  => true,
-                    'value'     => join(',', $this->moveElementDown($this->backend, $this->currentOrder))
-                )
-            );
-            $downForm->addElement(
-                'button',
-                'btn_' . $this->getBackendName() . '_reorder_down',
-                array(
-                    'type'      => 'submit',
-                    'escape'    => false,
-                    'value'     => 'btn_' . $this->getBackendName() . '_reorder_down',
-                    'name'      => 'btn_' . $this->getBackendName() . '_reorder_down',
-                    'label'     => $this->getView()->icon('down.png', t('Move down in authentication order'))
-                )
-            );
-
-            $this->addSubForm($downForm, 'btn_reorder_down');
-        }
-    }
-
-    /**
-     * Return the flattened result of $this->getValues
-     *
-     * @return  array   The currently set values
-     *
-     * @see Form::getValues()
-     */
-    protected function getFlattenedValues()
-    {
-        $result = array();
-        foreach (parent::getValues() as $key => $value) {
-            if (is_array($value)) {
-                $result += $value;
-            } else {
-                $result[$key] = $value;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Determine whether this form is submitted by testing the submit buttons of both subforms
-     *
-     * @return  bool    Whether the form has been submitted or not
-     */
-    public function isSubmitted()
-    {
-        $checkData = $this->getRequest()->getParams();
-        return isset($checkData['btn_' . $this->getBackendName() . '_reorder_up']) ||
-                isset($checkData['btn_' . $this->getBackendName() . '_reorder_down']);
-    }
-
-    /**
-     * Return the reordered configuration after a reorder button has been submitted
-     *
-     * @param   Zend_Config     $config     The configuration to reorder
-     *
-     * @return  array                       An array containing the reordered configuration
-     */
-    public function getReorderedConfig(Zend_Config $config)
-    {
-        $originalConfig = $config->toArray();
-        $newOrder = $this->getFlattenedValues();
-        $order = explode(',', $newOrder['form_backend_order']);
-
-        $reordered = array();
-        foreach ($order as $key) {
-            if (isset($originalConfig[$key])) {
-                $reordered[$key] = $originalConfig[$key];
-            }
-        }
-
-        return $reordered;
-    }
-
-    /**
-     * Static helper for moving an element in an array one slot up, if possible
-     *
-     * Example:
-     *
-     * <pre>
-     * $array = array('first', 'second', 'third');
-     * moveElementUp('third', $array); // returns ['first', 'third', 'second']
-     * </pre>
-     *
-     * @param   string    $key      The key to bubble up one slot
-     * @param   array     $array    The array to work with
-     *
-     * @return  array               The modified array
-     */
-    protected static function moveElementUp($key, array $array)
-    {
-        for ($i = 0; $i < count($array) - 1; $i++) {
-            if ($array[$i + 1] === $key) {
-                $swap = $array[$i];
-                $array[$i] = $array[$i + 1];
-                $array[$i + 1] = $swap;
-                return $array;
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * Static helper for moving an element in an array one slot down, if possible
-     *
-     * Example:
-     *
-     * <pre>
-     * $array = array('first', 'second', 'third');
-     * moveElementDown('first', $array); // returns ['second', 'first', 'third']
-     * </pre>
-     *
-     * @param   string    $key      The key to bubble up one slot
-     * @param   array     $array    The array to work with
-     *
-     * @return  array               The modified array
-     */
-    protected static function moveElementDown($key, array $array)
-    {
-        for ($i = 0; $i < count($array) - 1; $i++) {
-            if ($array[$i] === $key) {
-                $swap = $array[$i + 1];
-                $array[$i + 1] = $array[$i];
-                $array[$i] = $swap;
-                return $array;
-            }
-        }
-
-        return $array;
-    }
-}
diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index a86e97600..13cdd901e 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -1,45 +1,53 @@
 <div class="controls">
-<?= $this->tabs ?>
+  <?= $tabs; ?>
 </div>
-
 <div class="content" data-base-target="_next">
-<?php
-
-if (isset($this->messageBox)) {
-    // TODO: Get rid of such boxes -> notifications?
-    echo $this->messageBox->render();
-}
-?>
-
-<p>
-  <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'ldap')) ?>"><?= $this->icon('create.png'); ?> Create A New LDAP Authentication Backend</a>
-  <br />
-  <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'db'))   ?>"><?= $this->icon('create.png'); ?> Create A New DB Authentication Backend</a>
-</p>
-
-<table class="action">
- <thead>
-  <th>Resource</th>
-  <th style="width: 5em">Remove</th>
-  <th style="width: 5em">Order</th>
- </thead>
- <tbody>
-  <?php foreach ($this->backends as $backend): ?>
-    <tr>
-      <td class="action">
-        <a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backend->name)) ?>">
-          <?= $this->icon('edit.png') ?> <?= $this->escape($backend->name); ?>
-        </a>
-      </td>
-      <td>
-        <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backend->name)) ?>">
-          <?= $this->icon('remove.png', 'Remove') ?>
-        </a>
-      </td>
-      <td>
-        <?= $backend->reorderForm; ?>
-      </td>
-    </tr>
-  <?php endforeach; ?>
-  </table>
-</div>
+  <?= $messageBox; ?>
+  <p>
+    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'ldap')); ?>">
+      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New LDAP Authentication Backend'); ?>
+    </a>
+    <br>
+    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'db')); ?>">
+      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New DB Authentication Backend'); ?>
+    </a>
+  </p>
+  <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>">
+    <?= $form->getElement($form->getTokenElementName()); ?>
+    <table class="action">
+      <thead>
+        <th>Backend</th>
+        <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+        <th style="width: 5em"><?= $this->translate('Order'); ?></th>
+      </thead>
+      <tbody>
+<?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.png'); ?> <?= $this->escape($backendNames[$i]); ?>
+            </a>
+          </td>
+          <td>
+            <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
+              <?= $this->icon('remove.png', $this->translate('Remove')); ?>
+            </a>
+          </td>
+          <td>
+<?php if ($i > 0): ?>
+            <button type="submit" name="<?= $backendNames[$i]; ?>" value="<?= $i - 1; ?>">
+              <?= $this->icon('up.png', $this->translate('Move up in authentication order')); ?>
+            </button>
+<?php endif; ?>
+<?php if ($i + 1 < count($backendNames)): ?>
+            <button type="submit" name="<?= $backendNames[$i]; ?>" value="<?= $i + 1; ?>">
+              <?= $this->icon('down.png', $this->translate('Move down in authentication order')); ?>
+            </button>
+<?php endif; ?>
+          </td>
+        </tr>
+<?php endfor; ?>
+      </tbody>
+    </table>
+  </form>
+</div>
\ No newline at end of file

From c8d61f78e7a39a40a81e86a73fce4f6405cf1b1c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 12:55:43 +0200
Subject: [PATCH 025/277] Fix the config/resource-action's html markup

---
 application/controllers/ConfigController.php  |  8 +--
 .../views/scripts/config/resource.phtml       | 53 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index ffa87f035..eb8220fa9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -375,13 +375,15 @@ class ConfigController extends BaseConfigController
         $this->render('authentication/remove');
     }
 
-    public function resourceAction($showOnly = false)
+    /**
+     * Display all available resources and a link to create a new one
+     */
+    public function resourceAction()
     {
+        $this->view->messageBox = new AlertMessageBox(true);
         $this->view->tabs->activate('resources');
 
-        $this->view->messageBox = new AlertMessageBox(true);
         $this->view->resources = IcingaConfig::app('resources', true)->toArray();
-        $this->render('resource');
     }
 
     public function createresourceAction()
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 2e0d95234..8e2c2eedd 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -1,30 +1,33 @@
 <div class="controls">
-<?= $this->tabs ?>
+  <?= $tabs; ?>
 </div>
-
 <div class="content" data-base-target="_next">
-<?php
-
-if (isset($this->messageBox)) {
-    // TODO: Get rid of messageBoxes in favour of notifications
-    echo $this->messageBox->render();
-}
-
-?>
-<p><a href="<?= $this->href('/config/createresource') ?>"><?= $this->icon('create.png'); ?> Create A New Resource</a></p>
-
-<table class="action">
- <thead>
-  <th>Resource</th>
-  <th style="width: 5em">Remove</th>
- </thead>
- <tbody>
+  <?= $messageBox; ?>
+  <p>
+    <a href="<?= $this->href('/config/createresource') ?>">
+      <?= $this->icon('create.png'); ?> <?= $this->translate('Create a new resource'); ?>
+    </a>
+  </p>
+  <table class="action">
+    <thead>
+      <th><?= $this->translate('Resource'); ?></th>
+      <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+    </thead>
+    <tbody>
 <?php foreach ($this->resources as $name => $resource): ?>
-  <tr>
-    <td><a href="<?= $this->href('config/editresource', array('resource' => $name)) ?>"><?= $this->icon('edit.png') ?> <?= $this->escape($name); ?></td>
-    <td style="text-align: center"><a href="<?= $this->href('config/removeresource', array('resource' => $name)) ?>"><?= $this->icon('remove.png'); ?></a></td>
-  </tr>
+      <tr>
+        <td>
+          <a href="<?= $this->href('config/editresource', array('resource' => $name)) ?>">
+            <?= $this->icon('edit.png') ?> <?= $this->escape($name); ?>
+          </a>
+        </td>
+        <td style="text-align: center">
+          <a href="<?= $this->href('config/removeresource', array('resource' => $name)) ?>">
+            <?= $this->icon('remove.png'); ?>
+          </a>
+        </td>
+      </tr>
 <?php endforeach; ?>
-</table>
-</div>
-
+    </tbody>
+  </table>
+</div>
\ No newline at end of file

From 936f65eb2703fe0b8d7febc8ff2d149226f52031 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 16:39:15 +0200
Subject: [PATCH 026/277] Adjust resource form to suit the new form builder
 implementation

refs #5525
---
 application/forms/Config/ResourceForm.php | 720 ++++++++++------------
 1 file changed, 337 insertions(+), 383 deletions(-)

diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
index 9a48c1f56..d8a3cc850 100644
--- a/application/forms/Config/ResourceForm.php
+++ b/application/forms/Config/ResourceForm.php
@@ -6,350 +6,46 @@ namespace Icinga\Form\Config;
 
 use Exception;
 use Zend_Config;
-use Zend_Form_Element_Checkbox;
 use Icinga\Web\Form;
+use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form\Element\Number;
 use Icinga\Web\Form\Decorator\HelpText;
+use Icinga\Web\Form\Decorator\ElementWrapper;
 
 class ResourceForm extends Form
 {
     /**
-     * The resource
-     *
-     * @var Zend_Config
+     * Initialize this form
      */
-    protected $resource;
-
-    /**
-     * The (new) name of the resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * The old name of the resource
-     *
-     * @var string
-     */
-    protected $oldName;
-
-    /**
-     * Set the current resource name
-     *
-     * @param   string      $name   The name to set
-     */
-    public function setName($name)
+    public function init()
     {
-        $this->name = $name;
+        $this->setName('form_config_resource');
     }
 
     /**
-     * Get the current resource name
-     *
-     * @return null|string
+     * @see Form::createElemeents()
      */
-    public function getName()
+    public function createElements(array $formData)
     {
-        $name = $this->getValue('resource_all_name');
-        if (!$name) {
-            return $this->name;
-        }
-
-        return $name;
-    }
-
-    /**
-     * Set the original name of the resource
-     *
-     * @param   string      $name   The name to set
-     */
-    public function setOldName($name)
-    {
-        $this->oldName = $name;
-    }
-
-    /**
-     * Get the resource name that was initially set
-     *
-     * @return  null|string
-     */
-    public function getOldName()
-    {
-        $oldName = $this->getValue('resource_all_name_old');
-        if (!$oldName) {
-            return $this->oldName;
-        }
-
-        return $oldName;
-    }
-
-    /**
-     * Set the resource configuration to edit.
-     *
-     * @param   Zend_Config     $resource   The config to set
-     */
-    public function setResource(Zend_Config $resource)
-    {
-        $this->resource = $resource;
-    }
-
-    /**
-     * Get the current resource configuration.
-     *
-     * @return  Zend_Config
-     */
-    public function getResource()
-    {
-        if (!isset($this->resource)) {
-            $this->resource = new Zend_Config(array('type' => 'db'));
-        }
-
-        return $this->resource;
-    }
-
-    protected function addDbForm()
-    {
-        $this->addElement(
-            'select',
-            'resource_db_db',
-            array(
-                'required'      => true,
-                'label'         => t('Database Type'),
-                'helptext'      => t('The type of SQL database you want to create.'),
-                'value'         => $this->getResource()->get('db', 'mysql'),
-                'multiOptions'  => array(
-                    'mysql'         => 'MySQL',
-                    'pgsql'         => 'PostgreSQL'
-                    //'oracle'        => 'Oracle'
-                )
-            )
-        );
-
-        $this->addElement(
+        $elements = array();
+        $elements[] = $this->createElement(
             'text',
-            'resource_db_host',
-            array (
-                'required'  => true,
-                'label'     => t('Host'),
-                'helptext'  => t('The hostname of the database.'),
-                'value'     => $this->getResource()->get('host', 'localhost')
-            )
-        );
-
-        $this->addElement(
-            new Number(
-                array(
-                    'name'      => 'resource_db_port',
-                    'required'  => true,
-                    'label'     => t('Port'),
-                    'helptext'  => t('The port to use.'),
-                    'value'     => $this->getResource()->get('port', 3306)
-                )
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_db_dbname',
-            array(
-                'required'  => true,
-                'label'     => t('Database Name'),
-                'helptext'  => t('The name of the database to use'),
-                'value'     => $this->getResource()->get('dbname', '')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_db_username',
-            array (
-                'required'  => true,
-                'label'     => t('Username'),
-                'helptext'  => t('The user name to use for authentication.'),
-                'value'     => $this->getResource()->get('username', '')
-            )
-        );
-
-        $this->addElement(
-            'password',
-            'resource_db_password',
-            array(
-                'required'          => true,
-                'renderPassword'    => true,
-                'label'             => t('Password'),
-                'helptext'          => t('The password to use for authentication'),
-                'value'             => $this->getResource()->get('password', '')
-            )
-        );
-    }
-
-    protected function addStatusdatForm()
-    {
-        $this->addElement(
-            'text',
-            'resource_statusdat_status_file',
-            array(
-                'required'  => true,
-                'label'     => t('Filepath'),
-                'helptext'  => t('Location of your icinga status.dat file'),
-                'value'     => $this->getResource()->get('status_file', '/usr/local/icinga/var/status.dat')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_statusdat_object_file',
-            array(
-                'required'  => true,
-                'label'     => t('Filepath'),
-                'helptext'  => t('Location of your icinga objects.cache file'),
-                'value'     => $this->getResource()->get('status_file', '/usr/local/icinga/var/objects.cache')
-            )
-        );
-    }
-
-    protected function addLivestatusForm()
-    {
-        $this->addElement(
-            'text',
-            'resource_livestatus_socket',
-            array(
-                'required'  => true,
-                'label'     => t('Socket'),
-                'helptext'  => t('The path to your livestatus socket used for querying monitoring data'),
-                'value'     => $this->getResource()->get('socket', '/usr/local/icinga/var/rw/livestatus')
-            )
-        );
-    }
-
-    protected function addLdapForm()
-    {
-        $this->addElement(
-            'text',
-            'resource_ldap_hostname',
-            array(
-                'required'      => true,
-                'allowEmpty'    => false,
-                'label'         => t('Host'),
-                'helptext'      => t('The hostname or address of the LDAP server to use for authentication'),
-                'value'         => $this->getResource()->get('hostname', 'localhost')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_ldap_root_dn',
-            array(
-                'required'  => true,
-                'label'     => t('Root DN'),
-                'helptext'  => t('The path where users can be found on the ldap server'),
-                'value'     => $this->getResource()->get('root_dn', 'ou=people,dc=icinga,dc=org')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_ldap_bind_dn',
-            array(
-                'required'  => true,
-                'label'     => t('Bind DN'),
-                'helptext'  => t('The user dn to use for querying the ldap server'),
-                'value'     => $this->getResource()->get('bind_dn', 'cn=admin,cn=config')
-            )
-        );
-
-        $this->addElement(
-            'password',
-            'resource_ldap_bind_pw',
-            array(
-                'required'          => true,
-                'renderPassword'    => true,
-                'label'             => t('Bind Password'),
-                'helptext'          => t('The password to use for querying the ldap server'),
-                'value'             => $this->getResource()->get('bind_pw', '')
-            )
-        );
-    }
-
-    protected function addFileForm()
-    {
-        $this->addElement(
-            'text',
-            'resource_file_filename',
-            array(
-                'required'  => true,
-                'label'     => t('Filepath'),
-                'helptext'  => t('The filename to fetch information from'),
-                'value'     => $this->getResource()->get('filename', '')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'resource_file_fields',
-            array(
-                'required'  => true,
-                'label'     => t('Pattern'),
-                'helptext'  => t('The regular expression by which to identify columns'),
-                'value'     => $this->getResource()->get('fields', '')
-            )
-        );
-    }
-
-    protected function addNameFields()
-    {
-        $this->addElement(
-            'text',
-            'resource_all_name',
+            'name',
             array(
                 'required'  => true,
                 'label'     => t('Resource Name'),
-                'helptext'  => t('The unique name of this resource'),
-                'value'     => $this->getName()
+                'helptext'  => t('The unique name of this resource')
             )
         );
-
-        $this->addElement(
-            'hidden',
-            'resource_all_name_old',
-            array(
-                'value' => $this->getOldName()
-            )
-        );
-    }
-
-    /**
-     * Add checkbox at the beginning of the form which allows to skip connection validation
-     */
-    protected function addForceCreationCheckbox()
-    {
-        $checkbox = new Zend_Form_Element_Checkbox(
-            array(
-                'order'     => 0,
-                'name'      => 'resource_force_creation',
-                'label'     => t('Force Changes'),
-                'helptext'  => t('Check this box to enforce changes without connectivity validation')
-            )
-        );
-        $checkbox->addDecorator(new HelpText());
-        $this->addElement($checkbox);
-    }
-
-    /**
-     * Add a select box for choosing the type to use for this backend
-     */
-    protected function addTypeSelectionBox()
-    {
-        $this->addElement(
+        $elements[] = $this->createElement(
             'select',
-            'resource_type',
+            'type',
             array(
                 'required'      => true,
+                'class'         => 'autosubmit',
                 'label'         => t('Resource Type'),
                 'helptext'      => t('The type of resource'),
-                'value'         => $this->getResource()->type,
                 'multiOptions'  => array(
                     'db'            => t('SQL Database'),
                     'ldap'          => 'LDAP',
@@ -359,60 +55,92 @@ class ResourceForm extends Form
                 )
             )
         );
-        $this->enableAutoSubmit(array('resource_type'));
+
+        if (isset($formData['force_creation']) && $formData['force_creation']) {
+            // In case the resource name already exists and the checkbox was displayed before
+            $elements[] = $this->getForceCreationCheckbox();
+        }
+
+        if (false === isset($formData['type']) || $formData['type'] === 'db') {
+            return array_merge($elements, $this->getDbElements());
+        } elseif ($formData['type'] === 'statusdat') {
+            return array_merge($elements, $this->getStatusdatElements());
+        } elseif ($formData['type'] === 'livestatus') {
+            return array_merge($elements, $this->getLivestatusElements());
+        } elseif ($formData['type'] === 'ldap') {
+            return array_merge($elements, $this->getLdapElements());
+        } elseif ($formData['type'] === 'file') {
+            return array_merge($elements, $this->getFileElements());
+        }
     }
 
     /**
-     * Validate this form with the Zend validation mechanism and perform a validation of the connection
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Return whether the given values are complete/valid and check whether it is possible to connect to the resource
      *
-     * If validation fails, the 'resource_force_creation' checkbox is prepended to the form to allow users to
-     * skip the connection validation
+     * If connection validation fails, a checkbox is prepended to the form to allow users to skip it.
      *
-     * @param   array   $data   The form input to validate
+     * @param   array   $data   The data to validate
      *
-     * @return  bool            True when validation succeeded, false if not
+     * @return  bool            Whether the validation succeeded or not
      */
     public function isValid($data)
     {
-        if (!parent::isValid($data)) {
+        if (false === parent::isValid($data)) {
             return false;
         }
-        if (isset($data['resource_force_creation']) && $data['resource_force_creation']) {
-            return true;
-        }
-        if (!$this->isValidResource()) {
-            $this->addForceCreationCheckbox();
+
+        if (
+            (false === isset($data['force_creation']) || false == $data['force_creation'])
+            && false === $this->isValidResource()
+        ) {
+            $this->addElement($this->getForceCreationCheckbox());
             return false;
         }
+
         return true;
     }
 
     /**
-     * Test if the changed resource is a valid resource, by instantiating it and
-     * checking if a connection is possible
+     * Return whether a connection can be established with the current resource configuration values
      *
-     * @return  bool    True when a connection to the resource is possible
+     * @return  bool    Whether the connection validation was successful or not
      */
     public function isValidResource()
     {
-        $config = $this->getConfig();
+        list($name, $config) = $this->getResourceConfig();
 
         try {
-            switch ($config->type) {
+            switch ($config['type']) {
                 case 'db':
                     /*
                      * It should be possible to run icingaweb without the pgsql or mysql extension or Zend-Pdo-Classes,
                      * in case they aren't actually used. When the user tries to create a resource that depends on an
                      * uninstalled extension, an error should be displayed.
                      */
-                    if ($config->db === 'mysql' && !ResourceFactory::mysqlAvailable()) {
+                    if ($config['db'] === 'mysql' && false === ResourceFactory::mysqlAvailable()) {
                         $this->addErrorMessage(
                             t('You need to install the php extension "mysql" and the ' .
                               'Zend_Pdo_Mysql classes to use  MySQL database resources.')
                         );
                         return false;
                     }
-                    if ($config->db === 'pgsql' && !ResourceFactory::pgsqlAvailable()) {
+                    if ($config['db'] === 'pgsql' && false === ResourceFactory::pgsqlAvailable()) {
                         $this->addErrorMessage(
                             t('You need to install the php extension "pgsql" and the ' .
                               'Zend_Pdo_Pgsql classes to use  PostgreSQL database resources.')
@@ -420,30 +148,31 @@ class ResourceForm extends Form
                         return false;
                     }
 
-                    $resource = ResourceFactory::createResource($config);
+                    $resource = ResourceFactory::createResource(new Zend_Config($config));
                     $resource->getConnection()->getConnection();
                     break;
                 case 'statusdat':
-                    if (!file_exists($config->object_file) || !file_exists($config->status_file)) {
+                    if (
+                        false === file_exists($config['object_file'])
+                        || false === file_exists($config['status_file'])
+                    ) {
                         $this->addErrorMessage(
-                            t('Connectivity validation failed, the provided file does not exist.')
+                            t('Connectivity validation failed. At least one of the provided files does not exist.')
                         );
                         return false;
                     }
                     break;
                 case 'livestatus':
-                    $resource = ResourceFactory::createResource($config);
+                    $resource = ResourceFactory::createResource(new Zend_Config($config));
                     $resource->connect()->disconnect();
                     break;
                 case 'ldap':
-                    $resource = ResourceFactory::createResource($config);
+                    $resource = ResourceFactory::createResource(new Zend_Config($config));
                     $resource->connect();
                     break;
                 case 'file':
-                    if (!file_exists($config->filename)) {
-                        $this->addErrorMessage(
-                            t('Connectivity validation failed, the provided file does not exist.')
-                        );
+                    if (false === file_exists($config['filename'])) {
+                        $this->addErrorMessage(t('Connectivity validation failed. The provided file does not exist.'));
                         return false;
                     }
                     break;
@@ -456,51 +185,276 @@ class ResourceForm extends Form
         return true;
     }
 
-    public function create()
+    /**
+     * Return the resource configuration values and its name
+     *
+     * The first value is the name and the second one the values as array.
+     *
+     * @return  array
+     */
+    public function getResourceConfig()
     {
-        $this->addNameFields();
-        $this->addTypeSelectionBox();
-
-        switch ($this->getRequest()->getParam('resource_type', $this->getResource()->type)) {
-            case 'db':
-                $this->addDbForm();
-                break;
-            case 'statusdat':
-                $this->addStatusdatForm();
-                break;
-            case 'livestatus':
-                $this->addLivestatusForm();
-                break;
-            case 'ldap':
-                $this->addLdapForm();
-                break;
-            case 'file':
-                $this->addFileForm();
-                break;
-        }
-
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
+        $values = $this->getValues();
+        $name = $values['name'];
+        unset($values['name']);
+        unset($values['btn_submit']);
+        unset($values['force_creation']);
+        unset($values[$this->getTokenElementName()]);
+        return array($name, $values);
     }
 
     /**
-     * Return a configuration containing the backend settings entered in this form
+     * Populate the form with the given configuration values
      *
-     * @return  Zend_Config     The updated configuration for this backend
+     * @param   string  $name       The name of the resource
+     * @param   array   $config     The configuration values
      */
-    public function getConfig()
+    public function setResourceConfig($name, array $config)
     {
-        $values = $this->getValues();
+        $config['name'] = $name;
+        $this->populate($config);
+    }
 
-        $result = array('type' => $values['resource_type']);
-        foreach ($values as $key => $value) {
-            if ($key !== 'resource_type' && $key !== 'resource_all_name' && $key !== 'resource_all_name_old') {
-                $configKey = explode('_', $key, 3);
-                if (count($configKey) === 3) {
-                    $result[$configKey[2]] = $value;
-                }
-            }
-        }
+    /**
+     * 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,
+                'label'     => t('Force Changes'),
+                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+            )
+        );
+    }
 
-        return new Zend_Config($result);
+    /**
+     * Return all required elements to define a resource of type "db"
+     *
+     * @return  array
+     */
+    protected function getDbElements()
+    {
+        return array(
+            $this->createElement(
+                'select',
+                'db',
+                array(
+                    'required'      => true,
+                    'label'         => t('Database Type'),
+                    'helptext'      => t('The type of SQL database'),
+                    'multiOptions'  => array(
+                        'mysql'         => 'MySQL',
+                        'pgsql'         => 'PostgreSQL'
+                        //'oracle'        => 'Oracle'
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'host',
+                array (
+                    'required'  => true,
+                    'label'     => t('Host'),
+                    'helptext'  => t('The hostname of the database'),
+                    'value'     => 'localhost'
+                )
+            ),
+            new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Port'),
+                    'helptext'      => t('The port to use'),
+                    'value'         => 3306,
+                    'decorators'    => array( // The order is important!
+                        'ViewHelper',
+                        'Errors',
+                        new ElementWrapper(),
+                        new HelpText()
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'dbname',
+                array(
+                    'required'  => true,
+                    'label'     => t('Database Name'),
+                    'helptext'  => t('The name of the database to use')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'username',
+                array (
+                    'required'  => true,
+                    'label'     => t('Username'),
+                    'helptext'  => t('The user name to use for authentication')
+                )
+            ),
+            $this->createElement(
+                'password',
+                'password',
+                array(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => t('Password'),
+                    'helptext'          => t('The password to use for authentication')
+                )
+            )
+        );
+    }
+
+    /**
+     * Return all required elements to define a resource of type "statusdat"
+     *
+     * @return  array
+     */
+    protected function getStatusdatElements()
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'status_file',
+                array(
+                    'required'  => true,
+                    'label'     => t('Filepath'),
+                    'helptext'  => t('Location of your icinga status.dat file'),
+                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'object_file',
+                array(
+                    'required'  => true,
+                    'label'     => t('Filepath'),
+                    'helptext'  => t('Location of your icinga objects.cache file'),
+                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache')
+                )
+            )
+        );
+    }
+
+    /**
+     * Return all required elements to define a resource of type "livestatus"
+     *
+     * @return  array
+     */
+    protected function getLivestatusElements()
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'socket',
+                array(
+                    'required'  => true,
+                    'label'     => t('Socket'),
+                    'helptext'  => t('The path to your livestatus socket used for querying monitoring data'),
+                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
+                )
+            )
+        );
+    }
+
+    /**
+     * Return all required elements to define a resource of type "ldap"
+     *
+     * @return  array
+     */
+    protected function getLdapElements()
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'hostname',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Host'),
+                    'helptext'      => t('The hostname or address of the LDAP server to use for authentication'),
+                    'value'         => 'localhost'
+                )
+            ),
+            new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Port'),
+                    'helptext'      => t('The port of the LDAP server to use for authentication'),
+                    'value'         => 389,
+                    'decorators'    => array( // The order is important!
+                        'ViewHelper',
+                        'Errors',
+                        new ElementWrapper(),
+                        new HelpText()
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'root_dn',
+                array(
+                    'required'  => true,
+                    'label'     => t('Root DN'),
+                    'helptext'  => t('The path where users can be found on the ldap server')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'bind_dn',
+                array(
+                    'required'  => true,
+                    'label'     => t('Bind DN'),
+                    'helptext'  => t('The user dn to use for querying the ldap server')
+                )
+            ),
+            $this->createElement(
+                'password',
+                'bind_pw',
+                array(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => t('Bind Password'),
+                    'helptext'          => t('The password to use for querying the ldap server')
+                )
+            )
+        );
+    }
+
+    /**
+     * Return all required elements to define a resource of type "file"
+     *
+     * @return  array
+     */
+    protected function getFileElements()
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'filename',
+                array(
+                    'required'  => true,
+                    'label'     => t('Filepath'),
+                    'helptext'  => t('The filename to fetch information from')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'fields',
+                array(
+                    'required'  => true,
+                    'label'     => t('Pattern'),
+                    'helptext'  => t('The regular expression by which to identify columns')
+                )
+            )
+        );
     }
 }

From fd912daa3de618d741edc22540789069b9b5b8e1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 23 Jul 2014 16:39:54 +0200
Subject: [PATCH 027/277] Adjust createresource-action to suit the updated
 resource form interface

refs #5525
---
 application/controllers/ConfigController.php  | 33 ++++++++-----------
 .../scripts/config/resource/create.phtml      | 18 +++-------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index eb8220fa9..f2c1b5347 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -27,13 +27,6 @@ use Icinga\Config\PreservingIniWriter;
  */
 class ConfigController extends BaseConfigController
 {
-    /**
-     * The resource types that are available.
-     *
-     * @var array
-     */
-    private $resourceTypes = array('livestatus', 'ido', 'statusdat', 'ldap');
-
     public function init()
     {
         $this->view->tabs = Widget::create('tabs')->add('index', array(
@@ -386,28 +379,30 @@ class ConfigController extends BaseConfigController
         $this->view->resources = IcingaConfig::app('resources', true)->toArray();
     }
 
+    /**
+     * Display a form to create a new resource
+     */
     public function createresourceAction()
     {
-        $this->view->resourceTypes = $this->resourceTypes;
-        $resources = IcingaConfig::app('resources', true);
+        $this->view->messageBox = new AlertMessageBox(true);
+
         $form = new ResourceForm();
-        $form->setRequest($this->_request);
-        if ($form->isSubmittedAndValid()) {
-            $name = $form->getName();
-            if (isset($resources->{$name})) {
-                $this->addErrorMessage('Resource name "' . $name .'" already in use.');
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            list($name, $config) = $form->getResourceConfig();
+            $resources = IcingaConfig::app('resources')->toArray();
+            if (array_key_exists($name, $resources)) {
+                $this->addErrorMessage(sprintf($this->translate('Resource name "%s" already in use.'), $name));
             } else {
-                $resources->{$name} = $form->getConfig();
+                $resources[$name] = $config;
                 if ($this->writeConfigFile($resources, 'resources')) {
-                    $this->addSuccessMessage('Resource "' . $name . '" created.');
-                    $this->redirectNow("config/resource");
+                    $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully created.'), $name));
                 }
             }
         }
 
-        $this->view->messageBox = new AlertMessageBox(true);
-        $this->view->messageBox->addForm($form);
         $this->view->form = $form;
+        $this->view->messageBox->addForm($form);
         $this->render('resource/create');
     }
 
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index f82354557..74639f056 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -1,14 +1,4 @@
-<h4>
-    <i class="icinga-icon-create"></i>
-    Create New Resource
-</h4>
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<p>
-  Resources are entities that provide data to Icingaweb.
-</p>
-
-<?= $this->form ?>
\ No newline at end of file
+<?= $messageBox; ?>
+<h4><?= $this->translate('Create a new resource'); ?></h4>
+<p><?= $this->translate('Resources are entities that provide data to Icingaweb.'); ?></p>
+<?= $form; ?>
\ No newline at end of file

From 4fe46a2c6eb3ed0924fb6a6ee651dacb1be1f620 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 08:45:38 +0200
Subject: [PATCH 028/277] Remove unnecessary properties and their
 getters/setters

This kind of data is mainly prepared in the controller's action now or
directly fetched in a concrete form implementation.

refs #5525
---
 .../Config/Authentication/BaseBackendForm.php | 89 -------------------
 1 file changed, 89 deletions(-)

diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 7a34f236a..9192b08c4 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -4,10 +4,8 @@
 
 namespace Icinga\Form\Config\Authentication;
 
-use \Zend_Config;
 use \Zend_Form_Element_Checkbox;
 use Icinga\Web\Form;
-use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form\Decorator\HelpText;
 
 /**
@@ -15,93 +13,6 @@ use Icinga\Web\Form\Decorator\HelpText;
  */
 abstract class BaseBackendForm extends Form
 {
-    /**
-     * The name of the backend currently displayed in this form
-     *
-     * Will be the section in the authentication.ini file
-     *
-     * @var string
-     */
-    protected $backendName = '';
-
-    /**
-     * The backend configuration as a Zend_Config object
-     *
-     * @var Zend_Config
-     */
-    protected $backend;
-
-    /**
-     * The resources to use instead of the factory provided ones (use for testing)
-     *
-     * @var Zend_Config
-     */
-    protected $resources;
-
-    /**
-     * Set the name of the currently displayed backend
-     *
-     * @param   string  $name   The name to be stored as the section when persisting
-     */
-    public function setBackendName($name)
-    {
-        $this->backendName = $name;
-    }
-
-    /**
-     * Return the backend name of this form
-     *
-     * @return  string
-     */
-    public function getBackendName()
-    {
-        return $this->backendName;
-    }
-
-    /**
-     * Return the backend configuration or a empty Zend_Config object if none is given
-     *
-     * @return  Zend_Config
-     */
-    public function getBackend()
-    {
-        return ($this->backend !== null) ? $this->backend : new Zend_Config(array());
-    }
-
-    /**
-     * Set the backend configuration for initial population
-     *
-     * @param   Zend_Config     $backend    The backend to display in this form
-     */
-    public function setBackend(Zend_Config $backend)
-    {
-        $this->backend = $backend;
-    }
-
-    /**
-     * Set an alternative array of resources that should be used instead of the DBFactory resource set
-     *
-     * @param   array   $resources      The resources to use for populating the db selection field
-     */
-    public function setResources(array $resources)
-    {
-        $this->resources = $resources;
-    }
-
-    /**
-     * Return content of the resources.ini or previously set resources
-     *
-     * @return  array
-     */
-    public function getResources()
-    {
-        if ($this->resources === null) {
-            return ResourceFactory::getResourceConfigs()->toArray();
-        } else {
-            return $this->resources;
-        }
-    }
-
     /**
      * Add checkbox at the beginning of the form which allows to skip logic connection validation
      */

From 235c4a8c5244def3df291951668e551c109e6d46 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 08:47:58 +0200
Subject: [PATCH 029/277] Remove getConfig and add get/setBackendConfig instead

As for every configuration form, backend forms need special population
mechanisms as well.

refs #5525
---
 .../Config/Authentication/BaseBackendForm.php | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 9192b08c4..b48aef98c 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -55,14 +55,6 @@ abstract class BaseBackendForm extends Form
         return true;
     }
 
-    /**
-     * Return an array containing all sections defined by this form as the key and all settings
-     * as an key-value sub-array
-     *
-     * @return  array
-     */
-    abstract public function getConfig();
-
     /**
      * Validate the configuration state of this backend with the concrete authentication backend.
      *
@@ -72,4 +64,34 @@ abstract class BaseBackendForm extends Form
      * @return  bool    Whether validation succeeded or not
      */
     abstract public function isValidAuthenticationBackend();
+
+    /**
+     * Return the backend's configuration values and its name
+     *
+     * The first value is the name and the second one the values as array.
+     *
+     * @return  array
+     */
+    public function getBackendConfig()
+    {
+        $values = $this->getValues();
+        $name = $values['name'];
+        unset($values['name']);
+        unset($values['btn_submit']);
+        unset($values['force_creation']);
+        unset($values[$this->getTokenElementName()]);
+        return array($name, $values);
+    }
+
+    /**
+     * Populate the form with the given configuration values
+     *
+     * @param   string  $name       The name of the backend
+     * @param   array   $config     The configuration values
+     */
+    public function setBackendConfig($name, array $config)
+    {
+        $config['name'] = $name;
+        $this->populate($config);
+    }
 }

From d8b468cf12528c7a6ab8974c1f1d024fb90d2980 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 08:49:47 +0200
Subject: [PATCH 030/277] Add addSubmitButton to BaseBackendForm

refs #5525
---
 .../Config/Authentication/BaseBackendForm.php    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index b48aef98c..4670017f0 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -30,6 +30,22 @@ abstract class BaseBackendForm extends Form
         $this->addElement($checkbox);
     }
 
+    /**
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
+    }
+
     /**
      * Validate this form with the Zend validation mechanism and perform a logic validation of the connection.
      *

From edf49d091e77488d60539d28d6f862513c065164 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 08:57:49 +0200
Subject: [PATCH 031/277] Rewrite addForceCreationCheckbox and move it
 downwards

We should not instantiate form elements directly without any specific
reason.

refs #5525
---
 .../Config/Authentication/BaseBackendForm.php | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 4670017f0..92f231c8f 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -4,32 +4,13 @@
 
 namespace Icinga\Form\Config\Authentication;
 
-use \Zend_Form_Element_Checkbox;
 use Icinga\Web\Form;
-use Icinga\Web\Form\Decorator\HelpText;
 
 /**
  * Base form for authentication backend forms
  */
 abstract class BaseBackendForm extends Form
 {
-    /**
-     * Add checkbox at the beginning of the form which allows to skip logic connection validation
-     */
-    protected function addForceCreationCheckbox()
-    {
-        $checkbox = new Zend_Form_Element_Checkbox(
-            array(
-                'name'      =>  'backend_force_creation',
-                'label'     =>  t('Force Changes'),
-                'helptext'  =>  t('Check this box to enforce changes without connectivity validation'),
-                'order'     =>  0
-            )
-        );
-        $checkbox->addDecorator(new HelpText());
-        $this->addElement($checkbox);
-    }
-
     /**
      * @see Form::addSubmitButton()
      */
@@ -110,4 +91,21 @@ abstract class BaseBackendForm extends Form
         $config['name'] = $name;
         $this->populate($config);
     }
+
+    /**
+     * Add a checkbox to be displayed at the beginning of the form
+     * which allows the user to skip the connection validation
+     */
+    protected function addForceCreationCheckbox()
+    {
+        $this->addElement(
+            'checkbox',
+            'force_creation',
+            array(
+                'order'     => 0,
+                'label'     => t('Force Changes'),
+                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+            )
+        );
+    }
 }

From 9c434fe8bf9e3c2f6817c1e340deedb6cd81a709 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 09:05:10 +0200
Subject: [PATCH 032/277] Make isValid more compact and fix coding style

refs #5525
---
 .../Config/Authentication/BaseBackendForm.php | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 92f231c8f..cde39d1eb 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -28,35 +28,36 @@ abstract class BaseBackendForm extends Form
     }
 
     /**
-     * Validate this form with the Zend validation mechanism and perform a logic validation of the connection.
+     * Return whether the given values are complete/valid and check whether it is possible to connect to the backend
      *
-     * If logic validation fails, the 'backend_force_creation' checkbox is prepended to the form to allow users to
-     * skip the logic connection validation.
+     * If connection validation fails, a checkbox is prepended to the form to allow users to skip it.
      *
-     * @param   array   $data   The form input to validate
+     * @param   array   $data   The data to validate
      *
-     * @return  bool            Whether validation succeeded or not
+     * @return  bool            Whether the validation succeeded or not
      */
     public function isValid($data)
     {
-        if (!parent::isValid($data)) {
+        if (false === parent::isValid($data)) {
             return false;
         }
-        if (isset($data['backend_force_creation']) && $data['backend_force_creation']) {
-            return true;
-        }
-        if (!$this->isValidAuthenticationBackend()) {
+
+        if (
+            (false === isset($data['force_creation']) || false === $data['force_creation'])
+            && false === $this->isValidAuthenticationBackend()
+        ) {
             $this->addForceCreationCheckbox();
             return false;
         }
+
         return true;
     }
 
     /**
      * Validate the configuration state of this backend with the concrete authentication backend.
      *
-     * An implementation should not throw any exception, but use the add/setErrorMessages method of
-     * Zend_Form. If the 'backend_force_creation' checkbox is set, this method won't be called.
+     * An implementation should not throw any exception, but use the add/setErrorMessages method
+     * of Zend_Form. If the 'force_creation' checkbox is set, this method won't be called.
      *
      * @return  bool    Whether validation succeeded or not
      */

From 0964316df45d2487674c67b8208b976871edaeb9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 12:37:33 +0200
Subject: [PATCH 033/277] Adjust editresource-action to suit the new resource
 form interface

refs #5525
---
 application/controllers/ConfigController.php  | 59 ++++++++++---------
 .../scripts/config/resource/modify.phtml      | 21 +------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f2c1b5347..4e6bc9bd7 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -406,41 +406,44 @@ class ConfigController extends BaseConfigController
         $this->render('resource/create');
     }
 
+    /**
+     * Display a form to edit a existing resource
+     */
     public function editresourceAction()
     {
         $this->view->messageBox = new AlertMessageBox(true);
 
-        $resources = ResourceFactory::getResourceConfigs();
-        $name =  $this->getParam('resource');
-        if ($resources->get($name) === null) {
-            $this->addErrorMessage('Can\'t edit: Unknown Resource Provided');
-            $this->render('resource/modify');
-            return;
-        }
-        $form = new ResourceForm();
-        if ($this->_request->isPost() === false) {
-            $form->setOldName($name);
-            $form->setName($name);
-        }
-        $form->setRequest($this->_request);
-        $form->setResource($resources->get($name));
-        if ($form->isSubmittedAndValid()) {
-            $oldName = $form->getOldName();
-            $name = $form->getName();
-            if ($oldName !== $name) {
-                unset($resources->{$oldName});
-            }
-            $resources->{$name} = $form->getConfig();
-            if ($this->writeConfigFile($resources, 'resources')) {
-                $this->addSuccessMessage('Resource "' . $name . '" edited.');
-                $this->redirectNow("config/resource");
-            }
-            return;
+        // Fetch the resource to be edited
+        $resources = IcingaConfig::app('resources')->toArray();
+        $name = $this->getParam('resource');
+        if (false === array_key_exists($name, $resources)) {
+            $this->addErrorMessage(sprintf($this->translate('Cannot edit "%s". Resource not found.'), $name));
+            $this->redirectNow('config/configurationerror');
+        }
+
+        $form = new ResourceForm();
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                list($newName, $config) = $form->getResourceConfig();
+
+                if ($newName !== $name) {
+                    // Resource name has changed
+                    unset($resources[$name]); // We can safely use unset as all values are part of the form
+                }
+
+                $resources[$newName] = $config;
+                if ($this->writeConfigFile($resources, 'resources')) {
+                    $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully edited.'), $name));
+                    $this->redirectNow('config/resource');
+                }
+            }
+        } else {
+            $form->setResourceConfig($name, $resources[$name]);
         }
 
-        $this->view->messageBox->addForm($form);
         $this->view->form = $form;
-        $this->view->name = $name;
+        $this->view->messageBox->addForm($form);
         $this->render('resource/modify');
     }
 
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index 5a0871aed..7f549d537 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -1,18 +1,3 @@
-<h4>
-    <i class="icinga-icon-edit"></i>
-    Edit Resource "<?= $this->escape($this->name); ?>"
-</h4>
-
-<?php if (isset($this->messageBox)): ?>
-    <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?php if ($this->form->getErrorMessages()): ?>
-<div>
-  <?php foreach ($this->form->getErrorMessages() as $error): ?>
-    <?= $this->escape($error); ?><br/>
-  <?php endforeach; ?>
-</div>
-<?php endif ?>
-
-<?= $this->form ?>
\ No newline at end of file
+<h4><?= $this->translate('Edit Existing Resource'); ?></h4>
+<?= $messageBox; ?>
+<?= $form; ?>
\ No newline at end of file

From 1902b4f10fdcb30222014dba41762936b3d348f1 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Thu, 24 Jul 2014 15:50:01 +0200
Subject: [PATCH 034/277] Make it possible to create an authentication backend
 of type autologin

refs #6434
---
 application/controllers/ConfigController.php  | 60 +++++++++++--------
 .../views/scripts/config/authentication.phtml |  6 +-
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f2c1b5347..210a4af68 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -16,6 +16,7 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Form\Config\GeneralForm;
 use Icinga\Form\Config\Authentication\LdapBackendForm;
 use Icinga\Form\Config\Authentication\DbBackendForm;
+use Icinga\Form\Config\Authentication\AutologinBackendForm;
 use Icinga\Form\Config\ResourceForm;
 use Icinga\Form\Config\LoggingForm;
 use Icinga\Form\Config\ConfirmRemovalForm;
@@ -228,38 +229,47 @@ class ConfigController extends BaseConfigController
     public function createauthenticationbackendAction()
     {
         $this->view->messageBox = new AlertMessageBox(true);
+        $this->view->tabs->activate('authentication');
 
-        if ($this->getRequest()->getParam('type') === 'ldap') {
+        $backendType = $this->getRequest()->getParam('type');
+        $authenticationConfig = IcingaConfig::app('authentication')->toArray();
+        if ($backendType === 'ldap') {
             $form = new LdapBackendForm();
-        } else {
+        } else if ($backendType === 'db') {
             $form = new DbBackendForm();
+        } else if ($backendType === 'autologin') {
+            $existing = array_filter($authenticationConfig, function ($e) { return $e['backend'] === 'autologin'; });
+            if (false === empty($existing)) {
+                $this->addErrorMessage(
+                    $this->translate('An autologin backend already exists')
+                );
+                $this->redirectNow('config/configurationerror');
+            }
+            $form = new AutologinBackendForm();
+        } else {
+            $this->addErrorMessage(sprintf(
+                $this->translate('There is no backend type `%s\''),
+                $backendType
+            ));
+            $this->redirectNow('config/configurationerror');
         }
-        if ($this->getParam('auth_backend')) {
-            $form->setBackendName($this->getParam('auth_backend'));
-        }
-        $form->setRequest($this->getRequest());
 
-        if ($form->isSubmittedAndValid()) {
-            $backendCfg = IcingaConfig::app('authentication')->toArray();
-            foreach ($backendCfg as $backendName => $settings) {
-                unset($backendCfg[$backendName]['name']);
-            }
-            foreach ($form->getConfig() as $backendName => $settings) {
-                unset($settings->{'name'});
-                if (isset($backendCfg[$backendName])) {
-                    $this->addErrorMessage('Backend name already exists');
-                    $this->view->form = $form;
-                    $this->render('authentication/create');
-                    return;
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            list($backendName, $backendConfig) = $form->getBackendConfig();
+            if (isset($authenticationConfig[$backendName])) {
+                $this->addErrorMessage(
+                    $this->translate('Backend name already exists')
+                );
+            } else {
+                $authenticationConfig[$backendName] = $backendConfig;
+                if ($this->writeConfigFile($authenticationConfig, 'authentication')) {
+                    $this->addSuccessMessage(
+                        $this->translate('Backend Modification Written.')
+                    );
+                    $this->redirectNow('config/authentication');
                 }
-                $backendCfg[$backendName] = $settings;
             }
-            if ($this->writeAuthenticationFile($backendCfg)) {
-                // redirect to overview with success message
-                Notification::success('Backend Modification Written.');
-                $this->redirectNow("config/authentication");
-            }
-            return;
         }
 
         $this->view->messageBox->addForm($form);
diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index 13cdd901e..5f1be17bd 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -11,6 +11,10 @@
     <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'db')); ?>">
       <?= $this->icon('create.png'); ?><?= $this->translate('Create A New DB Authentication Backend'); ?>
     </a>
+    <br>
+    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'autologin')); ?>">
+      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New Autologin Authentication Backend'); ?>
+    </a>
   </p>
   <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>">
     <?= $form->getElement($form->getTokenElementName()); ?>
@@ -50,4 +54,4 @@
       </tbody>
     </table>
   </form>
-</div>
\ No newline at end of file
+</div>

From c3731fa79ec140ab739a7083e975d5000a522792 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 16:17:30 +0200
Subject: [PATCH 035/277] Adjust removeresource-action to suit the new resource
 form interface

refs #5525
---
 application/controllers/ConfigController.php  | 54 ++++++++++---------
 .../scripts/config/resource/remove.phtml      | 13 ++---
 .../Web/Controller/BaseConfigController.php   | 14 +++++
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 4e6bc9bd7..ee91f729f 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -447,44 +447,50 @@ class ConfigController extends BaseConfigController
         $this->render('resource/modify');
     }
 
+    /**
+     * Display a confirmation form to remove a resource
+     */
     public function removeresourceAction()
     {
         $this->view->messageBox = new AlertMessageBox(true);
 
-        $resources = ResourceFactory::getResourceConfigs()->toArray();
-        $name =  $this->getParam('resource');
-        if (!isset($resources[$name])) {
-            $this->addSuccessMessage('Can\'t remove: Unknown resource provided');
-            $this->render('resource/remove');
-            return;
+        // Fetch the resource to be removed
+        $resources = IcingaConfig::app('resources')->toArray();
+        $name = $this->getParam('resource');
+        if (false === array_key_exists($name, $resources)) {
+            $this->addErrorMessage(sprintf($this->translate('Cannot remove "%s". Resource not found.'), $name));
+            $this->redirectNow('config/configurationerror');
+        }
+
+        // Check if selected resource is currently used for authentication
+        $authConfig = IcingaConfig::app('authentication')->toArray();
+        foreach ($authConfig as $backendName => $config) {
+            if (array_key_exists('resource', $config) && $config['resource'] === $name) {
+                $this->addWarningMessage(
+                    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.'
+                        ),
+                        $name,
+                        $backendName
+                    )
+                );
+            }
         }
 
         $form = new ConfirmRemovalForm();
-        $form->setRequest($this->getRequest());
-        $form->setRemoveTarget('resource', $name);
-
-        // Check if selected resource is currently used for authentication
-        $authConfig = IcingaConfig::app('authentication', true)->toArray();
-        foreach ($authConfig as $backendName => $config) {
-           if (array_key_exists('resource', $config) && $config['resource'] === $name) {
-              $this->addErrorMessage(
-				'Warning: The resource "' . $name . '" is currently used for user authentication by "' . $backendName  . '". ' .
-				' Deleting it could eventally make login impossible.'
-              );
-           }
-        }
-
-        if ($form->isSubmittedAndValid()) {
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
             unset($resources[$name]);
             if ($this->writeConfigFile($resources, 'resources')) {
-                $this->addSuccessMessage('Resource "' . $name . '" removed.');
+                $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully removed.'), $name));
                 $this->redirectNow('config/resource');
             }
-            return;
         }
 
-        $this->view->name = $name;
         $this->view->form = $form;
+        $this->view->messageBox->addForm($form);
         $this->render('resource/remove');
     }
 
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index 3b5ffbfc1..fba6b081b 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -1,10 +1,3 @@
-<h4>
-    <i class="icinga-icon-remove"></i>
-    Remove Resource "<?= $this->escape($this->name); ?>"
-</h4>
-
-<?php if (isset($this->messageBox)): ?>
-    <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?= $this->form ?>
+<h4><?= $this->translate('Remove Existing Resource'); ?></h4>
+<?= $messageBox; ?>
+<?= $form; ?>
\ No newline at end of file
diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php
index 98941686e..b4c90f3e2 100644
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ b/library/Icinga/Web/Controller/BaseConfigController.php
@@ -47,6 +47,20 @@ class BaseConfigController extends ActionController
         Session::getSession()->write();
     }
 
+    /**
+     * Send a message with the logging level Zend_Log::WARN to the current user and
+     * commit the changes to the underlying session.
+     *
+     * @param $msg      The message content
+     */
+    protected function addWarningMessage($msg)
+    {
+        AuthenticationManager::getInstance()->getUser()->addMessage(
+            new Message($msg, Zend_Log::WARN)
+        );
+        Session::getSession()->write();
+    }
+
     /*
      * Return an array of tabs provided by this configuration controller.
      *

From 26a78dc387e19ad95e1386adff20c6fab7c84b8a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 24 Jul 2014 16:20:01 +0200
Subject: [PATCH 036/277] Remove properties from ConfirmRemovalForm and update
 it

Which object should be removed needs not to be a part of a form but is
accessible from the url's query string which should be in the action of the
form.

refs #5525
---
 .../forms/Config/ConfirmRemovalForm.php       | 48 +++----------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index 65624c7b5..96dea6056 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -12,57 +12,23 @@ use Icinga\Web\Form;
 class ConfirmRemovalForm extends Form
 {
     /**
-     * The value of the target to remove
-     *
-     * @var string
+     * Initalize this form
      */
-    private $removeTarget;
-
-    /**
-     * The name of the target parameter to remove
-     *
-     * @var string
-     */
-    private $targetName;
-
-    /**
-     * Set the remove target in this field to be a hidden field with $name and value $target
-     *
-     * @param string $name      The name to be set in the hidden field
-     * @param string $target    The value to be set in the hidden field
-     */
-    public function setRemoveTarget($name, $target)
+    public function init()
     {
-        $this->targetName = $name;
-        $this->removeTarget = $target;
+        $this->setName('form_confirm_removal');
     }
 
     /**
-     * Create the confirmation form
-     *
-     * @see Form::create()
+     * @see Form::addSubmitButton()
      */
-    public function create()
+    public function addSubmitButton()
     {
-        $this->setName('form_confirm_removal');
         $this->addElement(
-            'hidden',
-            $this->targetName,
-            array(
-                'value'     => $this->removeTarget,
-                'required'  => true
-            )
-        );
-
-        $this->addElement(
-            'button',
+            'submit',
             'btn_submit',
             array(
-                'type'      => 'submit',
-                'escape'    => false,
-                'value'     => '1',
-                'class'     => 'btn btn-cta btn-common',
-                'label'     => '<i class="icinga-icon-remove"></i> Confirm Removal'
+                'label' => t('Confirm Removal')
             )
         );
     }

From af898cc2b3267217e96071192e4b6bef9e7c164a Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Thu, 24 Jul 2014 17:35:26 +0200
Subject: [PATCH 037/277] Prefer switch rather than if - elseif

---
 application/controllers/ConfigController.php | 40 +++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 210a4af68..a693599a9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -233,25 +233,29 @@ class ConfigController extends BaseConfigController
 
         $backendType = $this->getRequest()->getParam('type');
         $authenticationConfig = IcingaConfig::app('authentication')->toArray();
-        if ($backendType === 'ldap') {
-            $form = new LdapBackendForm();
-        } else if ($backendType === 'db') {
-            $form = new DbBackendForm();
-        } else if ($backendType === 'autologin') {
-            $existing = array_filter($authenticationConfig, function ($e) { return $e['backend'] === 'autologin'; });
-            if (false === empty($existing)) {
-                $this->addErrorMessage(
-                    $this->translate('An autologin backend already exists')
-                );
+        switch ($backendType) {
+            case 'ldap':
+                $form = new LdapBackendForm();
+                break;
+            case 'db':
+                $form = new DbBackendForm();
+                break;
+            case 'autologin':
+                $existing = array_filter($authenticationConfig, function ($e) { return $e['backend'] === 'autologin'; });
+                if (false === empty($existing)) {
+                    $this->addErrorMessage(
+                        $this->translate('An autologin backend already exists')
+                    );
+                    $this->redirectNow('config/configurationerror');
+                }
+                $form = new AutologinBackendForm();
+                break;
+            default:
+                $this->addErrorMessage(sprintf(
+                    $this->translate('There is no backend type `%s\''),
+                    $backendType
+                ));
                 $this->redirectNow('config/configurationerror');
-            }
-            $form = new AutologinBackendForm();
-        } else {
-            $this->addErrorMessage(sprintf(
-                $this->translate('There is no backend type `%s\''),
-                $backendType
-            ));
-            $this->redirectNow('config/configurationerror');
         }
 
         $request = $this->getRequest();

From 5f7652133e4479405294ca1d9ba1ab209d39aff7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 08:39:27 +0200
Subject: [PATCH 038/277] Fix code-style and documentation

---
 .../controllers/ConfigController.php          | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index c06ded57f..a6b3ab6d4 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -2,19 +2,15 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use \Exception;
-
+use Exception;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
-use Icinga\Web\Url;
-
 use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\Backend\EditBackendForm;
 use Icinga\Module\Monitoring\Form\Config\Backend\CreateBackendForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
-
 use Icinga\Exception\NotReadableError;
 
 /**
@@ -22,7 +18,6 @@ use Icinga\Exception\NotReadableError;
  */
 class Monitoring_ConfigController extends ModuleActionController
 {
-
     /**
      * Display a list of available backends and instances
      */
@@ -74,7 +69,7 @@ class Monitoring_ConfigController extends ModuleActionController
     }
 
     /**
-     * Display a form to create a new backends
+     * Display a form to create a new backend
      */
     public function createbackendAction()
     {
@@ -128,7 +123,7 @@ class Monitoring_ConfigController extends ModuleActionController
     }
 
     /**
-     * Display a form to remove the instance identified by the 'instance' parameter
+     * Display a confirmation form to remove the instance identified by the 'instance' parameter
      */
     public function removeinstanceAction()
     {
@@ -214,9 +209,14 @@ class Monitoring_ConfigController extends ModuleActionController
     }
 
     /**
-     * Display a form to remove the instance identified by the 'instance' parameter
+     * Write configuration to an ini file
+     *
+     * @param   Zend_Config     $config     The configuration to write
+     * @param   string          $file       The config file to write to
+     *
+     * @return  bool                        Whether the configuration was written or not
      */
-    private function writeConfiguration($config, $file)
+    protected function writeConfiguration($config, $file)
     {
         $target = $this->Config($file)->getConfigFile();
         $writer = new PreservingIniWriter(array('filename' => $target, 'config' => $config));
@@ -234,26 +234,26 @@ class Monitoring_ConfigController extends ModuleActionController
     }
 
     /**
-     * Return true if the backend exists in the current configuration
+     * Return whether the given backend exists in the current configuration
      *
-     * @param   string $backend The name of the backend to check for existence
+     * @param   string  $backend    The name of the backend to check
      *
-     * @return  bool True if the backend name exists, otherwise false
+     * @return  bool                Whether the backend exists or not
      */
-    private function isExistingBackend($backend)
+    protected function isExistingBackend($backend)
     {
         $backendCfg = $this->Config('backends');
         return $backend && $backendCfg->get($backend);
     }
 
     /**
-     * Return true if the instance exists in the current configuration
+     * Return whether the given instance exists in the current configuration
      *
-     * @param   string $instance The name of the instance to check for existence
+     * @param   string  $instance   The name of the instance to check
      *
-     * @return  bool True if the instance name exists, otherwise false
+     * @return  bool                Whether the instance exists or not
      */
-    private function isExistingInstance($instance)
+    protected function isExistingInstance($instance)
     {
         $instanceCfg = $this->Config('instances');
         return $instanceCfg && $instanceCfg->get($instance);

From a6bd802e3e565b2b9f873c12ebeb5eacbe08f8a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 08:58:11 +0200
Subject: [PATCH 039/277] Remove unnecessary properties and its getters/setters

refs #5525
---
 .../forms/Config/Backend/EditBackendForm.php  | 66 -------------------
 1 file changed, 66 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
index 52e420a76..93d306d72 100644
--- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
@@ -14,72 +14,6 @@ use Icinga\Data\ResourceFactory;
  */
 class EditBackendForm extends Form
 {
-    /**
-     * Database resources to use instead of the one's from ResourceFactory (used for testing)
-     *
-     * @var array
-     */
-    protected $resources;
-
-    /**
-     * The Backend configuration to use for populating the form
-     *
-     * @var Zend_Config
-     */
-    protected $backend;
-
-    /**
-     * Set the configuration to be used for initial population of the form
-     *
-     * @param Zend_Form $config
-     */
-    public function setBackendConfiguration($config)
-    {
-        $this->backend = $config;
-    }
-
-    /**
-     * Set a custom array of resources to be used in this form instead of the ones from ResourceFactory
-     * (used for testing)
-     */
-    public function setResources($resources)
-    {
-        $this->resources = $resources;
-    }
-
-    /**
-     * Return content of the resources.ini or previously set resources for displaying in the database selection field
-     *
-     * @return array
-     */
-    public function getResources()
-    {
-        if ($this->resources === null) {
-            return ResourceFactory::getResourceConfigs()->toArray();
-        } else {
-            return $this->resources;
-        }
-    }
-
-    /**
-     * Return a list of all resources of the given type ready to be used as content for a select input
-     *
-     * @param   string  $type   The type of resources to return
-     *
-     * @return  array
-     */
-    protected function getResourcesByType($type)
-    {
-        $backends = array();
-        foreach ($this->getResources() as $name => $resource) {
-            if ($resource['type'] === $type) {
-                $backends[$name] = $name;
-            }
-        }
-
-        return $backends;
-    }
-
     /**
      * Create this form
      *

From 26d42da6352f750c0753780ef13b3473333179b1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 08:58:50 +0200
Subject: [PATCH 040/277] Re-add getResourcesByType as simplified version

refs #5525
---
 .../forms/Config/Backend/EditBackendForm.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
index 93d306d72..b66383f73 100644
--- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
@@ -79,4 +79,21 @@ class EditBackendForm extends Form
             )
         );
     }
+
+    /**
+     * Return a list of all resources of the given type ready to be used as content for a select input
+     *
+     * @param   string  $type   The type of resources to return
+     *
+     * @return  array
+     */
+    protected function getResourcesByType($type)
+    {
+        $backends = array();
+        foreach (array_keys(ResourceFactory::getResourceConfigs($type)->toArray()) as $name) {
+            $backends[$name] = $name;
+        }
+
+        return $backends;
+    }
 }

From af5a3262be89a58dfd3fba0a4f2a24bc7977bd5f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 09:12:12 +0200
Subject: [PATCH 041/277] Revert backslash removal in front of namespace-less
 use statement

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

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index a6b3ab6d4..9e74943f3 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Exception;
+use \Exception;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;

From 50de21e43786e79ddd020f20e0d7e360ea47eac7 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 25 Jul 2014 10:29:33 +0200
Subject: [PATCH 042/277] Make it possible to edit an authentication backend

refs #6434
---
 application/controllers/ConfigController.php  | 68 +++++++++++--------
 .../config/authentication/modify.phtml        | 22 ++----
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index a693599a9..fd0e391fa 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -294,18 +294,21 @@ class ConfigController extends BaseConfigController
 
         $configArray = IcingaConfig::app('authentication', true)->toArray();
         $authBackend =  $this->getParam('auth_backend');
-        if (!isset($configArray[$authBackend])) {
-            $this->addErrorMessage('Can\'t edit: Unknown Authentication Backend Provided');
-            $this->configurationerrorAction();
-            return;
-        }
-        if (!array_key_exists('resource', $configArray[$authBackend])) {
-            $this->addErrorMessage('Configuration error: Backend "' . $authBackend . '" has no Resource');
-            $this->configurationerrorAction();
-            return;
+        if (false === isset($configArray[$authBackend])) {
+            $this->addErrorMessage(
+                $this->translate('Can\'t edit: Unknown Authentication Backend Provided')
+            );
+            $this->redirectNow('config/configurationerror');
         }
 
-        $type = ResourceFactory::getResourceConfig($configArray[$authBackend]['resource'])->type;
+        if (false === array_key_exists('backend', $configArray[$authBackend])) {
+            $this->addErrorMessage(sprintf(
+                $this->translate('Backend "%s" has no `backend\' setting'),
+                $authBackend
+            ));
+            $this->redirectNow('config/configurationerror');
+        }
+        $type = $configArray[$authBackend]['backend'];
         switch ($type) {
             case 'ldap':
                 $form = new LdapBackendForm();
@@ -313,32 +316,37 @@ class ConfigController extends BaseConfigController
             case 'db':
                 $form = new DbBackendForm();
                 break;
+            case 'autologin':
+                $form = new AutologinBackendForm();
+                break;
             default:
-                $this->addErrorMessage('Can\'t edit: backend type "' . $type . '" of given resource not supported.');
-                $this->configurationerrorAction();
-                return;
+                $this->addErrorMessage(sprintf(
+                    $this->translate('Can\'t edit: backend type "%s" of given resource not supported.'),
+                    $type
+                ));
+                $this->redirectNow('config/configurationerror');
         }
 
-        $form->setBackendName($this->getParam('auth_backend'));
-        $form->setBackend(IcingaConfig::app('authentication', true)->$authBackend);
-        $form->setRequest($this->getRequest());
-
-        if ($form->isSubmittedAndValid()) {
-            $backendCfg = IcingaConfig::app('authentication')->toArray();
-            foreach ($form->getConfig() as $backendName => $settings) {
-                $backendCfg[$backendName] = $settings;
-                // Remove the old section if the backend is renamed
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                list($backendName, $backendConfig) = $form->getBackendConfig();
+                $configArray[$backendName] = $backendConfig;
                 if ($backendName != $authBackend) {
-                    unset($backendCfg[$authBackend]);
+                    unset($configArray[$authBackend]);
                 }
-                unset($settings['name']);
+                if ($this->writeAuthenticationFile($configArray)) {
+                    // redirect to overview with success message
+                    Notification::success(sprintf(
+                        $this->translate('Backend "%s" saved'),
+                        $backendName
+                    ));
+                    $this->redirectNow('config/authentication');
+                }
+                return;
             }
-            if ($this->writeAuthenticationFile($backendCfg)) {
-                // redirect to overview with success message
-                Notification::success('Backend "' . $authBackend . '" created');
-                $this->redirectNow("config/authentication");
-            }
-            return;
+        } else {
+            $form->setBackendConfig($authBackend, $configArray[$authBackend]);
         }
 
         $this->view->messageBox->addForm($form);
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index ca2cef6f9..4666ce686 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -1,18 +1,8 @@
 <h4>
-    <i class="icinga-icon-edit"></i>
-    Edit Backend "<?= $this->escape($this->name); ?>"
+    <?php printf(
+        $this->translate('Edit Backend "%s"'),
+        $this->escape($this->name)
+    ); ?>
 </h4>
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?php if ($this->form->getErrorMessages()): ?>
-<div>
-  <?php foreach ($this->form->getErrorMessages() as $error): ?>
-    <?= $this->escape($error); ?><br/>
-  <?php endforeach; ?>
-</div>
-<?php endif; ?>
-
-<?= $this->form ?>
\ No newline at end of file
+<?= $messageBox; ?>
+<?= $this->form; ?>

From 644b3a162827b1ba38b50c55cfed8a4604910bf1 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 25 Jul 2014 14:49:05 +0200
Subject: [PATCH 043/277] Make it possible to remove an authentication backend

refs #6434
---
 application/controllers/ConfigController.php  | 22 ++++++++++---------
 .../config/authentication/remove.phtml        | 14 +++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index e56a8cdbe..2205bc4b2 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -366,23 +366,25 @@ class ConfigController extends BaseConfigController
 
         $configArray = IcingaConfig::app('authentication', true)->toArray();
         $authBackend =  $this->getParam('auth_backend');
-        if (!isset($configArray[$authBackend])) {
-            Notification::error('Can\'t perform removal: Unknown Authentication Backend Provided');
-            $this->render('authentication/remove');
-            return;
+        if (false === array_key_exists($authBackend, $configArray)) {
+            $this->addErrorMessage(
+                $this->translate('Can\'t perform removal: Unknown authentication backend provided')
+            );
+            $this->redirectNow('config/configurationerror');
         }
 
         $form = new ConfirmRemovalForm();
-        $form->setRequest($this->getRequest());
-        $form->setRemoveTarget('auth_backend', $authBackend);
+        $request = $this->getRequest();
 
-        if ($form->isSubmittedAndValid()) {
+        if ($request->isPost() && $form->isValid($request->getPost())) {
             unset($configArray[$authBackend]);
             if ($this->writeAuthenticationFile($configArray)) {
-                Notification::success('Authentication Backend "' . $authBackend . '" Removed');
-                $this->redirectNow("config/authentication");
+                Notification::success(sprintf(
+                    $this->translate('Authentication Backend "%s" Removed'),
+                    $authBackend
+                ));
+                $this->redirectNow('config/authentication');
             }
-            return;
         }
 
         $this->view->form = $form;
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index ed478d24b..23b85f6d7 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -1,10 +1,8 @@
 <h4>
-    <i class="icinga-icon-remove"></i>
-    Remove Backend "<?= $this->escape($this->name); ?>"
+    <?php printf(
+        $this->translate('Remove Backend "%s"'),
+        $this->escape($name)
+    ); ?>
 </h4>
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?= $this->form ?>
\ No newline at end of file
+<?= $messageBox ?>
+<?= $form ?>

From 488ea4633d232dfc54acbadeb2fd8469a50257fa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 14:50:53 +0200
Subject: [PATCH 044/277] Merge EditBackendForm with CreateBackendForm and
 rename it

It is not necessary to distinct between whether a backend is created or
edited as a user perhaps likes to change the name of a backend directly
instead of the need to remove and recreate it.

refs #5525
---
 .../Config/Backend/CreateBackendForm.php      |  45 ------
 .../forms/Config/Backend/EditBackendForm.php  |  99 -------------
 .../application/forms/Config/BackendForm.php  | 134 ++++++++++++++++++
 3 files changed, 134 insertions(+), 144 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
 delete mode 100644 modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
 create mode 100644 modules/monitoring/application/forms/Config/BackendForm.php

diff --git a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
deleted file mode 100644
index 513dea238..000000000
--- a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config\Backend;
-
-use \Zend_Config;
-
-/**
- * Extended EditBackendForm for creating new Backends
- *
- * @see EditBackendForm
- */
-class CreateBackendForm extends EditBackendForm
-{
-    /**
-     * Create this form
-     *
-     * @see EditBackendForm::create()
-     */
-    public function create()
-    {
-        $this->setBackendConfiguration(new Zend_Config(array('type' => 'ido')));
-        $this->addElement(
-            'text',
-            'backend_name',
-            array(
-                'label'     =>  'Backend Name',
-                'required'  =>  true,
-                'helptext'  =>  'This will be the identifier of this backend'
-            )
-        );
-        parent::create();
-    }
-
-    /**
-     * Return the name of the backend that is to be created
-     *
-     * @return string The name of the backend as entered in the form
-     */
-    public function getBackendName()
-    {
-        return $this->getValue('backend_name');
-    }
-}
diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
deleted file mode 100644
index b66383f73..000000000
--- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config\Backend;
-
-use Zend_Config;
-use Icinga\Web\Form;
-use Icinga\Application\Icinga;
-use Icinga\Data\ResourceFactory;
-
-/**
- * Form for modifying a monitoring backend
- */
-class EditBackendForm extends Form
-{
-    /**
-     * Create this form
-     *
-     * @see Icinga\Web\Form::create()
-     */
-    public function create()
-    {
-        $backendType = $this->getRequest()->getParam('backend_type', $this->backend->type);
-
-        $this->addElement(
-            'select',
-            'backend_type',
-            array(
-                'label'         =>  'Backend Type',
-                'value'         =>  $this->backend->type,
-                'required'      =>  true,
-                'helptext'      =>  'The data source used for retrieving monitoring information',
-                'multiOptions'  =>  array(
-                    'ido'           => 'IDO Backend',
-                    'statusdat'     => 'Status.dat',
-                    'livestatus'    => 'Livestatus'
-                )
-            )
-        );
-        $this->addElement(
-            'select',
-            'backend_resource',
-            array(
-                'label'         => 'Resource',
-                'value'         => $this->backend->resource,
-                'required'      => true,
-                'multiOptions'  => $this->getResourcesByType($backendType === 'ido' ? 'db' : $backendType),
-                'helptext'      => 'The resource to use'
-            )
-        );
-        $this->addElement(
-            'checkbox',
-            'backend_disable',
-            array(
-                'label'     => 'Disable This Backend',
-                'required'  =>  true,
-                'value'     =>  $this->backend->disabled
-            )
-        );
-
-        $this->enableAutoSubmit(array('backend_type'));
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
-    }
-
-    /**
-     * Return a configuration containing the backend settings entered in this form
-     *
-     * @return Zend_Config The updated configuration for this backend
-     */
-    public function getConfig()
-    {
-        $values = $this->getValues();
-        return new Zend_Config(
-            array(
-                'type'     => $values['backend_type'],
-                'disabled' => $values['backend_disable'],
-                'resource' => $values['backend_resource']
-            )
-        );
-    }
-
-    /**
-     * Return a list of all resources of the given type ready to be used as content for a select input
-     *
-     * @param   string  $type   The type of resources to return
-     *
-     * @return  array
-     */
-    protected function getResourcesByType($type)
-    {
-        $backends = array();
-        foreach (array_keys(ResourceFactory::getResourceConfigs($type)->toArray()) as $name) {
-            $backends[$name] = $name;
-        }
-
-        return $backends;
-    }
-}
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
new file mode 100644
index 000000000..19f870778
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/BackendForm.php
@@ -0,0 +1,134 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config;
+
+use Icinga\Web\Form;
+use Icinga\Data\ResourceFactory;
+
+/**
+ * Form for modifying a monitoring backend
+ */
+class BackendForm extends Form
+{
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'  => true,
+                    'label'     => t('Backend Name'),
+                    'helptext'  => t('The identifier of this backend')
+                )
+            ),
+            $this->createElement(
+                'select',
+                'type',
+                array(
+                    'required'      => true,
+                    'class'         => 'autosubmit',
+                    'label'         => t('Backend Type'),
+                    'helptext'      => t('The data source used for retrieving monitoring information'),
+                    'multiOptions'  => array(
+                        'ido'           => 'IDO Backend',
+                        'statusdat'     => 'Status.dat',
+                        'livestatus'    => 'Livestatus'
+                    )
+                )
+            ),
+            $this->createElement(
+                'select',
+                'resource',
+                array(
+                    'required'      => true,
+                    'label'         => t('Resource'),
+                    'helptext'      => t('The resource to use'),
+                    'multiOptions'  => $this->getResourcesByType(
+                        false === isset($formData['type']) || $formData['type'] === 'ido' ? 'db' : $formData['type']
+                    )
+                )
+            ),
+            $this->createElement(
+                'checkbox',
+                'disabled',
+                array(
+                    'required'  => true,
+                    'label'     => t('Disable This Backend')
+                )
+            )
+        );
+    }
+
+    /**
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Return the backend configuration values and its name
+     *
+     * The first value is the name and the second one the values as array.
+     *
+     * @return  array
+     */
+    public function getBackendConfig()
+    {
+        $values = $this->getValues();
+        $name = $values['name'];
+
+        if ($values['disabled'] == '0') {
+            unset($values['disabled']);
+        }
+
+        unset($values['name']);
+        unset($values['btn_submit']);
+        unset($values[$this->getTokenElementName()]);
+        return array($name, $values);
+    }
+
+    /**
+     * Populate the form with the given configuration values
+     *
+     * @param   string  $name       The name of the backend
+     * @param   array   $config     The configuration values
+     */
+    public function setBackendConfig($name, array $config)
+    {
+        $config['name'] = $name;
+        $this->populate($config);
+    }
+
+    /**
+     * Return a list of all resources of the given type ready to be used as content for a select input
+     *
+     * @param   string  $type   The type of resources to return
+     *
+     * @return  array
+     */
+    protected function getResourcesByType($type)
+    {
+        $backends = array();
+        foreach (array_keys(ResourceFactory::getResourceConfigs($type)->toArray()) as $name) {
+            $backends[$name] = $name;
+        }
+
+        return $backends;
+    }
+}

From ed10e49bb6e44d402509699650a54624c1711422 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 25 Jul 2014 14:51:42 +0200
Subject: [PATCH 045/277] Add AutologinBackendForm

fixes #6434
---
 .../Authentication/AutologinBackendForm.php   | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 application/forms/Config/Authentication/AutologinBackendForm.php

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
new file mode 100644
index 000000000..39cf6ecd3
--- /dev/null
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -0,0 +1,68 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Authentication;
+
+use Zend_Validate_Callback;
+
+class AutologinBackendForm extends BaseBackendForm
+{
+    public function isValidAuthenticationBackend()
+    {
+        return true;
+    }
+
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Backend Name'),
+                    'helptext'      => t('The name of this authentication backend'),
+                    'value'         => '',
+                    'validators'    => array(
+                        array(
+                            'Regex',
+                            false,
+                            array(
+                                'pattern'  => '/^[^\\[\\]:]+$/',
+                                'messages' => array(
+                                    'regexNotMatch' => 'The backend name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'strip_username_regexp',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Backend Domain Pattern'),
+                    'helptext'      => t('The domain pattern of this authentication backend'),
+                    'value'         => '/\@[^$]+$/',
+                    'validators'    => array(
+                        new Zend_Validate_Callback(function ($value) {
+                            return @preg_match($value, '') !== false;
+                        })
+                    )
+                )
+            ),
+            $this->createElement(
+                'hidden',
+                'backend',
+                array(
+                    'required'  => true,
+                    'value'     => 'autologin'
+                )
+            )
+        );
+    }
+}

From b743cf814319d2db301a028b41cf9557bc93e26b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 14:55:36 +0200
Subject: [PATCH 046/277] Adjust editbackend-action to suit the new
 backend-form interface

refs #5525
---
 .../controllers/ConfigController.php          | 54 ++++++++++++-------
 .../views/scripts/config/editbackend.phtml    | 15 +-----
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 9e74943f3..2e01709e6 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -3,12 +3,12 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use \Exception;
+use \Zend_Config;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
+use Icinga\Module\Monitoring\Form\Config\BackendForm;
 use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
-use Icinga\Module\Monitoring\Form\Config\Backend\EditBackendForm;
-use Icinga\Module\Monitoring\Form\Config\Backend\CreateBackendForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
 use Icinga\Exception\NotReadableError;
@@ -43,29 +43,40 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function editbackendAction()
     {
+        // Fetch the backend to be edited
         $backend = $this->getParam('backend');
-        if (!$this->isExistingBackend($backend)) {
-            $this->view->error = 'Unknown backend ' . $backend;
-            return;
+        $backendsConfig = $this->Config('backends')->toArray();
+        if (false === array_key_exists($backend, $backendsConfig)) {
+            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
+            Notification::error(sprintf($this->translate('Cannot edit "%s". Backend not found.'), $backend));
+            $this->redirectNow('monitoring/config');
         }
-        $backendForm = new EditBackendForm();
-        $backendForm->setRequest($this->getRequest());
-        $backendForm->setBackendConfiguration($this->Config('backends')->get($backend));
 
-        if ($backendForm->isSubmittedAndValid()) {
-            $newConfig = $backendForm->getConfig();
-            $config = $this->Config('backends');
-            $config->$backend = $newConfig;
-            if ($this->writeConfiguration($config, 'backends')) {
-                Notification::success('Backend ' . $backend . ' Modified.');
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
+        $form = new BackendForm();
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                list($newName, $config) = $form->getBackendConfig();
+
+                if ($newName !== $backend) {
+                    // Backend name has changed
+                    unset($backendsConfig[$backend]); // We can safely use unset as all values are part of the form
+                }
+
+                $backendsConfig[$newName] = $config;
+                if ($this->writeConfiguration($backendsConfig, 'backends')) {
+                    Notification::success(sprintf($this->translate('Backend "%s" successfully modified.'), $backend));
+                    $this->redirectNow('monitoring/config');
+                } else {
+                    $this->render('show-configuration');
+                    return;
+                }
             }
+        } else {
+            $form->setBackendConfig($backend, $backendsConfig[$backend]);
         }
-        $this->view->name = $backend;
-        $this->view->form = $backendForm;
+
+        $this->view->form = $form;
     }
 
     /**
@@ -218,6 +229,9 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     protected function writeConfiguration($config, $file)
     {
+        if (is_array($config)) {
+            $config = new Zend_Config($config);
+        }
         $target = $this->Config($file)->getConfigFile();
         $writer = new PreservingIniWriter(array('filename' => $target, 'config' => $config));
 
diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
index 6f2f19cbb..58b6c18f1 100644
--- a/modules/monitoring/application/views/scripts/config/editbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/editbackend.phtml
@@ -1,13 +1,2 @@
-<?php if ($this->name): ?>
-  <h4><i> <i class="icinga-icon-edit"></i> Edit Backend "<?= $this->escape($this->name) ?>"</h4>
-<?php else: ?>
-  <h4> <i class="icinga-icon-create"></i> Create New Backend</h4>
-<?php endif; ?>
-
-<?php if ($this->error): ?>
-<div class="alert alert-danger">
-  <?= $this->escape($this->error); ?>
-</div>
-<?php endif; ?>
-
-<?= $this->form; ?>
\ No newline at end of file
+<h4><?= $this->translate('Edit Existing Backend'); ?></h4>
+<?= $form; ?>
\ No newline at end of file

From a78d11345b277b6e5764b974e30d94c2d5f29101 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 15:58:44 +0200
Subject: [PATCH 047/277] Adjust createbackend-action to suit the new backend
 form interface

refs #5525
---
 .../controllers/ConfigController.php          | 19 +++++++++----------
 .../views/scripts/config/createbackend.phtml  |  2 ++
 2 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/config/createbackend.phtml

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 2e01709e6..c8f2780bc 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -84,22 +84,21 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function createbackendAction()
     {
-        $form = new CreateBackendForm();
-        $form->setRequest($this->getRequest());
-        if ($form->isSubmittedAndValid()) {
-            $configArray  =  $this->Config('backends')->toArray();
-            $configArray[$form->getBackendName()] = $form->getConfig();
-
-            if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
-                Notification::success('Backend Creation Succeeded');
+        $form = new BackendForm();
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            list($name, $config) = $form->getBackendConfig();
+            $backendsConfig = $this->Config('backends')->toArray();
+            $backendsConfig[$name] = $config;
+            if ($this->writeConfiguration($backendsConfig, 'backends')) {
+                Notification::success(sprintf($this->translate('Backend "%s" created successfully.'), $name));
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
             }
-            return;
         }
+
         $this->view->form = $form;
-        $this->render('editbackend');
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/config/createbackend.phtml b/modules/monitoring/application/views/scripts/config/createbackend.phtml
new file mode 100644
index 000000000..0ef51cd6a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/config/createbackend.phtml
@@ -0,0 +1,2 @@
+<h4><?= $this->translate('Add New Backend'); ?></h4>
+<?= $form; ?>
\ No newline at end of file

From d7ed6bd249eaf7eb400f2d9a7c861d87ebae7e85 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 16:00:38 +0200
Subject: [PATCH 048/277] Adjust removebackend-action to suit the new backend
 form interface

Drops additionally the ConfirmRemovalForm of the monitoring module
as there is already one in icingaweb2's form-set.

refs #5525
---
 .../controllers/ConfigController.php          | 27 ++++----
 .../forms/Config/ConfirmRemovalForm.php       | 68 -------------------
 .../views/scripts/config/removebackend.phtml  | 10 +--
 3 files changed, 14 insertions(+), 91 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Config/ConfirmRemovalForm.php

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index c8f2780bc..39023d692 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -7,8 +7,8 @@ use \Zend_Config;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
+use Icinga\Form\Config\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\BackendForm;
-use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
 use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
 use Icinga\Exception\NotReadableError;
@@ -107,29 +107,26 @@ class Monitoring_ConfigController extends ModuleActionController
     public function removebackendAction()
     {
         $backend = $this->getParam('backend');
-        if (!$this->isExistingBackend($backend)) {
-            $this->view->error = 'Unknown backend ' . $backend;
-            return;
+        $backendsConfig = $this->Config('backends')->toArray();
+        if (false === array_key_exists($backend, $backendsConfig)) {
+            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
+            Notification::error(sprintf($this->translate('Cannot remove "%s". Backend not found.'), $backend));
+            $this->redirectNow('monitoring/config');
         }
+
         $form = new ConfirmRemovalForm();
-        $form->setRequest($this->getRequest());
-        $form->setRemoveTarget('backend', $backend);
-
-        if ($form->isSubmittedAndValid()) {
-            $configArray = $this->Config('backends')->toArray();
-            unset($configArray[$backend]);
-
-            if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
-                Notification::success('Backend "' . $backend . '" Removed');
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            unset($backendsConfig[$backend]);
+            if ($this->writeConfiguration($backendsConfig, 'backends')) {
+                Notification::success(sprintf($this->translate('Backend "%s" successfully removed.'), $backend));
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
             }
-            return;
         }
 
         $this->view->form = $form;
-        $this->view->name = $backend;
     }
 
     /**
diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
deleted file mode 100644
index 6a9e17bd5..000000000
--- a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config;
-
-use Icinga\Web\Form;
-
-/**
- * Form for confirming removal of an object
- */
-class ConfirmRemovalForm extends Form
-{
-    /**
-     * The value of the target to remove
-     *
-     * @var string
-     */
-    private $removeTarget;
-
-    /**
-     * The name of the target parameter to remove
-     *
-     * @var string
-     */
-    private $targetName;
-
-    /**
-     * Set the remove target in this field to be a hidden field with $name and value $target
-     *
-     * @param string $name      The name to be set in the hidden field
-     * @param string $target    The value to be set in the hidden field
-     */
-    public function setRemoveTarget($name, $target)
-    {
-        $this->targetName = $name;
-        $this->removeTarget = $target;
-    }
-
-    /**
-     * Create the confirmation form
-     *
-     * @see Form::create()
-     */
-    public function create()
-    {
-        $this->addElement(
-            'hidden',
-            $this->targetName,
-            array(
-                'value'     => $this->removeTarget,
-                'required'  => true
-            )
-        );
-
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'type'      => 'submit',
-                'escape'    => false,
-                'value'     => '1',
-                'class'     => 'btn btn-cta btn-common',
-                'label'     => $this->getView()->icon('remove.png') . ' Confirm Removal'
-            )
-        );
-    }
-}
diff --git a/modules/monitoring/application/views/scripts/config/removebackend.phtml b/modules/monitoring/application/views/scripts/config/removebackend.phtml
index bd4a95f3b..fc7da17e3 100644
--- a/modules/monitoring/application/views/scripts/config/removebackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/removebackend.phtml
@@ -1,8 +1,2 @@
-
-<h4><i class="icinga-icon-remove"></i>  Remove Backend "<?= $this->escape($this->name) ?>"</h4>
-
-<p>
-  Are you sure you want to remove the backend <?= $this->escape($this->name) ?>?
-</p>
-
-<?= $this->form; ?>
+<h4><?= $this->translate('Remove Existing Backend'); ?></h4>
+<?= $form; ?>
\ No newline at end of file

From 5a738112ea2b92c56eb8082cbdb1046717d54e98 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 25 Jul 2014 16:02:13 +0200
Subject: [PATCH 049/277] Remove isExistingBackend/-Instance

It is more efficient to access configuration files only once instead of
accessing them multiple times in different locations.

refs #5525
---
 .../controllers/ConfigController.php          | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 39023d692..16115e434 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -242,30 +242,4 @@ class Monitoring_ConfigController extends ModuleActionController
 
         return true;
     }
-
-    /**
-     * Return whether the given backend exists in the current configuration
-     *
-     * @param   string  $backend    The name of the backend to check
-     *
-     * @return  bool                Whether the backend exists or not
-     */
-    protected function isExistingBackend($backend)
-    {
-        $backendCfg = $this->Config('backends');
-        return $backend && $backendCfg->get($backend);
-    }
-
-    /**
-     * Return whether the given instance exists in the current configuration
-     *
-     * @param   string  $instance   The name of the instance to check
-     *
-     * @return  bool                Whether the instance exists or not
-     */
-    protected function isExistingInstance($instance)
-    {
-        $instanceCfg = $this->Config('instances');
-        return $instanceCfg && $instanceCfg->get($instance);
-    }
 }

From 5e6ef57590c3d035d2b49fde9c2dff0add706f46 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 29 Jul 2014 12:21:58 +0200
Subject: [PATCH 050/277] LdapBackendForm: replace create with createElements
 and getResources with __construct

refs #5525
---
 .../Config/Authentication/LdapBackendForm.php | 174 +++++++++---------
 1 file changed, 84 insertions(+), 90 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index ee90fa95c..07e4e6f65 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -9,6 +9,7 @@ use \Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\Backend\LdapUserBackend;
+use Icinga\Exception\ConfigurationError;
 
 /**
  * Form for adding or modifying LDAP authentication backends
@@ -16,92 +17,87 @@ use Icinga\Authentication\Backend\LdapUserBackend;
 class LdapBackendForm extends BaseBackendForm
 {
     /**
-     * Return content of the resources.ini or previously set resources
-     *
-     * @return  array
+     * @var array
      */
-    public function getResources()
+    protected $resources;
+
+    public function __construct()
     {
-        if ($this->resources === null) {
-            $res = ResourceFactory::getResourceConfigs('ldap')->toArray();
-
-            foreach (array_keys($res) as $key) {
-                $res[$key] = $key;
-            }
-
-            return $res;
-        } else {
-            return $this->resources;
+        $ldapResources = array_keys(
+            ResourceFactory::getResourceConfigs('ldap')->toArray()
+        );
+        if (empty($ldapResources)) {
+            throw new ConfigurationError(
+                t('There are no LDAP resources')
+            );
         }
+        $this->resources = array_combine($ldapResources, $ldapResources);
+
+        parent::__construct();
     }
 
-    /**
-     * Create this form and add all required elements
-     *
-     * @see Form::create()
-     */
-    public function create()
+    public function createElements(array $formData)
     {
-        $this->setName('form_modify_backend');
-        $name = $this->filterName($this->getBackendName());
-        $backend = $this->getBackend();
-
-        $this->addElement(
-            'text',
-            'backend_' . $name . '_name',
-            array(
-                'required'      => true,
-                'allowEmpty'    => false,
-                'label'         => t('Backend Name'),
-                'helptext'      => t('The name of this authentication backend'),
-                'value'         => $this->getBackendName()
-            )
-        );
-
-        $this->addElement(
-            'select',
-            'backend_' . $name . '_resource',
-            array(
-                'required'      => true,
-                'allowEmpty'    => false,
-                'label'         => t('LDAP Resource'),
-                'helptext'      => t('The resource to use for authenticating with this provider'),
-                'value'         => $this->getBackend()->get('resource'),
-                'multiOptions'  => $this->getResources()
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'backend_' . $name . '_user_class',
-            array(
-                'required'  => true,
-                'label'     => t('LDAP User Object Class'),
-                'helptext'  => t('The object class used for storing users on the ldap server'),
-                'value'     => $backend->get('user_class', 'inetOrgPerson')
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'backend_' . $name . '_user_name_attribute',
-            array(
-                'required'  => true,
-                'label'     => t('LDAP User Name Attribute'),
-                'helptext'  => t('The attribute name used for storing the user name on the ldap server'),
-                'value'     => $backend->get('user_name_attribute', 'uid')
-            )
-        );
-
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'type'      => 'submit',
-                'value'     => '1',
-                'escape'    => false,
-                'class'     => 'btn btn-cta btn-wide',
-                'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+        return array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Backend Name'),
+                    'helptext'      => t('The name of this authentication backend')
+                )
+            ),
+            $this->createElement(
+                'select',
+                'resource',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('LDAP Resource'),
+                    'helptext'      => t('The resource to use for authenticating with this provider'),
+                    'multiOptions'  => $this->resources
+                )
+            ),
+            $this->createElement(
+                'text',
+                'user_class',
+                array(
+                    'required'  => true,
+                    'label'     => t('LDAP User Object Class'),
+                    'helptext'  => t('The object class used for storing users on the ldap server'),
+                    'value'     => 'inetOrgPerson'
+                )
+            ),
+            $this->createElement(
+                'text',
+                'user_name_attribute',
+                array(
+                    'required'  => true,
+                    'label'     => t('LDAP User Name Attribute'),
+                    'helptext'  => t('The attribute name used for storing the user name on the ldap server'),
+                    'value'     => 'uid'
+                )
+            ),
+            $this->createElement(
+                'button',
+                'btn_submit',
+                array(
+                    'type'      => 'submit',
+                    'value'     => '1',
+                    'escape'    => false,
+                    'class'     => 'btn btn-cta btn-wide',
+                    'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+                )
+            ),
+            $this->createElement(
+                'hidden',
+                'backend',
+                array(
+                    'required'  => true,
+                    'value'     => 'ldap'
+                )
             )
         );
     }
@@ -115,15 +111,14 @@ class LdapBackendForm extends BaseBackendForm
      */
     public function getConfig()
     {
-        $prefix = 'backend_' . $this->filterName($this->getBackendName()) . '_';
-        $section = $this->getValue($prefix . 'name');
-        $cfg = array(
-            'backend'               => 'ldap',
-            'resource'              => $this->getValue($prefix . 'resource'),
-            'user_class'            => $this->getValue($prefix . 'user_class'),
-            'user_name_attribute'   => $this->getValue($prefix . 'user_name_attribute')
+        return array(
+            $this->getValue('name') => array(
+                'backend'               => 'ldap',
+                'resource'              => $this->getValue('resource'),
+                'user_class'            => $this->getValue('user_class'),
+                'user_name_attribute'   => $this->getValue('user_name_attribute')
+            )
         );
-        return array($section => $cfg);
     }
 
     /**
@@ -146,8 +141,7 @@ class LdapBackendForm extends BaseBackendForm
         }
         try {
             $cfg = $this->getConfig();
-            $backendName = 'backend_' . $this->filterName($this->getBackendName()) . '_name';
-            $backendConfig = new Zend_Config($cfg[$this->getValue($backendName)]);
+            $backendConfig = new Zend_Config($cfg[$this->getValue('name')]);
             $backend = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource));
             $testConn = new LdapUserBackend(
                 $backend,

From 4e1e84567577755a34f530140b348fb0f6264af8 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 29 Jul 2014 12:22:43 +0200
Subject: [PATCH 051/277] DbBackendForm: replace create with createElements and
 getResources with __construct

refs #5525
---
 .../Config/Authentication/DbBackendForm.php   | 127 +++++++++---------
 1 file changed, 62 insertions(+), 65 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 2c57b82e2..5512e87ea 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -5,10 +5,10 @@
 namespace Icinga\Form\Config\Authentication;
 
 use \Exception;
-use \Zend_Config;
 use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\DbConnection;
 use Icinga\Authentication\Backend\DbUserBackend;
+use Icinga\Exception\ConfigurationError;
 
 /**
  * Form class for adding/modifying database authentication backends
@@ -16,68 +16,67 @@ use Icinga\Authentication\Backend\DbUserBackend;
 class DbBackendForm extends BaseBackendForm
 {
     /**
-     * Return content of the resources.ini or previously set resources
-     *
-     * @return  array
+     * @var array
      */
-    public function getResources()
+    protected $resources;
+
+    public function __construct()
     {
-        if ($this->resources === null) {
-            $res = ResourceFactory::getResourceConfigs('db')->toArray();
-
-            foreach (array_keys($res) as $key) {
-                $res[$key] = $key;
-            }
-
-            return $res;
-        } else {
-            return $this->resources;
+        $dbResources = array_keys(
+            ResourceFactory::getResourceConfigs('db')->toArray()
+        );
+        if (empty($dbResources)) {
+            throw new ConfigurationError(
+                t('There are no database resources')
+            );
         }
+        $this->resources = array_combine($dbResources, $dbResources);
+
+        parent::__construct();
     }
 
-    /**
-     * Create this form and add all required elements
-     *
-     * @see Form::create()
-     */
-    public function create()
+    public function createElements(array $formData)
     {
-        $this->setName('form_modify_backend');
-        $name = $this->filterName($this->getBackendName());
-        $this->addElement(
-            'text',
-            'backend_' . $name . '_name',
-            array(
-                'required'      => true,
-                'allowEmpty'    => false,
-                'label'         => t('Backend Name'),
-                'helptext'      => t('The name of this authentication provider'),
-                'value'         => $this->getBackendName()
-            )
-        );
-
-        $this->addElement(
-            'select',
-            'backend_' . $name . '_resource',
-            array(
-                'required'      => true,
-                'allowEmpty'    => false,
-                'label'         => t('Database Connection'),
-                'helptext'      => t('The database connection to use for authenticating with this provider'),
-                'value'         => $this->getBackend()->get('resource'),
-                'multiOptions'  => $this->getResources()
-            )
-        );
-
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'type'      => 'submit',
-                'value'     => '1',
-                'escape'    => false,
-                'class'     => 'btn btn-cta btn-wide',
-                'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+        return array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Backend Name'),
+                    'helptext'      => t('The name of this authentication provider'),
+                )
+            ),
+            $this->createElement(
+                'select',
+                'resource',
+                array(
+                    'required'      => true,
+                    'allowEmpty'    => false,
+                    'label'         => t('Database Connection'),
+                    'helptext'      => t('The database connection to use for authenticating with this provider'),
+                    'multiOptions'  => $this->resources
+                )
+            ),
+            $this->createElement(
+                'button',
+                'btn_submit',
+                array(
+                    'type'      => 'submit',
+                    'value'     => '1',
+                    'escape'    => false,
+                    'class'     => 'btn btn-cta btn-wide',
+                    'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+                )
+            ),
+            $this->createElement(
+                'hidden',
+                'backend',
+                array(
+                    'required'  => true,
+                    'value'     => 'db'
+                )
             )
         );
     }
@@ -91,14 +90,12 @@ class DbBackendForm extends BaseBackendForm
      */
     public function getConfig()
     {
-        $prefix = 'backend_' . $this->filterName($this->getBackendName()) . '_';
-        $section = $this->getValue($prefix . 'name');
-        $cfg = array(
-            'backend'   => 'db',
-            'resource'  => $this->getValue($prefix . 'resource'),
+        return array(
+            $this->getValue('name') => array(
+                'backend'   => 'db',
+                'resource'  => $this->getValue('resource')
+            )
         );
-
-        return array($section => $cfg);
     }
 
     /**
@@ -112,7 +109,7 @@ class DbBackendForm extends BaseBackendForm
     {
         try {
             $testConnection = ResourceFactory::createResource(ResourceFactory::getResourceConfig(
-                $this->getValue('backend_' . $this->filterName($this->getBackendName()) . '_resource')
+                $this->getValue('resource')
             ));
             $dbUserBackend = new DbUserBackend($testConnection);
             if ($dbUserBackend->count() < 1) {

From e07f2a2b0dcf7ba73a3c68b823708fbf13bdbe4e Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 29 Jul 2014 12:25:48 +0200
Subject: [PATCH 052/277] Show an error message if a ConfigurationError is
 thrown

---
 application/controllers/ConfigController.php | 52 +++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 2205bc4b2..6358bb42d 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -3,7 +3,6 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\BaseConfigController;
-use Icinga\Web\Widget\Tab;
 use Icinga\Web\Widget\AlertMessageBox;
 use Icinga\Web\Notification;
 use Icinga\Application\Modules\Module;
@@ -12,7 +11,6 @@ use Icinga\Web\Form;
 use Icinga\Web\Widget;
 use Icinga\Application\Icinga;
 use Icinga\Application\Config as IcingaConfig;
-use Icinga\Data\ResourceFactory;
 use Icinga\Form\Config\GeneralForm;
 use Icinga\Form\Config\Authentication\LdapBackendForm;
 use Icinga\Form\Config\Authentication\DbBackendForm;
@@ -21,6 +19,7 @@ use Icinga\Form\Config\ResourceForm;
 use Icinga\Form\Config\LoggingForm;
 use Icinga\Form\Config\ConfirmRemovalForm;
 use Icinga\Config\PreservingIniWriter;
+use Icinga\Exception\ConfigurationError;
 
 
 /**
@@ -233,29 +232,34 @@ class ConfigController extends BaseConfigController
 
         $backendType = $this->getRequest()->getParam('type');
         $authenticationConfig = IcingaConfig::app('authentication')->toArray();
-        switch ($backendType) {
-            case 'ldap':
-                $form = new LdapBackendForm();
-                break;
-            case 'db':
-                $form = new DbBackendForm();
-                break;
-            case 'autologin':
-                $existing = array_filter($authenticationConfig, function ($e) { return $e['backend'] === 'autologin'; });
-                if (false === empty($existing)) {
-                    $this->addErrorMessage(
-                        $this->translate('An autologin backend already exists')
-                    );
+        try {
+            switch ($backendType) {
+                case 'ldap':
+                    $form = new LdapBackendForm();
+                    break;
+                case 'db':
+                    $form = new DbBackendForm();
+                    break;
+                case 'autologin':
+                    foreach ($authenticationConfig as $ac) {
+                        if (array_key_exists('backend', $ac) && $ac['backend'] === 'autologin') {
+                            throw new ConfigurationError(
+                                $this->translate('An autologin backend already exists')
+                            );
+                        }
+                    }
+                    $form = new AutologinBackendForm();
+                    break;
+                default:
+                    $this->addErrorMessage(sprintf(
+                        $this->translate('There is no backend type `%s\''),
+                        $backendType
+                    ));
                     $this->redirectNow('config/configurationerror');
-                }
-                $form = new AutologinBackendForm();
-                break;
-            default:
-                $this->addErrorMessage(sprintf(
-                    $this->translate('There is no backend type `%s\''),
-                    $backendType
-                ));
-                $this->redirectNow('config/configurationerror');
+            }
+        } catch (ConfigurationError $e) {
+            $this->addErrorMessage($e->getMessage());
+            $this->redirectNow('config/configurationerror');
         }
 
         $request = $this->getRequest();

From c36e30af1eeea9600830eeaf5b5338b2ca1f7c92 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 09:13:41 +0200
Subject: [PATCH 053/277] Remove DbBackendForm::getConfig as it's not used
 anywhere

refs #5525
---
 .../Config/Authentication/DbBackendForm.php     | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 5512e87ea..de024c16e 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -81,23 +81,6 @@ class DbBackendForm extends BaseBackendForm
         );
     }
 
-    /**
-     * Return the datatbase authentication backend configuration for this form
-     *
-     * @return  array
-     *
-     * @see     BaseBackendForm::getConfig()
-     */
-    public function getConfig()
-    {
-        return array(
-            $this->getValue('name') => array(
-                'backend'   => 'db',
-                'resource'  => $this->getValue('resource')
-            )
-        );
-    }
-
     /**
      * Validate the current configuration by creating a backend and requesting the user count
      *

From d260c3fb94c7560dd4109b2303cda7f735a56607 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 10:39:13 +0200
Subject: [PATCH 054/277] Do not overwrite __construct() in forms, there's
 init() for that purpose

refs #5525
---
 .../forms/Config/Authentication/DbBackendForm.php  | 14 +++++++++++---
 .../Config/Authentication/LdapBackendForm.php      | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index de024c16e..d5fb1256c 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -20,19 +20,27 @@ class DbBackendForm extends BaseBackendForm
      */
     protected $resources;
 
-    public function __construct()
+    /**
+     * Initialize this form
+     *
+     * Populates $this->resources.
+     *
+     * @throws  ConfigurationError  In case no database resources can be found
+     */
+    public function init()
     {
         $dbResources = array_keys(
             ResourceFactory::getResourceConfigs('db')->toArray()
         );
+
         if (empty($dbResources)) {
             throw new ConfigurationError(
                 t('There are no database resources')
             );
         }
-        $this->resources = array_combine($dbResources, $dbResources);
 
-        parent::__construct();
+        // array_combine() is necessary in order to use the array as select input data
+        $this->resources = array_combine($dbResources, $dbResources);
     }
 
     public function createElements(array $formData)
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 07e4e6f65..d9039b8c0 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -21,19 +21,27 @@ class LdapBackendForm extends BaseBackendForm
      */
     protected $resources;
 
-    public function __construct()
+    /**
+     * Initialize this form
+     *
+     * Populates $this->resources.
+     *
+     * @throws  ConfigurationError  In case no database resources can be found
+     */
+    public function init()
     {
         $ldapResources = array_keys(
             ResourceFactory::getResourceConfigs('ldap')->toArray()
         );
+
         if (empty($ldapResources)) {
             throw new ConfigurationError(
                 t('There are no LDAP resources')
             );
         }
-        $this->resources = array_combine($ldapResources, $ldapResources);
 
-        parent::__construct();
+        // array_combine() is necessary in order to use the array as select input data
+        $this->resources = array_combine($ldapResources, $ldapResources);
     }
 
     public function createElements(array $formData)

From a37e65be52b687302493d10e611e911c3d8383d9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 10:43:54 +0200
Subject: [PATCH 055/277] Fix coding style

---
 .../Config/Authentication/DbBackendForm.php   | 15 ++++++----
 .../Config/Authentication/LdapBackendForm.php | 30 ++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index d5fb1256c..38b87c179 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -4,11 +4,10 @@
 
 namespace Icinga\Form\Config\Authentication;
 
-use \Exception;
+use Exception;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\DbConnection;
-use Icinga\Authentication\Backend\DbUserBackend;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Authentication\Backend\DbUserBackend;
 
 /**
  * Form class for adding/modifying database authentication backends
@@ -16,6 +15,8 @@ use Icinga\Exception\ConfigurationError;
 class DbBackendForm extends BaseBackendForm
 {
     /**
+     * The available database resources prepared to be used as select input data
+     *
      * @var array
      */
     protected $resources;
@@ -43,6 +44,9 @@ class DbBackendForm extends BaseBackendForm
         $this->resources = array_combine($dbResources, $dbResources);
     }
 
+    /**
+     * @see Form::createElements()
+     */
     public function createElements(array $formData)
     {
         return array(
@@ -94,7 +98,7 @@ class DbBackendForm extends BaseBackendForm
      *
      * @return  bool    Whether validation succeeded or not
      *
-     * @see BaseBackendForm::isValidAuthenticationBackend
+     * @see BaseBackendForm::isValidAuthenticationBackend()
      */
     public function isValidAuthenticationBackend()
     {
@@ -104,13 +108,14 @@ class DbBackendForm extends BaseBackendForm
             ));
             $dbUserBackend = new DbUserBackend($testConnection);
             if ($dbUserBackend->count() < 1) {
-                $this->addErrorMessage(t("No users found under the specified database backend"));
+                $this->addErrorMessage(t('No users found under the specified database backend'));
                 return false;
             }
         } catch (Exception $e) {
             $this->addErrorMessage(sprintf(t('Using the specified backend failed: %s'), $e->getMessage()));
             return false;
         }
+
         return true;
     }
 }
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index d9039b8c0..57fa8d0ae 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -4,12 +4,10 @@
 
 namespace Icinga\Form\Config\Authentication;
 
-use \Exception;
-use \Zend_Config;
-use Icinga\Web\Form;
+use Exception;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\Backend\LdapUserBackend;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Authentication\Backend\LdapUserBackend;
 
 /**
  * Form for adding or modifying LDAP authentication backends
@@ -17,6 +15,8 @@ use Icinga\Exception\ConfigurationError;
 class LdapBackendForm extends BaseBackendForm
 {
     /**
+     * The available ldap resources prepared to be used as select input data
+     *
      * @var array
      */
     protected $resources;
@@ -44,6 +44,9 @@ class LdapBackendForm extends BaseBackendForm
         $this->resources = array_combine($ldapResources, $ldapResources);
     }
 
+    /**
+     * @see Form::createElements()
+     */
     public function createElements(array $formData)
     {
         return array(
@@ -130,23 +133,21 @@ class LdapBackendForm extends BaseBackendForm
     }
 
     /**
-     * Validate the current configuration by creating a backend and requesting the user count
+     * Validate the current configuration by connecting to a backend and requesting the user count
      *
      * @return  bool    Whether validation succeeded or not
      *
-     * @see BaseBackendForm::isValidAuthenticationBacken
+     * @see BaseBackendForm::isValidAuthenticationBacken()
      */
     public function isValidAuthenticationBackend()
     {
-        if (! ResourceFactory::ldapAvailable()) {
-            /*
-             * It should be possible to run icingaweb without the php ldap extension, when
-             * no ldap backends are needed. When the user tries to create an ldap backend
-             * without ldap installed we need to show him an error.
-             */
+        if (false === ResourceFactory::ldapAvailable()) {
+            // It should be possible to run icingaweb without the php ldap extension. When the user
+            // tries to create an ldap backend without ldap being installed we display an error.
             $this->addErrorMessage(t('Using ldap is not possible, the php extension "ldap" is not installed.'));
             return false;
         }
+
         try {
             $cfg = $this->getConfig();
             $backendConfig = new Zend_Config($cfg[$this->getValue('name')]);
@@ -157,11 +158,6 @@ class LdapBackendForm extends BaseBackendForm
                 $backendConfig->user_name_attribute
             );
             $testConn->assertAuthenticationPossible();
-            /*
-            if ($testConn->count() === 0) {
-                throw new Exception('No Users Found On Directory Server');
-            }
-            */
         } catch (Exception $exc) {
             $this->addErrorMessage(
                 t('Connection Validation Failed: ' . $exc->getMessage())

From 5203f82b80308c5c04cb4cbe067aba214aabaa9d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 10:44:21 +0200
Subject: [PATCH 056/277] Fix message translation

---
 application/forms/Config/Authentication/LdapBackendForm.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 57fa8d0ae..e5f1bac41 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -159,9 +159,7 @@ class LdapBackendForm extends BaseBackendForm
             );
             $testConn->assertAuthenticationPossible();
         } catch (Exception $exc) {
-            $this->addErrorMessage(
-                t('Connection Validation Failed: ' . $exc->getMessage())
-            );
+            $this->addErrorMessage(sprintf(t('Connection validation failed: %s'), $exc->getMessage()));
             return false;
         }
 

From f0a99274e69f83af100e95ce971c5a84f7e81115 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 10:46:08 +0200
Subject: [PATCH 057/277] Access backend information by using getValue()
 instead of getConfig()

refs #5525
---
 .../Config/Authentication/LdapBackendForm.php | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index e5f1bac41..8e1872e86 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -113,25 +113,6 @@ class LdapBackendForm extends BaseBackendForm
         );
     }
 
-    /**
-     * Return the ldap authentication backend configuration for this form
-     *
-     * @return  array
-     *
-     * @see     BaseBackendForm::getConfig()
-     */
-    public function getConfig()
-    {
-        return array(
-            $this->getValue('name') => array(
-                'backend'               => 'ldap',
-                'resource'              => $this->getValue('resource'),
-                'user_class'            => $this->getValue('user_class'),
-                'user_name_attribute'   => $this->getValue('user_name_attribute')
-            )
-        );
-    }
-
     /**
      * Validate the current configuration by connecting to a backend and requesting the user count
      *
@@ -149,13 +130,13 @@ class LdapBackendForm extends BaseBackendForm
         }
 
         try {
-            $cfg = $this->getConfig();
-            $backendConfig = new Zend_Config($cfg[$this->getValue('name')]);
-            $backend = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource));
+            $backend = ResourceFactory::createResource(
+                ResourceFactory::getResourceConfig($this->getValue('resource'))
+            );
             $testConn = new LdapUserBackend(
                 $backend,
-                $backendConfig->user_class,
-                $backendConfig->user_name_attribute
+                $this->getValue('user_class'),
+                $this->getValue('user_name_attribute')
             );
             $testConn->assertAuthenticationPossible();
         } catch (Exception $exc) {

From a627571b87e0ac1529edd39920995eb83b7ccc2a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 10:46:45 +0200
Subject: [PATCH 058/277] Drop obsolete button elements

refs #5525
---
 .../forms/Config/Authentication/DbBackendForm.php   | 13 -------------
 .../forms/Config/Authentication/LdapBackendForm.php | 13 -------------
 2 files changed, 26 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 38b87c179..bb1e68924 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -55,7 +55,6 @@ class DbBackendForm extends BaseBackendForm
                 'name',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('Backend Name'),
                     'helptext'      => t('The name of this authentication provider'),
                 )
@@ -65,23 +64,11 @@ class DbBackendForm extends BaseBackendForm
                 'resource',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('Database Connection'),
                     'helptext'      => t('The database connection to use for authenticating with this provider'),
                     'multiOptions'  => $this->resources
                 )
             ),
-            $this->createElement(
-                'button',
-                'btn_submit',
-                array(
-                    'type'      => 'submit',
-                    'value'     => '1',
-                    'escape'    => false,
-                    'class'     => 'btn btn-cta btn-wide',
-                    'label'     => '<i class="icinga-icon-save"></i> Save Backend'
-                )
-            ),
             $this->createElement(
                 'hidden',
                 'backend',
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 8e1872e86..8d275b00e 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -55,7 +55,6 @@ class LdapBackendForm extends BaseBackendForm
                 'name',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('Backend Name'),
                     'helptext'      => t('The name of this authentication backend')
                 )
@@ -65,7 +64,6 @@ class LdapBackendForm extends BaseBackendForm
                 'resource',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('LDAP Resource'),
                     'helptext'      => t('The resource to use for authenticating with this provider'),
                     'multiOptions'  => $this->resources
@@ -91,17 +89,6 @@ class LdapBackendForm extends BaseBackendForm
                     'value'     => 'uid'
                 )
             ),
-            $this->createElement(
-                'button',
-                'btn_submit',
-                array(
-                    'type'      => 'submit',
-                    'value'     => '1',
-                    'escape'    => false,
-                    'class'     => 'btn btn-cta btn-wide',
-                    'label'     => '<i class="icinga-icon-save"></i> Save Backend'
-                )
-            ),
             $this->createElement(
                 'hidden',
                 'backend',

From be14844fa816bc1693c6cca029d1ac27ed8441b5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 Aug 2014 14:49:42 +0200
Subject: [PATCH 059/277] Merge EditInstanceForm with CreateInstanceForm and
 rename it

As with the backend form, a user might like to change the name of an
instance. The new form and its actions are also adjusted to suit the new form interface.

refs #5525
---
 .../controllers/ConfigController.php          |  95 +++++-----
 .../Config/Instance/CreateInstanceForm.php    |  46 -----
 .../Config/Instance/EditInstanceForm.php      | 148 ----------------
 .../application/forms/Config/InstanceForm.php | 165 ++++++++++++++++++
 .../views/scripts/config/createinstance.phtml |   2 +
 .../views/scripts/config/editinstance.phtml   |  16 +-
 .../views/scripts/config/removeinstance.phtml |  17 +-
 7 files changed, 224 insertions(+), 265 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
 delete mode 100644 modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
 create mode 100644 modules/monitoring/application/forms/Config/InstanceForm.php
 create mode 100644 modules/monitoring/application/views/scripts/config/createinstance.phtml

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 16115e434..045e8a02d 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -9,8 +9,7 @@ use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
 use Icinga\Form\Config\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\BackendForm;
-use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
-use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
+use Icinga\Module\Monitoring\Form\Config\InstanceForm;
 use Icinga\Exception\NotReadableError;
 
 /**
@@ -95,6 +94,7 @@ class Monitoring_ConfigController extends ModuleActionController
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
+                return;
             }
         }
 
@@ -123,6 +123,7 @@ class Monitoring_ConfigController extends ModuleActionController
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
+                return;
             }
         }
 
@@ -135,26 +136,24 @@ class Monitoring_ConfigController extends ModuleActionController
     public function removeinstanceAction()
     {
         $instance = $this->getParam('instance');
-        if (!$this->isExistingInstance($instance)) {
-            $this->view->error = 'Unknown instance ' . $instance;
-            return;
+        $instancesConfig = $this->Config('instances')->toArray();
+        if (false === array_key_exists($instance, $instancesConfig)) {
+            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
+            Notification::error(sprintf($this->translate('Cannot remove "%s". Instance not found.'), $instance));
+            $this->redirectNow('monitoring/config');
         }
 
         $form = new ConfirmRemovalForm();
-        $form->setRequest($this->getRequest());
-        $form->setRemoveTarget('instance', $instance);
-
-        if ($form->isSubmittedAndValid()) {
-            $configArray = $this->Config('instances')->toArray();
-            unset($configArray[$instance]);
-
-            if ($this->writeConfiguration(new Zend_Config($configArray), 'instances')) {
-                Notification::success('Instance "' . $instance . '" Removed');
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            unset($instancesConfig[$instance]);
+            if ($this->writeConfiguration($instancesConfig, 'instances')) {
+                Notification::success(sprintf($this->translate('Instance "%s" successfully removed.'), $instance));
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
+                return;
             }
-            return;
         }
 
         $this->view->form = $form;
@@ -167,24 +166,36 @@ class Monitoring_ConfigController extends ModuleActionController
     public function editinstanceAction()
     {
         $instance = $this->getParam('instance');
-        if (!$this->isExistingInstance($instance)) {
-            $this->view->error = 'Unknown instance ' . htmlentities($instance);
-            return;
+        $instancesConfig = $this->Config('instances')->toArray();
+        if (false === array_key_exists($instance, $instancesConfig)) {
+            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
+            Notification::error(sprintf($this->translate('Cannot edit "%s". Instance not found.'), $instance));
+            $this->redirectNow('monitoring/config');
         }
-        $form = new EditInstanceForm();
-        $form->setInstanceConfiguration($this->Config('instances')->get($instance));
-        $form->setRequest($this->getRequest());
-        if ($form->isSubmittedAndValid()) {
-            $instanceConfig = $this->Config('instances')->toArray();
-            $instanceConfig[$instance] = $form->getConfig();
-            if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
-                Notification::success('Instance Modified');
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
+
+        $form = new InstanceForm();
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                list($newName, $config) = $form->getInstanceConfig();
+
+                if ($newName !== $instance) {
+                    unset($instancesConfig[$instance]); // We can safely use unset as all values are part of the form
+                }
+
+                $instancesConfig[$newName] = $config;
+                if ($this->writeConfiguration($instancesConfig, 'instances')) {
+                    Notification::success(sprintf($this->translate('Instance "%s" successfully modified.'), $instance));
+                    $this->redirectNow('monitoring/config');
+                } else {
+                    $this->render('show-configuration');
+                    return;
+                }
             }
+        } else {
+            $form->setInstanceConfig($instance, $instancesConfig[$instance]);
         }
+
         $this->view->form = $form;
     }
 
@@ -193,26 +204,22 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function createinstanceAction()
     {
-        $form = new CreateInstanceForm();
-        $form->setRequest($this->getRequest());
-        if ($form->isSubmittedAndValid()) {
-            $instanceConfig = $this->Config('instances');
-            if ($instanceConfig === null) {
-                $instanceConfig = array();
-            } else {
-                $instanceConfig = $instanceConfig->toArray();
-            }
-            $instanceConfig[$form->getInstanceName()] = $form->getConfig()->toArray();
-            if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
-                Notification::success('Instance Creation Succeeded');
+        $form = new InstanceForm();
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
+            list($name, $config) = $form->getInstanceConfig();
+            $instancesConfig = $this->Config('instances')->toArray();
+            $instancesConfig[$name] = $config;
+            if ($this->writeConfiguration($instancesConfig, 'instances')) {
+                Notification::success(sprintf($this->translate('Instance "%s" created successfully.'), $name));
                 $this->redirectNow('monitoring/config');
             } else {
                 $this->render('show-configuration');
+                return;
             }
-            return;
         }
+
         $this->view->form = $form;
-        $this->render('editinstance');
     }
 
     /**
diff --git a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
deleted file mode 100644
index 705804bb9..000000000
--- a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config\Instance;
-
-use \Icinga\Web\Form;
-use \Zend_Config;
-
-/**
- * Form for creating new instances
- *
- * @see EditInstanceForm
- */
-class CreateInstanceForm extends EditInstanceForm
-{
-
-    /**
-     * Create the form elements
-     *
-     * @see EditInstanceForm::create()
-     */
-    public function create()
-    {
-        $this->setInstanceConfiguration(new Zend_Config(array()));
-        $this->addElement(
-            'text',
-            'instance_name',
-            array(
-                'label'     =>  'Instance Name',
-                'helptext'  =>  'Please enter the name for the instance to create'
-            )
-        );
-        parent::create();
-    }
-
-    /**
-     * Return the name of the instance to be created
-     *
-     * @return string The name of the instance as entered in the form
-     */
-    public function getInstanceName()
-    {
-        return $this->getValue('instance_name');
-    }
-}
diff --git a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
deleted file mode 100644
index e2a091c0f..000000000
--- a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config\Instance;
-
-use \Zend_Config;
-use \Icinga\Web\Form;
-
-/**
- * Form for editing existing instances
- */
-class EditInstanceForm extends Form
-{
-    /**
-     * The instance to edit
-     *
-     * @var Zend_Config
-     */
-    private $instance;
-
-    /**
-     * The type of the instance
-     *
-     * 'local' when no host is given, otherwise 'remote'
-     *
-     * @var string
-     */
-    private $instanceType = 'local';
-
-    /**
-     * Set instance configuration to be used for initial form population
-     *
-     * @param Zend_Config $config
-     */
-    public function setInstanceConfiguration($config)
-    {
-        $this->instance = $config;
-        if (isset($this->instance->host)) {
-            $this->instanceType = 'remote';
-        }
-    }
-
-    /**
-     * Add a form field for selecting the command pipe type (local or remote)
-     */
-    private function addTypeSelection()
-    {
-        $this->addElement(
-            'select',
-            'instance_type',
-            array(
-                'value' => $this->instanceType,
-                'multiOptions' => array(
-                    'local'     => 'Local Command Pipe',
-                    'remote'    => 'Remote Command Pipe'
-                )
-            )
-        );
-        $this->enableAutoSubmit(array('instance_type'));
-    }
-
-    /**
-     * Add form elements for remote instance
-     */
-    private function addRemoteInstanceForm()
-    {
-        $this->addNote('When configuring a remote host, you need to setup passwordless key authentication');
-
-        $this->addElement(
-            'text',
-            'instance_remote_host',
-            array(
-                'label'     =>  'Remote Host',
-                'required'  =>  true,
-                'value'     =>  $this->instance->host,
-                'helptext'  =>  'Enter the hostname or address of the machine on which the icinga instance is running'
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'instance_remote_port',
-            array(
-                'label'     =>  'Remote SSH Port',
-                'required'  =>  true,
-                'value'     =>  $this->instance->get('port', 22),
-                'helptext'  =>  'Enter the ssh port to use for connecting to the remote icigna instance'
-            )
-        );
-
-        $this->addElement(
-            'text',
-            'instance_remote_user',
-            array(
-                'label'         =>  'Remote SSH User',
-                'value'         =>  $this->instance->user,
-                'helptext'      =>  'Enter the username to use for connecting '
-                                    . 'to the remote machine or leave blank for default'
-            )
-        );
-    }
-
-    /**
-     * Create this form
-     *
-     * @see Icinga\Web\Form::create
-     */
-    public function create()
-    {
-        $this->addTypeSelection();
-        if ($this->getRequest()->getParam('instance_type', $this->instanceType) === 'remote') {
-            $this->addRemoteInstanceForm();
-        }
-        $this->addElement(
-            'text',
-            'instance_path',
-            array(
-                'label'     =>  'Remote Pipe Filepath',
-                'required'  =>  true,
-                'value'     =>  $this->instance->get('path', '/usr/local/icinga/var/rw/icinga.cmd'),
-                'helptext'  =>  'The file path where the icinga commandpipe can be found'
-            )
-        );
-        $this->setSubmitLabel('{{SAVE_ICON}} Save');
-    }
-
-    /**
-     * Return the configuration set by this form
-     *
-     * @return Zend_Config The configuration set in this form
-     */
-    public function getConfig()
-    {
-        $values = $this->getValues();
-        $config =  array(
-            'path'  => $values['instance_path']
-        );
-        if ($values['instance_type'] === 'remote') {
-            $config['host'] = $values['instance_remote_host'];
-            $config['port'] = $values['instance_remote_port'];
-            if (isset($values['instance_remote_user']) && $values['instance_remote_user'] != '') {
-                $config['user'] = $values['instance_remote_user'];
-            }
-        }
-        return new Zend_Config($config);
-    }
-}
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
new file mode 100644
index 000000000..7b74053c9
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/InstanceForm.php
@@ -0,0 +1,165 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config;
+
+use Icinga\Web\Form;
+use Icinga\Web\Form\Element\Number;
+use Icinga\Web\Form\Decorator\HelpText;
+use Icinga\Web\Form\Decorator\ElementWrapper;
+
+/**
+ * Form for modifying/creating monitoring instances
+ */
+class InstanceForm extends Form
+{
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $elements = array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'  => true,
+                    'label'     => t('Instance Name')
+                )
+            ),
+            $this->createElement(
+                'select',
+                'type',
+                array(
+                    'required'      => true,
+                    'label'         => t('Instance Type'),
+                    'class'         => 'autosubmit',
+                    'helptext'      => t(
+                        'When configuring a remote host, you need to setup passwordless key authentication'
+                    ),
+                    'multiOptions'  => array(
+                        'local'     => t('Local Command Pipe'),
+                        'remote'    => t('Remote Command Pipe')
+                    )
+                )
+            )
+        );
+
+        if (isset($formData['type']) && $formData['type'] === 'remote') {
+            $elements[] = $this->createElement(
+                'text',
+                'host',
+                array(
+                    'required'  => true,
+                    'label'     => t('Remote Host'),
+                    'helptext'  => t(
+                        'Enter the hostname or address of the machine on which the icinga instance is running'
+                    )
+                )
+            );
+            $elements[] = new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Remote SSH Port'),
+                    'helptext'      => t('Enter the ssh port to use for connecting to the remote icinga instance'),
+                    'value'         => 22,
+                    'decorators'    => array( // The order is important!
+                        'ViewHelper',
+                        'Errors',
+                        new ElementWrapper(),
+                        new HelpText()
+                    )
+                )
+            );
+            $elements[] = $this->createElement(
+                'text',
+                'user',
+                array(
+                    'required'      => true,
+                    'label'         => t('Remote SSH User'),
+                    'helptext'      => t(
+                        'Enter the username to use for connecting to the remote machine or leave blank for default'
+                    )
+                )
+            );
+        } else {
+            // TODO(5967,5525): Without this element, switching the type to "local" causes
+            //                  the form to be processed as it's complete in that case.
+            $elements[] = $this->createElement(
+                'hidden',
+                'hitchhiker',
+                array(
+                    'required'  => true,
+                    'value'     => 'Arthur'
+                )
+            );
+        }
+
+        $elements[] = $this->createElement(
+            'text',
+            'path',
+            array(
+                'required'  => true,
+                'label'     => t('Pipe Filepath'),
+                'value'     => '/usr/local/icinga/var/rw/icinga.cmd',
+                'helptext'  => t('The file path where the icinga commandpipe can be found')
+            )
+        );
+        return $elements;
+    }
+
+    /**
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Save Changes')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Return the instance configuration values and its name
+     *
+     * The first value is the name and the second one the values as array.
+     *
+     * @return  array
+     */
+    public function getInstanceConfig()
+    {
+        $values = $this->getValues();
+        $name = $values['name'];
+        unset($values['name']);
+        unset($values['type']);
+        unset($values['hitchhiker']);
+        unset($values['btn_submit']);
+        unset($values[$this->getTokenElementName()]);
+        return array($name, $values);
+    }
+
+    /**
+     * Populate the form with the given configuration values
+     *
+     * @param   string  $name       The name of the instance
+     * @param   array   $config     The configuration values
+     */
+    public function setInstanceConfig($name, array $config)
+    {
+        $config['name'] = $name;
+
+        if (isset($config['host'])) {
+            // Necessary as we have no config directive for setting the instance's type
+            $config['type'] = 'remote';
+        }
+
+        $this->populate($config);
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/config/createinstance.phtml b/modules/monitoring/application/views/scripts/config/createinstance.phtml
new file mode 100644
index 000000000..49c8b5ec5
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/config/createinstance.phtml
@@ -0,0 +1,2 @@
+<h4><?= $this->translate('Add New Instance'); ?></h4>
+<?= $form; ?>
\ 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 1a2f5fe97..b12f262c3 100644
--- a/modules/monitoring/application/views/scripts/config/editinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/editinstance.phtml
@@ -1,14 +1,2 @@
-
-<?php if (isset($this->name)): ?>
-    <h4><i class="icinga-icon-edit"></i> } Edit Instance Configuration for "<?= $this->escape($this->name) ?>"</h4>
-<?php else: ?>
-    <h4><i class="icinga-icon-create"></i>  Configure New Icinga Instance</h4>
-<?php endif; ?>
-
-<?php if ($this->error): ?>
-    <div class="alert alert-danger">
-        <?= $this->escape($this->error); ?>
-    </div>
-<?php endif; ?>
-
-<?= $this->form; ?>
\ No newline at end of file
+<h4><?= $this->translate('Edit Existing Instance'); ?></h4>
+<?= $form; ?>
\ 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 a278cf9b1..586452173 100644
--- a/modules/monitoring/application/views/scripts/config/removeinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
@@ -1,13 +1,4 @@
-
-<h4><i class="icinga-icon-remove"></i> Remove Instance "<?= $this->escape($this->name) ?>"</h4>
-
-<p>
-  Are you sure you want to remove the instance <?= $this->escape($this->name) ?>?
-</p>
-
-<p>
-  <i class="icinga-icon-warning"></i> If you have still any environments or views refering to this instance, you won't be able to send commands anymore
-  after deletion.
-</p>
-
-<?= $this->form; ?>
+<h4><?= $this->translate('Remove Existing Instance'); ?></h4>
+<p>Are you sure you want to remove the instance <?= $this->escape($name); ?>?</p>
+<p><i class="icinga-icon-warning"></i> 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

From eea43e9a60e6fee6c3c18670b579da0008e2e287 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 09:49:27 +0200
Subject: [PATCH 060/277] Adjust Icinga\Form\Dashboard\AddUrlForm to suit the
 new form interface

refs #5525
---
 .../controllers/DashboardController.php       |  36 ++--
 application/forms/Dashboard/AddUrlForm.php    | 203 ++++++++----------
 2 files changed, 113 insertions(+), 126 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 1f45eacde..b2c84c675 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -82,25 +82,29 @@ class DashboardController extends ActionController
         )->activate('addurl');
 
         $form = new AddUrlForm();
-        $form->setRequest($this->getRequest());
-        $form->setAction(Url::fromRequest()->setParams(array())->getAbsoluteUrl());
-        $this->view->form = $form;
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost()) && $form->getElement('btn_submit')->isChecked()) {
+                $dashboard = $this->getDashboard();
+                $dashboard->setComponentUrl(
+                    $form->getValue('pane'),
+                    $form->getValue('component'),
+                    ltrim($form->getValue('url'), '/')
+                );
 
-        if ($form->isSubmittedAndValid()) {
-            $dashboard = $this->getDashboard();
-            $dashboard->setComponentUrl(
-                $form->getValue('pane'),
-                $form->getValue('component'),
-                ltrim($form->getValue('url'), '/')
-            );
-
-            $configFile = IcingaConfig::app('dashboard/dashboard')->getConfigFile();
-            if ($this->writeConfiguration(new Zend_Config($dashboard->toArray()), $configFile)) {
-                $this->redirectNow(Url::fromPath('dashboard', array('pane' => $form->getValue('pane'))));
-            } else {
-                $this->render('show-configuration');
+                $configFile = IcingaConfig::app('dashboard/dashboard')->getConfigFile();
+                if ($this->writeConfiguration(new Zend_Config($dashboard->toArray()), $configFile)) {
+                    $this->redirectNow(Url::fromPath('dashboard', array('pane' => $form->getValue('pane'))));
+                } else {
+                    $this->render('show-configuration');
+                    return;
+                }
             }
+        } else {
+            $form->create()->setDefault('url', htmlspecialchars_decode($request->getParam('url', '')));
         }
+
+        $this->view->form = $form;
     }
 
     /**
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 09759a265..e73fd5067 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -5,12 +5,8 @@
 namespace Icinga\Form\Dashboard;
 
 use Icinga\Application\Config as IcingaConfig;
-use Icinga\Web\Form;
 use Icinga\Web\Widget\Dashboard;
-use Zend_Form_Element_Text;
-use Zend_Form_Element_Submit;
-use Zend_Form_Element_Hidden;
-use Zend_Form_Element_Select;
+use Icinga\Web\Form;
 
 /**
  * Form to add an url a dashboard pane
@@ -18,124 +14,111 @@ use Zend_Form_Element_Select;
 class AddUrlForm extends Form
 {
     /**
-     * Add a selection box for different panes to the form
-     *
-     * @param Dashboard $dashboard      The dashboard to retrieve the panes from
+     * @see Form::createElements()
      */
-    private function addPaneSelectionBox(Dashboard $dashboard)
+    public function createElements(array $formData)
     {
-        $selectPane = new Zend_Form_Element_Select(
-            'pane',
-            array(
-                'label'     => 'Dashboard',
-                'required'  => true,
-                'style'     => 'display:inline-block;',
-
-                'multiOptions' => $dashboard->getPaneKeyTitleArray()
+        $elements = array(
+            $this->createElement(
+                'text',
+                'url',
+                array(
+                    'required'  => true,
+                    'label'     => t('Url'),
+                    'helptext'  => t('The url being loaded in the dashlet')
+                )
             )
         );
 
-        $newDashboardBtn = new Zend_Form_Element_Submit(
-            'create_new_pane',
-            array(
-                'label'     => 'Create A New Pane',
-                'required'  => false,
-                'class'     => 'btn btn-default',
-                'style'     => 'display:inline-block'
-            )
-        );
-
-        $newDashboardBtn->removeDecorator('DtDdWrapper');
-        $selectPane->removeDecorator('DtDdWrapper');
-        $selectPane->removeDecorator('htmlTag');
-
-        $this->addElement($selectPane);
-        $this->addElement($newDashboardBtn);
-        $this->enableAutoSubmit(array('create_new_pane'));
-    }
-
-    /**
-     *  Add a textfield for creating a new pane to this form
-     */
-    private function addNewPaneTextField($showExistingButton = true)
-    {
-        $txtCreatePane = new Zend_Form_Element_Text(
-            'pane',
-            array(
-                'label'     => 'New Dashboard Title',
-                'required'  => true,
-                'style'     => 'display:inline-block'
-            )
-        );
-
-        // Marks this field as a new pane (and prevents the checkbox being displayed when validation errors occur)
-        $markAsNewPane = new Zend_Form_Element_Hidden(
-            'create_new_pane',
-            array(
-                'required'  => true,
-                'value'     => 1
-            )
-        );
-
-        $cancelDashboardBtn = new Zend_Form_Element_Submit(
-            'use_existing_dashboard',
-            array(
-                'class'     => 'btn',
-                'escape'    => false,
-                'label'     => 'Use An Existing Dashboard',
-                'required'  => false
-            )
-        );
-
-
-        $cancelDashboardBtn->removeDecorator('DtDdWrapper');
-        $txtCreatePane->removeDecorator('DtDdWrapper');
-        $txtCreatePane->removeDecorator('htmlTag');
-
-        $this->addElement($txtCreatePane);
-        if ($showExistingButton) {
-            $this->addElement($cancelDashboardBtn);
-        }
-        $this->addElement($markAsNewPane);
-    }
-
-    /**
-     * Add elements to this form (used by extending classes)
-     */
-    protected function create()
-    {
-        $dashboard = new Dashboard();
-        $this->setName('form_dashboard_add');
-        $dashboard->readConfig(IcingaConfig::app('dashboard/dashboard'));
-        $this->addElement(
-            'text',
-            'url',
-            array(
-                'label'    => 'Url',
-                'required' => true,
-                'value'    => htmlspecialchars_decode($this->getRequest()->getParam('url', ''))
-            )
-        );
-        $elems = $dashboard->getPaneKeyTitleArray();
-
-        if (empty($elems) ||    // show textfield instead of combobox when no pane is available
-            ($this->getRequest()->getPost('create_new_pane', '0') &&  // or when a new pane should be created (+ button)
-            !$this->getRequest()->getPost('use_existing_dashboard', '0')) // and the user didn't click the 'use
-                                                                          // existing' button
+        $paneSelectionValues = $this->getDashboardPaneSelectionValues();
+        if (empty($paneSelectionValues) ||
+            ((isset($formData['create_new_pane']) && $formData['create_new_pane'] != false) &&
+             (false === isset($formData['use_existing_dashboard']) || $formData['use_existing_dashboard'] != true))
         ) {
-            $this->addNewPaneTextField(!empty($elems));
+            $elements[] = $this->createElement(
+                'text',
+                'pane',
+                array(
+                    'required'  => true,
+                    'label'     => t("The New Pane's Title"),
+                    'style'     => 'display: inline-block'
+                )
+            );
+            $elements[] = $this->createElement( // Prevent the button from being displayed again on validation errors
+                'hidden',
+                'create_new_pane',
+                array(
+                    'value' => 1
+                )
+            );
+            if (false === empty($paneSelectionValues)) {
+                $elements[] = $this->createElement(
+                    'submit',
+                    'use_existing_dashboard',
+                    array(
+                        'label' => t('Use An Existing Pane'),
+                        'style' => 'display: inline-block'
+                    )
+                );
+            }
         } else {
-            $this->addPaneSelectionBox($dashboard);
+            $elements[] = $this->createElement(
+                'select',
+                'pane',
+                array(
+                    'required'      => true,
+                    'label'         => t('Pane'),
+                    'style'         => 'display: inline-block;',
+                    'multiOptions'  => $paneSelectionValues
+                )
+            );
+            $elements[] = $this->createElement(
+                'submit',
+                'create_new_pane',
+                array(
+                    'label' => t('Create A New Pane'),
+                    'style' => 'display: inline-block'
+                )
+            );
         }
 
-        $this->addElement(
+        $elements[] = $this->createElement(
             'text',
             'component',
             array(
-                'label'    => 'Title',
-                'required' => true,
+                'required'  => true,
+                'label'     => t('Title'),
+                'helptext'  => t('The title for the dashlet')
             )
         );
-        $this->setSubmitLabel("Add To Dashboard");
+        return $elements;
+    }
+
+    /**
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'label' => t('Add To Dashboard')
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * Return the names and titles of the available dashboard panes as key-value array
+     *
+     * @return  array
+     */
+    protected function getDashboardPaneSelectionValues()
+    {
+        $dashboard = new Dashboard();
+        $dashboard->readConfig(IcingaConfig::app('dashboard/dashboard'));
+        return $dashboard->getPaneKeyTitleArray();
     }
 }

From f23bf912eb089c97ac9e204406450e08260fda3e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 09:49:52 +0200
Subject: [PATCH 061/277] Remove obsolete use statements

---
 .../application/controllers/ChartController.php          | 9 +--------
 .../application/controllers/MultiController.php          | 3 ---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 4ccc30510..4fee6e34f 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -2,15 +2,8 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Application\Icinga;
-use Icinga\Application\Config;
-use Icinga\Logger\Logger;
-use Icinga\Web\Form;
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Chart\SVGRenderer;
 use Icinga\Chart\GridChart;
-use Icinga\Chart\Palette;
-use Icinga\Chart\Axis;
 use Icinga\Chart\PieChart;
 use Icinga\Chart\Unit\StaticAxis;
 
@@ -140,7 +133,7 @@ class Monitoring_ChartController extends Controller
         }
         $this->view->chart = new GridChart();
         $this->view->chart->setAxisLabel('', t('Services'))
-            ->setXAxis(new \Icinga\Chart\Unit\StaticAxis());
+            ->setXAxis(new StaticAxis());
 
         $this->view->chart->drawBars(
             array(
diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php
index a623dd88b..37ea0e061 100644
--- a/modules/monitoring/application/controllers/MultiController.php
+++ b/modules/monitoring/application/controllers/MultiController.php
@@ -2,10 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Web\Form;
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Backend;
-use Icinga\Data\SimpleQuery;
 use Icinga\Web\Widget\Chart\InlinePie;
 use Icinga\Module\Monitoring\Form\Command\MultiCommandFlagForm;
 use Icinga\Web\Widget;

From 4b1169c0a11d69ed91680047a84ce955013673af Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 10:41:19 +0200
Subject: [PATCH 062/277] Fix improper form submission

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

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 43dd62a41..75e66d514 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -7,6 +7,7 @@ namespace Icinga\Web;
 use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
+use Icinga\Application\Icinga;
 use Icinga\Web\Session;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
@@ -131,6 +132,12 @@ class Form extends Zend_Form
     public function create(array $formData = array())
     {
         if (false === $this->created) {
+            if ($this->getAction() === '') {
+                // We MUST set an action as JS gets confused otherwise, if
+                // this form is being displayed in an additional column
+                $this->setAction(Icinga::app()->getFrontController()->getRequest()->getRequestUri());
+            }
+
             $this->addElements($this->createElements($formData));
             $this->addCsrfToken()->addSubmitButton();
             $this->created = true;

From e6bcda260d6faffa5a2475a1e21c7f73d7703d71 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 10:42:28 +0200
Subject: [PATCH 063/277] Redirect after a new resource has been created
 successfully

refs #5525
---
 application/controllers/ConfigController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 6358bb42d..0a699ca99 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -425,6 +425,7 @@ class ConfigController extends BaseConfigController
                 $resources[$name] = $config;
                 if ($this->writeConfigFile($resources, 'resources')) {
                     $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully created.'), $name));
+                    $this->redirectNow('config/resource');
                 }
             }
         }

From fe63ce664f7fd92b8c2a3769cd2c6c3b2d2f179f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 13:57:28 +0200
Subject: [PATCH 064/277] =?UTF-8?q?Make=20use=20if=20'ignore=C2=B4=20inste?=
 =?UTF-8?q?ad=20of=20explicitly=20unsetting=20array=20keys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #5525
---
 application/forms/Authentication/LoginForm.php |  3 ++-
 .../Config/Authentication/BaseBackendForm.php  |  7 +++----
 .../forms/Config/ConfirmRemovalForm.php        |  3 ++-
 application/forms/Config/GeneralForm.php       |  3 ++-
 application/forms/Config/LoggingForm.php       | 18 ++----------------
 application/forms/Config/ResourceForm.php      |  7 +++----
 application/forms/Dashboard/AddUrlForm.php     | 13 ++++++++-----
 application/forms/Preference/GeneralForm.php   |  3 ++-
 library/Icinga/Web/Form.php                    |  3 ++-
 .../application/forms/Config/BackendForm.php   |  5 ++---
 .../application/forms/Config/InstanceForm.php  |  9 ++++-----
 11 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index bbf65d22b..45e7d3de6 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -57,7 +57,8 @@ class LoginForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Login')
+                'ignore'    => true,
+                'label'     => t('Login')
             )
         );
     }
diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index cde39d1eb..02aa5dfb4 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -20,7 +20,8 @@ abstract class BaseBackendForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -75,9 +76,6 @@ abstract class BaseBackendForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values['force_creation']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
@@ -104,6 +102,7 @@ abstract class BaseBackendForm extends Form
             'force_creation',
             array(
                 'order'     => 0,
+                'ignore'    => true,
                 'label'     => t('Force Changes'),
                 'helptext'  => t('Check this box to enforce changes without connectivity validation')
             )
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index 96dea6056..a2a5f3b34 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -28,7 +28,8 @@ class ConfirmRemovalForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Confirm Removal')
+                'ignore'    => true,
+                'label'     => t('Confirm Removal')
             )
         );
     }
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 90a4f4ea4..ae06dcb9a 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -46,7 +46,8 @@ class GeneralForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index 475d65fb2..4b212cc2d 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -134,28 +134,14 @@ class LoggingForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save')
+                'ignore'    => true,
+                'label'     => t('Save')
             )
         );
 
         return $this;
     }
 
-    /**
-     * Retrieve all form element values
-     *
-     * Returns all configuration relevant element values.
-     *
-     * @return  array
-     */
-    public function getValues()
-    {
-        $values = parent::getValues();
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
-        return $values;
-    }
-
     /**
      * Return the default logging directory for type "file"
      *
diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
index d8a3cc850..a0394e45c 100644
--- a/application/forms/Config/ResourceForm.php
+++ b/application/forms/Config/ResourceForm.php
@@ -83,7 +83,8 @@ class ResourceForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -197,9 +198,6 @@ class ResourceForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values['force_creation']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
@@ -228,6 +226,7 @@ class ResourceForm extends Form
             'force_creation',
             array(
                 'order'     => 0,
+                'ignore'    => true,
                 'label'     => t('Force Changes'),
                 'helptext'  => t('Check this box to enforce changes without connectivity validation')
             )
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index e73fd5067..4a9d93016 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -56,8 +56,9 @@ class AddUrlForm extends Form
                     'submit',
                     'use_existing_dashboard',
                     array(
-                        'label' => t('Use An Existing Pane'),
-                        'style' => 'display: inline-block'
+                        'ignore'    => true,
+                        'label'     => t('Use An Existing Pane'),
+                        'style'     => 'display: inline-block'
                     )
                 );
             }
@@ -76,8 +77,9 @@ class AddUrlForm extends Form
                 'submit',
                 'create_new_pane',
                 array(
-                    'label' => t('Create A New Pane'),
-                    'style' => 'display: inline-block'
+                    'ignore'    => true,
+                    'label'     => t('Create A New Pane'),
+                    'style'     => 'display: inline-block'
                 )
             );
         }
@@ -103,7 +105,8 @@ class AddUrlForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Add To Dashboard')
+                'ignore'    => true,
+                'label'     => t('Add To Dashboard')
             )
         );
 
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 6f79ebb34..f16d43342 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -138,7 +138,8 @@ class GeneralForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 75e66d514..99300bcab 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -216,7 +216,8 @@ class Form extends Zend_Form
                 'hidden',
                 $this->tokenElementName,
                 array(
-                    'value' => $this->generateCsrfToken()
+                    'ignore'    => true,
+                    'value'     => $this->generateCsrfToken()
                 )
             );
         }
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
index 19f870778..4b2859432 100644
--- a/modules/monitoring/application/forms/Config/BackendForm.php
+++ b/modules/monitoring/application/forms/Config/BackendForm.php
@@ -74,7 +74,8 @@ class BackendForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -98,8 +99,6 @@ class BackendForm extends Form
         }
 
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
index 7b74053c9..e74ecca86 100644
--- a/modules/monitoring/application/forms/Config/InstanceForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceForm.php
@@ -33,6 +33,7 @@ class InstanceForm extends Form
                 'type',
                 array(
                     'required'      => true,
+                    'ignore'        => true,
                     'label'         => t('Instance Type'),
                     'class'         => 'autosubmit',
                     'helptext'      => t(
@@ -92,6 +93,7 @@ class InstanceForm extends Form
                 'hitchhiker',
                 array(
                     'required'  => true,
+                    'ignore'    => true,
                     'value'     => 'Arthur'
                 )
             );
@@ -119,7 +121,8 @@ class InstanceForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -138,10 +141,6 @@ class InstanceForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['type']);
-        unset($values['hitchhiker']);
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 

From e7da9c0a00e8879c05a133908f8aeb99b24b5fda Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 Aug 2014 14:43:10 +0200
Subject: [PATCH 065/277] Make our anti CSRF logic being a form element

refs #5525
---
 library/Icinga/Web/Form.php                   | 71 ++-------------
 .../Web/Form/Element/CsrfCounterMeasure.php   | 87 +++++++++++++++++++
 2 files changed, 93 insertions(+), 65 deletions(-)
 create mode 100644 library/Icinga/Web/Form/Element/CsrfCounterMeasure.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 99300bcab..808ff6ad3 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,10 +8,9 @@ use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
-use Icinga\Web\Session;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
-use Icinga\Web\Form\InvalidCSRFTokenException;
+use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
 /**
  * Base class for forms providing CSRF protection, confirmation logic and auto submission
@@ -139,7 +138,7 @@ class Form extends Zend_Form
             }
 
             $this->addElements($this->createElements($formData));
-            $this->addCsrfToken()->addSubmitButton();
+            $this->addCsrfCounterMeasure()->addSubmitButton();
             $this->created = true;
         }
 
@@ -209,17 +208,12 @@ class Form extends Zend_Form
      *
      * @return  self
      */
-    public function addCsrfToken()
+    public function addCsrfCounterMeasure()
     {
         if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
-            $this->addElement(
-                'hidden',
-                $this->tokenElementName,
-                array(
-                    'ignore'    => true,
-                    'value'     => $this->generateCsrfToken()
-                )
-            );
+            $element = new CsrfCounterMeasure($this->tokenElementName);
+            $element->setDecorators(array('ViewHelper'));
+            $this->addElement($element);
         }
 
         return $this;
@@ -293,7 +287,6 @@ class Form extends Zend_Form
     public function isValid($formData)
     {
         if ($this->isComplete($formData)) {
-            $this->assertValidCsrfToken($formData);
             return parent::isValid($formData);
         }
 
@@ -352,56 +345,4 @@ class Form extends Zend_Form
         $this->create();
         return parent::render($view);
     }
-
-    /**
-     * Generate a new (seed, token) pair
-     *
-     * @return  string
-     */
-    protected function generateCsrfToken()
-    {
-        $seed = mt_rand();
-        $hash = hash('sha256', Session::getSession()->getId() . $seed);
-        return sprintf('%s|%s', $seed, $hash);
-    }
-
-    /**
-     * Test the submitted data for a correct CSRF token
-     *
-     * @param   array   $requestData        The data sent by the user
-     *
-     * @throws  InvalidCSRFTokenException   When CSRF Validation fails
-     */
-    protected function assertValidCsrfToken(array $requestData)
-    {
-        if (false === $this->tokenDisabled) {
-            if (false === isset($requestData[$this->tokenElementName])
-                || false === $this->isValidCsrfToken($requestData[$this->tokenElementName])
-            ) {
-                throw new InvalidCSRFTokenException();
-            }
-        }
-    }
-
-    /**
-     * Check whether the given value is a valid CSRF token for the current session
-     *
-     * @param   string  $token  Value from the CSRF form element
-     *
-     * @return  bool
-     */
-    protected function isValidCsrfToken($token)
-    {
-        if (strpos($token, '|') === false) {
-            return false;
-        }
-
-        list($seed, $hash) = explode('|', $token);
-
-        if (false === is_numeric($seed)) {
-            return false;
-        }
-
-        return $hash === hash('sha256', Session::getSession()->getId() . $seed);
-    }
 }
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
new file mode 100644
index 000000000..4d788f9d3
--- /dev/null
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -0,0 +1,87 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web\Form\Element;
+
+use Zend_Form_Element_Xhtml;
+use Icinga\Web\Session;
+use Icinga\Web\Form\InvalidCSRFTokenException;
+
+/**
+ * CSRF counter measure element
+ *
+ * You must not set a value to successfully use this element, just give it a name and you're good to go.
+ */
+class CsrfCounterMeasure extends Zend_Form_Element_Xhtml
+{
+    /**
+     * Default form view helper to use for rendering
+     *
+     * @var string
+     */
+    public $helper = 'formHidden';
+
+    /**
+     * Initialize this form element
+     */
+    public function init()
+    {
+        $this->setRequired(true); // Not requiring this element would not make any sense
+        $this->setIgnore(true); // We do not want this element's value being retrieved by Form::getValues()
+        $this->setValue($this->generateCsrfToken());
+    }
+
+    /**
+     * Check whether $value is a valid CSRF token
+     *
+     * @param   string      $value          The value to check
+     * @param   mixed       $context        Context to use
+     *
+     * @return  bool                        True, in case the CSRF token is valid
+     *
+     * @throws  InvalidCSRFTokenException   In case the CSRF token is not valid
+     */
+    public function isValid($value, $context = null)
+    {
+        if (parent::isValid($value, $context) && $this->isValidCsrfToken($value)) {
+            return true;
+        }
+
+        throw new InvalidCSRFTokenException();
+    }
+
+    /**
+     * Check whether the given value is a valid CSRF token for the current session
+     *
+     * @param   string  $token  The CSRF token
+     *
+     * @return  bool
+     */
+    protected function isValidCsrfToken($token)
+    {
+        if (strpos($token, '|') === false) {
+            return false;
+        }
+
+        list($seed, $hash) = explode('|', $token);
+
+        if (false === is_numeric($seed)) {
+            return false;
+        }
+
+        return $hash === hash('sha256', Session::getSession()->getId() . $seed);
+    }
+
+    /**
+     * Generate a new (seed, token) pair
+     *
+     * @return  string
+     */
+    protected function generateCsrfToken()
+    {
+        $seed = mt_rand();
+        $hash = hash('sha256', Session::getSession()->getId() . $seed);
+        return sprintf('%s|%s', $seed, $hash);
+    }
+}

From 7311ab964e90e945cae4d0b882e7364ae4c36d36 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 Aug 2014 14:50:21 +0200
Subject: [PATCH 066/277] Do not set the full url from the request as action
 with form parameters

Setting an url with parameters named like form elements in a form with
method POST causes Zend to ignore any POST data because GET will be
processed with higher priority.

fixes #6806
---
 library/Icinga/Web/Form.php                               | 8 ++++----
 library/Icinga/Web/Widget/SortBox.php                     | 1 -
 .../library/Monitoring/Web/Widget/TimelineIntervalBox.php | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 808ff6ad3..dc8fb4f6c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -7,7 +7,6 @@ namespace Icinga\Web;
 use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
-use Icinga\Application\Icinga;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
@@ -131,14 +130,15 @@ class Form extends Zend_Form
     public function create(array $formData = array())
     {
         if (false === $this->created) {
+            $this->addElements($this->createElements($formData));
+            $this->addCsrfCounterMeasure()->addSubmitButton();
+
             if ($this->getAction() === '') {
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
-                $this->setAction(Icinga::app()->getFrontController()->getRequest()->getRequestUri());
+                $this->setAction(Url::fromRequest()->getUrlWithout(array_keys($this->getElements())));
             }
 
-            $this->addElements($this->createElements($formData));
-            $this->addCsrfCounterMeasure()->addSubmitButton();
             $this->created = true;
         }
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index cce268a48..557469966 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -132,7 +132,6 @@ class SortBox extends AbstractWidget
         $sort = $form->getElement('sort')->setDecorators(array('ViewHelper'));
         $dir = $form->getElement('dir')->setDecorators(array('ViewHelper'));
         if ($this->request) {
-            $form->setAction($this->request->getRequestUri());
             $form->populate($this->request->getParams());
         }
         return $form;
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
index 307fffba8..4cab3517d 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
@@ -97,7 +97,6 @@ class TimelineIntervalBox extends AbstractWidget
         );
 
         if ($this->request) {
-            $form->setAction($this->request->getRequestUri());
             $form->populate($this->request->getParams());
         }
 

From b81e96574ad25c5e0267516f967bfb168a2ba795 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 21 Aug 2014 11:48:07 +0200
Subject: [PATCH 067/277] SecurityForm: replace create() with createElements()
 and add addSubmitButton()

refs #5525
---
 .../application/forms/Config/SecurityForm.php | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index 74577c0d5..fbae02688 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -15,25 +15,41 @@ class SecurityForm extends Form
     protected $config;
 
     /**
-     * Create this form
-     *
-     * @see Icinga\Web\Form::create
+     * @see Form::createElements()
      */
-    public function create()
+    public function createElements(array $formData)
     {
-        $this->addElement(
-            'text',
-            'protected_customvars',
-            array(
-                'label'     =>  'Protected Custom Variables',
-                'required'  =>  true,
-                'value'     =>  $this->config->protected_customvars,
-                'helptext'  =>  '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.'
+        return array(
+            $this->createElement(
+                'text',
+                'protected_customvars',
+                array(
+                    'label'     =>  'Protected Custom Variables',
+                    'required'  =>  true,
+                    'value'     =>  $this->config->protected_customvars,
+                    'helptext'  =>  '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.'
+                )
             )
         );
-        $this->setSubmitLabel('Save');
+    }
+
+    /**
+     * @see Form::addSubmitButton()
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'ignore'    => true,
+                'label'     => t('Save Changes')
+            )
+        );
+
+        return $this;
     }
 
     /**

From d1b1bc368fb2a7241e2be2400a9e472b27014704 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 21 Aug 2014 11:51:49 +0200
Subject: [PATCH 068/277] Monitoring_ConfigController: don't use
 SecurityForm::isSubmittedAndValid()

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

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 75c747b74..2e03fbe28 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -257,8 +257,8 @@ class Monitoring_ConfigController extends ModuleActionController
 
         $form = new SecurityForm();
         $form->setConfiguration($this->Config()->get('security'));
-        $form->setRequest($this->getRequest());
-        if ($form->isSubmittedAndValid()) {
+        $request = $this->getRequest();
+        if ($request->isPost() && $form->isValid($request->getPost())) {
             $config = $this->Config()->toArray();
             $config['security'] = $form->getConfig();
             if ($this->writeConfiguration(new Zend_Config($config))) {

From bc05d2ee64e3a7e4601c3809e2c24972a7a687ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 11:05:20 +0200
Subject: [PATCH 069/277] Merge LoggingForm into GeneralForm

fixes #6933
---
 application/controllers/ConfigController.php |   9 +-
 application/forms/Config/GeneralForm.php     | 144 ++++++++++++++---
 application/forms/Config/LoggingForm.php     | 154 -------------------
 library/Icinga/Logger/Logger.php             |  16 +-
 4 files changed, 139 insertions(+), 184 deletions(-)
 delete mode 100644 application/forms/Config/LoggingForm.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 599e50695..004a9c202 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -58,20 +58,15 @@ class ConfigController extends BaseConfigController
 
         $form = new GeneralForm();
         $request = $this->getRequest();
-        $currentConfig = IcingaConfig::app();
         if ($request->isPost()) {
             if ($form->isValid($request->getPost())) {
-                $formConfig = $form->getConfiguration();
-                $newConfig = new Zend_Config($currentConfig->toArray(), true);
-                $newConfig->global = $formConfig->global;
-                $newConfig->preferences = $formConfig->preferences;
-                if ($this->writeConfigFile($newConfig, 'config')) {
+                if ($this->writeConfigFile($form->getConfiguration(), 'config')) {
                     Notification::success($this->translate('New configuration has successfully been stored'));
                     $this->redirectNow('config');
                 }
             }
         } else {
-            $form->setConfiguration($currentConfig);
+            $form->setConfiguration(IcingaConfig::app());
         }
 
         $this->view->form = $form;
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 4911c9f6b..649084f80 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -8,7 +8,9 @@ use DateTimeZone;
 use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Util\Translator;
+use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
+use Icinga\Web\Form\Validator\WritablePathValidator;
 
 /**
  * Configuration form for general, application-wide settings
@@ -34,7 +36,11 @@ class GeneralForm extends Form
             $this->getModulePathInput($formData)
         );
 
-        return array_merge($elements, $this->getPreferencesElements($formData));
+        return array_merge(
+            $elements,
+            $this->getPreferencesElements($formData),
+            $this->getLoggingElements($formData)
+        );
     }
 
     /**
@@ -63,13 +69,14 @@ class GeneralForm extends Form
      */
     public function setConfiguration(Zend_Config $config)
     {
-        $defaults = $config->get('global', new Zend_Config(array()))->toArray();
-        if ($config->get('preferences', new Zend_Config(array()))->type !== null) {
-            $defaults['preferences_type'] = $config->get('preferences')->type;
-            $defaults['preferences_resource'] = $config->get('preferences')->resource;
+        $defaults = array();
+        foreach ($config as $section => $properties) {
+            foreach ($properties as $name => $value) {
+                $defaults[$section . '_' . $name] = $value;
+            }
         }
 
-        $this->setDefaults($defaults);
+        $this->populate($defaults);
         return $this;
     }
 
@@ -80,19 +87,14 @@ class GeneralForm extends Form
      */
     public function getConfiguration()
     {
+        $config = array();
         $values = $this->getValues();
-        $globalData = array(
-            'language'   => $values['language'],
-            'timezone'   => $values['timezone'],
-            'modulePath' => $values['modulePath']
-        );
-
-        $preferencesData = array('type' => $values['preferences_type']);
-        if ($values['preferences_type'] === 'db') {
-            $preferencesData['resource'] = $values['preferences_resource'];
+        foreach ($values as $sectionAndPropertyName => $value) {
+            list($section, $property) = explode('_', $sectionAndPropertyName);
+            $config[$section][$property] = $value;
         }
 
-        return new Zend_Config(array('global' => $globalData, 'preferences' => $preferencesData));
+        return new Zend_Config($config);
     }
 
     /**
@@ -113,7 +115,7 @@ class GeneralForm extends Form
 
         return $this->createElement(
             'select',
-            'language',
+            'global_language',
             array(
                 'label'         => t('Default Language'),
                 'required'      => true,
@@ -144,7 +146,7 @@ class GeneralForm extends Form
 
         $this->addElement(
             'select',
-            'timezone',
+            'global_timezone',
             array(
                 'label'         => t('Default Application Timezone'),
                 'required'      => true,
@@ -167,7 +169,7 @@ class GeneralForm extends Form
     {
         $this->addElement(
             'text',
-            'modulePath',
+            'global_modulePath',
             array(
                 'label'     => t('Module Path'),
                 'required'  => true,
@@ -232,4 +234,108 @@ class GeneralForm extends Form
 
         return $elements;
     }
+
+    /**
+     * Return form elements to setup the application's logging
+     *
+     * @param   array   $formData   The data sent by the user
+     *
+     * @return  array
+     */
+    protected function getLoggingElements(array $formData)
+    {
+        $elements = array();
+
+        $elements[] = $this->createElement(
+            'select',
+            'logging_level',
+            array(
+                'required'      => true,
+                'label'         => t('Logging Level'),
+                'helptext'      => t('The maximum loglevel to emit.'),
+                'multiOptions'  => array(
+                    0 => t('None'),
+                    1 => t('Error'),
+                    2 => t('Warning'),
+                    3 => t('Information'),
+                    4 => t('Debug')
+                )
+            )
+        );
+        $elements[] = $this->createElement(
+            'select',
+            'logging_type',
+            array(
+                'required'      => true,
+                'class'         => 'autosubmit',
+                'label'         => t('Logging Type'),
+                'helptext'      => t('The type of logging to utilize.'),
+                'multiOptions'  => array(
+                    'syslog'    => 'Syslog',
+                    'file'      => t('File')
+                )
+            )
+        );
+
+        if (false === isset($formData['logging_type']) || $formData['logging_type'] === 'syslog') {
+            $elements[] = $this->createElement(
+                'text',
+                'logging_application',
+                array(
+                    'required'      => true,
+                    'label'         => t('Application Prefix'),
+                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
+                    'value'         => 'icingaweb',
+                    'validators'    => array(
+                        array(
+                            'Regex',
+                            false,
+                            array(
+                                'pattern'  => '/^[^\W]+$/',
+                                'messages' => array(
+                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
+                                )
+                            )
+                        )
+                    )
+                )
+            );
+            $elements[] = $this->createElement(
+                'select',
+                'logging_facility',
+                array(
+                    'required'      => true,
+                    'label'         => t('Facility'),
+                    'helptext'      => t('The Syslog facility to utilize.'),
+                    'multiOptions'  => array(
+                        'LOG_USER'  => 'LOG_USER'
+                    )
+                )
+            );
+        } elseif ($formData['logging_type'] === 'file') {
+            $elements[] = $this->createElement(
+                'text',
+                'logging_target',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('The logfile to write messages to.'),
+                    'value'         => $this->getDefaultLogDir(),
+                    'validators'    => array(new WritablePathValidator())
+                )
+            );
+        }
+
+        return $elements;
+    }
+
+    /**
+     * Return the default logging directory for type "file"
+     *
+     * @return  string
+     */
+    protected function getDefaultLogDir()
+    {
+        return realpath(Icinga::app()->getApplicationDir('../var/log/icingaweb.log'));
+    }
 }
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
deleted file mode 100644
index 4b212cc2d..000000000
--- a/application/forms/Config/LoggingForm.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Config;
-
-use Icinga\Web\Form;
-use Icinga\Application\Icinga;
-use Icinga\Web\Form\Validator\WritablePathValidator;
-
-/**
- * Form class for setting the application wide logging configuration
- */
-class LoggingForm extends Form
-{
-    /**
-     * Initialize this logging configuration form
-     *
-     * Sets actually only the name.
-     */
-    public function init()
-    {
-        $this->setName('form_config_logging');
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $elements = array();
-
-        $elements[] = $this->createElement(
-            'checkbox',
-            'enable',
-            array(
-                'required'  => true,
-                'label'     => t('Logging Enabled'),
-                'helptext'  => t('Check this to enable logging.'),
-                'value'     => isset($formData['enable']) ? $formData['enable'] : 0
-            )
-        );
-        $elements[] = $this->createElement(
-            'select',
-            'level',
-            array(
-                'required'      => true,
-                'label'         => t('Logging Level'),
-                'helptext'      => t('The maximum loglevel to emit.'),
-                'value'         => isset($formData['level']) ? $formData['level'] : 0,
-                'multiOptions'  => array(
-                    0 => t('Error'),
-                    1 => t('Warning'),
-                    2 => t('Information'),
-                    3 => t('Debug')
-                )
-            )
-        );
-        $elements[] = $this->createElement(
-            'select',
-            'type',
-            array(
-                'required'      => true,
-                'class'         => 'autosubmit',
-                'label'         => t('Logging Type'),
-                'helptext'      => t('The type of logging to utilize.'),
-                'value'         => isset($formData['type']) ? $formData['type'] : 'syslog',
-                'multiOptions'  => array(
-                    'file'      => t('File'),
-                    'syslog'    => 'Syslog'
-                )
-            )
-        );
-
-        if (false === isset($formData['type']) || $formData['type'] === 'syslog') {
-            $elements[] = $this->createElement(
-                'text',
-                'application',
-                array(
-                    'required'      => true,
-                    'label'         => t('Application Prefix'),
-                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
-                    'value'         => isset($formData['application']) ? $formData['application'] : 'icingaweb',
-                    'validators'    => array(
-                        array(
-                            'Regex',
-                            false,
-                            array(
-                                'pattern'  => '/^[^\W]+$/',
-                                'messages' => array(
-                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
-                                )
-                            )
-                        )
-                    )
-                )
-            );
-            $elements[] = $this->createElement(
-                'select',
-                'facility',
-                array(
-                    'required'      => true,
-                    'label'         => t('Facility'),
-                    'helptext'      => t('The Syslog facility to utilize.'),
-                    'value'         => isset($formData['facility']) ? $formData['facility'] : 'LOG_USER',
-                    'multiOptions'  => array(
-                        'LOG_USER'  => 'LOG_USER'
-                    )
-                )
-            );
-        } elseif ($formData['type'] === 'file') {
-            $elements[] = $this->createElement(
-                'text',
-                'target',
-                array(
-                    'required'      => true,
-                    'label'         => t('Filepath'),
-                    'helptext'      => t('The logfile to write messages to.'),
-                    'value'         => isset($formData['target']) ? $formData['target'] : $this->getDefaultLogDir(),
-                    'validators'    => array(new WritablePathValidator())
-                )
-            );
-        }
-
-        return $elements;
-    }
-
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save')
-            )
-        );
-
-        return $this;
-    }
-
-    /**
-     * Return the default logging directory for type "file"
-     *
-     * @return  string
-     */
-    protected function getDefaultLogDir()
-    {
-        return realpath(Icinga::app()->getApplicationDir() . '/../var/log/icingaweb.log');
-    }
-}
diff --git a/library/Icinga/Logger/Logger.php b/library/Icinga/Logger/Logger.php
index 31b0452d2..82ccba144 100644
--- a/library/Icinga/Logger/Logger.php
+++ b/library/Icinga/Logger/Logger.php
@@ -6,6 +6,7 @@ namespace Icinga\Logger;
 
 use Exception;
 use Zend_Config;
+use LogicException;
 use Icinga\Exception\ConfigurationError;
 
 /**
@@ -37,10 +38,11 @@ class Logger
     /**
      * The supported severities
      */
-    public static $ERROR = 0;
-    public static $WARNING = 1;
-    public static $INFO = 2;
-    public static $DEBUG = 3;
+    public static $NONE = 0;
+    public static $ERROR = 1;
+    public static $WARNING = 2;
+    public static $INFO = 3;
+    public static $DEBUG = 4;
 
     /**
      * Create a new logger object
@@ -90,9 +92,15 @@ class Logger
      *
      * @param   string  $message    The message to write
      * @param   int     $severity   The severity to use
+     *
+     * @throws  LogicException      In case $severity equals self::$NONE
      */
     public function log($message, $severity)
     {
+        if ($severity === static::$NONE) {
+            throw new LogicException("`None' (0) is not a valid severity to log messages");
+        }
+
         if ($this->writer !== null && $this->verbosity >= $severity) {
             $this->writer->log($severity, $message);
         }

From 2b879b344faef00bf0eafa696f8d48ebf80faffa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:04:14 +0200
Subject: [PATCH 070/277] Do not populate using createElements() and fix
 documentation blocks

refs #5525
---
 .../Authentication/AutologinBackendForm.php   |  7 +++-
 application/forms/Config/GeneralForm.php      | 35 ++++++-------------
 application/forms/Preference/GeneralForm.php  | 15 +++-----
 library/Icinga/Web/Form.php                   |  4 +--
 .../application/forms/Config/SecurityForm.php |  4 ++-
 5 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index 39cf6ecd3..eab096c71 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -6,6 +6,9 @@ namespace Icinga\Form\Config\Authentication;
 
 use Zend_Validate_Callback;
 
+/**
+ * Form class for adding/modifying autologin authentication backends
+ */
 class AutologinBackendForm extends BaseBackendForm
 {
     public function isValidAuthenticationBackend()
@@ -13,6 +16,9 @@ class AutologinBackendForm extends BaseBackendForm
         return true;
     }
 
+    /**
+     * @see Form::createElements()
+     */
     public function createElements(array $formData)
     {
         return array(
@@ -24,7 +30,6 @@ class AutologinBackendForm extends BaseBackendForm
                     'allowEmpty'    => false,
                     'label'         => t('Backend Name'),
                     'helptext'      => t('The name of this authentication backend'),
-                    'value'         => '',
                     'validators'    => array(
                         array(
                             'Regex',
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 649084f80..3edd4ee0c 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -31,9 +31,9 @@ class GeneralForm extends Form
     public function createElements(array $formData)
     {
         $elements = array(
-            $this->getLanguageSelection($formData),
-            $this->getTimezoneSelection($formData),
-            $this->getModulePathInput($formData)
+            $this->getLanguageSelection(),
+            $this->getTimezoneSelection(),
+            $this->getModulePathInput()
         );
 
         return array_merge(
@@ -102,11 +102,9 @@ class GeneralForm extends Form
      *
      * Possible values are determined by Translator::getAvailableLocaleCodes.
      *
-     * @param   array   $formData   The data to populate the elements with
-     *
      * @return  Zend_Form_Element
      */
-    protected function getLanguageSelection(array $formData)
+    protected function getLanguageSelection()
     {
         $languages = array();
         foreach (Translator::getAvailableLocaleCodes() as $language) {
@@ -122,8 +120,7 @@ class GeneralForm extends Form
                 'multiOptions'  => $languages,
                 'helptext'      => t(
                     'Select the language to use by default. Can be overwritten by a user in his preferences.'
-                ),
-                'value'         => isset($formData['language']) ? $formData['language'] : Translator::DEFAULT_LOCALE
+                )
             )
         );
     }
@@ -133,11 +130,9 @@ class GeneralForm extends Form
      *
      * Possible values are determined by DateTimeZone::listIdentifiers.
      *
-     * @param   array   $formData   The data to populate the elements with
-     *
      * @return  Zend_Form_Element
      */
-    protected function getTimezoneSelection(array $formData)
+    protected function getTimezoneSelection()
     {
         $tzList = array();
         foreach (DateTimeZone::listIdentifiers() as $tz) {
@@ -155,17 +150,15 @@ class GeneralForm extends Form
                     'Select the timezone to be used as the default. User\'s can set their own timezone if'
                     . ' they like to, but this is the timezone to be used as the default setting .'
                 ),
-                'value'         => isset($formData['timezone']) ? $formData['timezone'] : date_default_timezone_get()
+                'value'         => date_default_timezone_get()
             )
         );
     }
 
     /**
      * Return a input field for setting the module path
-     *
-     * @param   array   $formData   The data to populate the elements with
      */
-    protected function getModulePathInput(array $formData)
+    protected function getModulePathInput()
     {
         $this->addElement(
             'text',
@@ -178,9 +171,7 @@ class GeneralForm extends Form
                     . '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.'
                 ),
-                'value'     => isset($formData['modulePath'])
-                    ? $formData['modulePath']
-                    : realpath(ICINGAWEB_APPDIR . '/../modules')
+                'value'     => realpath(ICINGAWEB_APPDIR . '/../modules')
             )
         );
     }
@@ -188,7 +179,7 @@ class GeneralForm extends Form
     /**
      * Return form elements for setting the user preference storage backend
      *
-     * @param   array   $formData   The data to populate the elements with
+     * @param   array   $formData   The data sent by the user
      */
     protected function getPreferencesElements(array $formData)
     {
@@ -200,7 +191,6 @@ class GeneralForm extends Form
                     'required'      => true,
                     'class'         => 'autosubmit',
                     'label'         => t('User Preference Storage Type'),
-                    'value'         => isset($formData['preferences_type']) ? $formData['preferences_type'] : 'ini',
                     'multiOptions'  => array(
                         'ini'   => t('File System (INI Files)'),
                         'db'    => t('Database'),
@@ -224,10 +214,7 @@ class GeneralForm extends Form
                 array(
                     'required'      => true,
                     'multiOptions'  => $backends,
-                    'label'         => t('Database Connection'),
-                    'value'         => isset($formData['preferences_resource'])
-                        ? $formData['preferences_resource']
-                        : null
+                    'label'         => t('Database Connection')
                 )
             );
         }
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 6ec719f72..a1f89951d 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -28,7 +28,7 @@ class GeneralForm extends Form
      * Possible values are determined by Translator::getAvailableLocaleCodes.
      * Also, a 'use browser language' checkbox is added in order to allow a user to discard his setting
      *
-     * @param   array   $formData   The data to populate the elements with
+     * @param   array   $formData   The data sent by the user
      */
     protected function getLanguageElements(array $formData)
     {
@@ -43,9 +43,7 @@ class GeneralForm extends Form
             'required'      => false === $useBrowserLanguage,
             'multiOptions'  => $languages,
             'helptext'      => t('Use the following language to display texts and messages'),
-            'value'         => isset($formData['language'])
-                ? $formData['language']
-                : substr(setlocale(LC_ALL, 0), 0, 5)
+            'value'         => substr(setlocale(LC_ALL, 0), 0, 5)
         );
         if ($useBrowserLanguage) {
             $selectOptions['disabled'] = 'disabled';
@@ -72,7 +70,7 @@ class GeneralForm extends Form
      * Possible values are determined by DateTimeZone::listIdentifiers.
      * Also, a 'use local timezone' checkbox is added in order to allow a user to discard his overwritten setting
      *
-     * @param   array   $formData   The data to populate the elements with
+     * @param   array   $formData   The data sent by the user
      */
     protected function getTimezoneElements(array $formData)
     {
@@ -87,9 +85,7 @@ class GeneralForm extends Form
             'required'      => false === $useLocalTimezone,
             'multiOptions'  => $tzList,
             'helptext'      => t('Use the following timezone for dates and times'),
-            'value'         => isset($formData['timezone'])
-                ? $formData['timezone']
-                : date_default_timezone_get()
+            'value'         => date_default_timezone_get()
         );
         if ($useLocalTimezone) {
             $selectOptions['disabled'] = 'disabled';
@@ -120,8 +116,7 @@ class GeneralForm extends Form
             'checkbox',
             'show_benchmark',
             array(
-                'label' => t('Use benchmark'),
-                'value' => isset($formData['show_benchmark']) ? $formData['show_benchmark'] : 0
+                'label' => t('Use benchmark')
             )
         );
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index dc8fb4f6c..8dc7e9f82 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -123,7 +123,7 @@ class Form extends Zend_Form
     /**
      * Create this form
      *
-     * @param   array   $formData   The data to populate the form with
+     * @param   array   $formData   The data sent by the user
      *
      * @return  self
      */
@@ -150,7 +150,7 @@ class Form extends Zend_Form
      *
      * Intended to be implemented by concrete form classes.
      *
-     * @param   array   $formData   The data to populate the elements with
+     * @param   array   $formData   The data sent by the user
      *
      * @return  array
      */
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index fbae02688..7b004f21b 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -7,6 +7,9 @@ namespace Icinga\Module\Monitoring\Form\Config;
 use Zend_Config;
 use Icinga\Web\Form;
 
+/**
+ * Form for modifying security relevant settings
+ */
 class SecurityForm extends Form
 {
     /**
@@ -26,7 +29,6 @@ class SecurityForm extends Form
                 array(
                     'label'     =>  'Protected Custom Variables',
                     'required'  =>  true,
-                    'value'     =>  $this->config->protected_customvars,
                     'helptext'  =>  '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.'

From 75a0c17933ee7ada01fd1c605e0d122288a623e9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:15:02 +0200
Subject: [PATCH 071/277] Ensure that all forms have a name

refs #5525
---
 .../forms/Config/Authentication/AutologinBackendForm.php  | 8 ++++++++
 application/forms/Config/Authentication/DbBackendForm.php | 2 ++
 .../forms/Config/Authentication/LdapBackendForm.php       | 2 ++
 application/forms/Dashboard/AddUrlForm.php                | 8 ++++++++
 application/forms/Preference/GeneralForm.php              | 2 +-
 .../application/controllers/ConfigController.php          | 3 +++
 .../monitoring/application/forms/Config/BackendForm.php   | 8 ++++++++
 .../monitoring/application/forms/Config/InstanceForm.php  | 8 ++++++++
 .../monitoring/application/forms/Config/SecurityForm.php  | 8 ++++++++
 9 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index eab096c71..d6ba109e9 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -11,6 +11,14 @@ use Zend_Validate_Callback;
  */
 class AutologinBackendForm extends BaseBackendForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_authentication_autologin');
+    }
+
     public function isValidAuthenticationBackend()
     {
         return true;
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index bb1e68924..56e74ae14 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -30,6 +30,8 @@ class DbBackendForm extends BaseBackendForm
      */
     public function init()
     {
+        $this->setName('form_config_authentication_db');
+
         $dbResources = array_keys(
             ResourceFactory::getResourceConfigs('db')->toArray()
         );
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 8d275b00e..7209b5435 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -30,6 +30,8 @@ class LdapBackendForm extends BaseBackendForm
      */
     public function init()
     {
+        $this->setName('form_config_authentication_ldap');
+
         $ldapResources = array_keys(
             ResourceFactory::getResourceConfigs('ldap')->toArray()
         );
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 4a9d93016..4ef0c985c 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -13,6 +13,14 @@ use Icinga\Web\Form;
  */
 class AddUrlForm extends Form
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_dashboard_addurl');
+    }
+
     /**
      * @see Form::createElements()
      */
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index a1f89951d..45044234c 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -19,7 +19,7 @@ class GeneralForm extends Form
      */
     public function init()
     {
-        $this->setName('form_preference_set');
+        $this->setName('form_config_preferences');
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 2e03fbe28..4f1d3c7fa 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -251,6 +251,9 @@ class Monitoring_ConfigController extends ModuleActionController
         return true;
     }
 
+    /**
+     * Display a form to adjust security relevant settings
+     */
     public function securityAction()
     {
         $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
index 4b2859432..f9ea25806 100644
--- a/modules/monitoring/application/forms/Config/BackendForm.php
+++ b/modules/monitoring/application/forms/Config/BackendForm.php
@@ -12,6 +12,14 @@ use Icinga\Data\ResourceFactory;
  */
 class BackendForm extends Form
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_backends');
+    }
+
     /**
      * @see Form::createElements()
      */
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
index e74ecca86..422a3a9e2 100644
--- a/modules/monitoring/application/forms/Config/InstanceForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceForm.php
@@ -14,6 +14,14 @@ use Icinga\Web\Form\Decorator\ElementWrapper;
  */
 class InstanceForm extends Form
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_instances');
+    }
+
     /**
      * @see Form::createElements()
      */
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index 7b004f21b..65544c23e 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -17,6 +17,14 @@ class SecurityForm extends Form
      */
     protected $config;
 
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_security');
+    }
+
     /**
      * @see Form::createElements()
      */

From a0b2c0b4541e0f4ea29dca7581edcbc901d3c2aa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:18:26 +0200
Subject: [PATCH 072/277] Fix another documentation block

---
 .../Authentication/AutologinBackendForm.php     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index d6ba109e9..dbc8e7365 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -19,11 +19,6 @@ class AutologinBackendForm extends BaseBackendForm
         $this->setName('form_config_authentication_autologin');
     }
 
-    public function isValidAuthenticationBackend()
-    {
-        return true;
-    }
-
     /**
      * @see Form::createElements()
      */
@@ -78,4 +73,16 @@ class AutologinBackendForm extends BaseBackendForm
             )
         );
     }
+
+    /**
+     * Validate the configuration state of this backend
+     *
+     * Returns just true as autologins are being handled externally by the webserver.
+     *
+     * @return  true
+     */
+    public function isValidAuthenticationBackend()
+    {
+        return true;
+    }
 }

From 5028ec7b0b8ae80948da5a2895b7319e2fb50085 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:30:13 +0200
Subject: [PATCH 073/277] Avoid NIH

It's useless to have specific getters and setters if generic methods from the
baseclass can be used as well to accomplish the same task.

refs #6641
---
 .../controllers/ConfigController.php          | 24 ++++++++++-------
 .../application/forms/Config/SecurityForm.php | 27 -------------------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 4f1d3c7fa..ba005f302 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -259,19 +259,23 @@ class Monitoring_ConfigController extends ModuleActionController
         $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
 
         $form = new SecurityForm();
-        $form->setConfiguration($this->Config()->get('security'));
         $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            $config = $this->Config()->toArray();
-            $config['security'] = $form->getConfig();
-            if ($this->writeConfiguration(new Zend_Config($config))) {
-                Notification::success('Configuration modified successfully');
-                $this->redirectNow('monitoring/config/security');
-            } else {
-                $this->render('show-configuration');
-                return;
+        $config = $this->Config()->toArray();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                $config['security'] = $form->getValues();
+                if ($this->writeConfiguration(new Zend_Config($config))) {
+                    Notification::success('Configuration modified successfully');
+                    $this->redirectNow('monitoring/config/security');
+                } else {
+                    $this->render('show-configuration');
+                    return;
+                }
             }
+        } elseif (isset($config['security'])) {
+            $form->populate($config['security']);
         }
+
         $this->view->form = $form;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index 65544c23e..7c38976a1 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Monitoring\Form\Config;
 
-use Zend_Config;
 use Icinga\Web\Form;
 
 /**
@@ -12,11 +11,6 @@ use Icinga\Web\Form;
  */
 class SecurityForm extends Form
 {
-    /**
-     * The configuration to use for populating the form
-     */
-    protected $config;
-
     /**
      * Initialize this form
      */
@@ -61,25 +55,4 @@ class SecurityForm extends Form
 
         return $this;
     }
-
-    /**
-     * Set the configuration to be used for initial population of the form
-     */
-    public function setConfiguration($config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Return the configuration set by this form
-     *
-     * @return Zend_Config The configuration set in this form
-     */
-    public function getConfig()
-    {
-        $values = $this->getValues();
-        return new Zend_Config(array(
-            'protected_customvars' => $values['protected_customvars']
-        ));
-    }
 }

From 403f7454884cef9a6dea157817a79b825969830d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:34:33 +0200
Subject: [PATCH 074/277] Remove obsolete loggingAction

refs #6933
---
 application/controllers/ConfigController.php | 33 --------------------
 1 file changed, 33 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 004a9c202..423a59902 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -37,9 +37,6 @@ class ConfigController extends BaseConfigController
         ))->add('resources', array(
             'title' => 'Resources',
             'url'   => 'config/resource'
-        ))->add('logging', array(
-            'title' => 'Logging',
-            'url'   => 'config/logging'
         ));
     }
 
@@ -72,36 +69,6 @@ class ConfigController extends BaseConfigController
         $this->view->form = $form;
     }
 
-    /**
-     * Form for modifying the logging configuration
-     */
-    public function loggingAction()
-    {
-        $this->view->messageBox = new AlertMessageBox(true);
-        $this->view->tabs->activate('logging');
-
-        $form = new LoggingForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                $appConfig = IcingaConfig::app();
-                $appConfig->logging = new Zend_Config($form->getValues());
-                if ($this->writeConfigFile($appConfig, 'config')) {
-                    $this->addSuccessMessage($this->translate('Logging configuration has sucessfully been stored'));
-                    $this->redirectNow('config/logging');
-                }
-            }
-        } else {
-            $loggingConfig = Icinga::app()->getConfig()->logging;
-            if ($loggingConfig === null) {
-                $loggingConfig = new Zend_Config(array());
-            }
-            $form->populate($loggingConfig->toArray());
-        }
-
-        $this->view->form = $form;
-    }
-
     /**
      * Display the list of all modules
      */

From 7b221e2aba7e08a0204c2510d5840f8044a79aa4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 15:20:54 +0200
Subject: [PATCH 075/277] It should not be a form's responsibility how its
 submit button should look..

...in case it's a standard button. No need to be DRY here.

refs #5525
---
 .../controllers/DashboardController.php       |  2 +-
 .../forms/Authentication/LoginForm.php        | 16 +----
 .../Authentication/AutologinBackendForm.php   |  1 +
 .../Config/Authentication/BaseBackendForm.php | 17 ------
 .../Config/Authentication/DbBackendForm.php   |  1 +
 .../Config/Authentication/LdapBackendForm.php |  1 +
 .../forms/Config/ConfirmRemovalForm.php       | 16 +----
 application/forms/Config/GeneralForm.php      | 18 +-----
 application/forms/Config/ResourceForm.php     | 18 +-----
 application/forms/Dashboard/AddUrlForm.php    | 18 +-----
 application/forms/Preference/GeneralForm.php  | 18 +-----
 library/Icinga/Web/Form.php                   | 60 ++++++++++++++++++-
 .../application/forms/Config/BackendForm.php  | 18 +-----
 .../application/forms/Config/InstanceForm.php | 18 +-----
 .../application/forms/Config/SecurityForm.php | 18 +-----
 15 files changed, 72 insertions(+), 168 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index b2c84c675..b875cc4d4 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -84,7 +84,7 @@ class DashboardController extends ActionController
         $form = new AddUrlForm();
         $request = $this->getRequest();
         if ($request->isPost()) {
-            if ($form->isValid($request->getPost()) && $form->getElement('btn_submit')->isChecked()) {
+            if ($form->isValid($request->getPost()) && $form->isSubmitted()) {
                 $dashboard = $this->getDashboard();
                 $dashboard->setComponentUrl(
                     $form->getValue('pane'),
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index cb127dee7..bdf8956a3 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -18,6 +18,7 @@ class LoginForm extends Form
     public function init()
     {
         $this->setName('form_login');
+        $this->setSubmitLabel(t('Login'));
     }
 
     /**
@@ -55,19 +56,4 @@ class LoginForm extends Form
             )
         );
     }
-
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Login')
-            )
-        );
-    }
 }
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index dbc8e7365..c3cf56fa7 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -17,6 +17,7 @@ class AutologinBackendForm extends BaseBackendForm
     public function init()
     {
         $this->setName('form_config_authentication_autologin');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 02aa5dfb4..840b5f34c 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -11,23 +11,6 @@ use Icinga\Web\Form;
  */
 abstract class BaseBackendForm extends Form
 {
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Return whether the given values are complete/valid and check whether it is possible to connect to the backend
      *
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 56e74ae14..521414094 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -31,6 +31,7 @@ class DbBackendForm extends BaseBackendForm
     public function init()
     {
         $this->setName('form_config_authentication_db');
+        $this->setSubmitLabel(t('Save Changes'));
 
         $dbResources = array_keys(
             ResourceFactory::getResourceConfigs('db')->toArray()
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 7209b5435..ed261c1f9 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -31,6 +31,7 @@ class LdapBackendForm extends BaseBackendForm
     public function init()
     {
         $this->setName('form_config_authentication_ldap');
+        $this->setSubmitLabel(t('Save Changes'));
 
         $ldapResources = array_keys(
             ResourceFactory::getResourceConfigs('ldap')->toArray()
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index a2a5f3b34..8851bd0e3 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -17,20 +17,6 @@ class ConfirmRemovalForm extends Form
     public function init()
     {
         $this->setName('form_confirm_removal');
-    }
-
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Confirm Removal')
-            )
-        );
+        $this->setSubmitLabel(t('Confirm Removal'));
     }
 }
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 3edd4ee0c..23f27f31e 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -23,6 +23,7 @@ class GeneralForm extends Form
     public function init()
     {
         $this->setName('form_config_general');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -43,23 +44,6 @@ class GeneralForm extends Form
         );
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Populate this form with the given configuration
      *
diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
index a0394e45c..db27d83c2 100644
--- a/application/forms/Config/ResourceForm.php
+++ b/application/forms/Config/ResourceForm.php
@@ -21,6 +21,7 @@ class ResourceForm extends Form
     public function init()
     {
         $this->setName('form_config_resource');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -74,23 +75,6 @@ class ResourceForm extends Form
         }
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Return whether the given values are complete/valid and check whether it is possible to connect to the resource
      *
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 4ef0c985c..67452a84f 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -19,6 +19,7 @@ class AddUrlForm extends Form
     public function init()
     {
         $this->setName('form_dashboard_addurl');
+        $this->setSubmitLabel(t('Add To Dashboard'));
     }
 
     /**
@@ -104,23 +105,6 @@ class AddUrlForm extends Form
         return $elements;
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Add To Dashboard')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Return the names and titles of the available dashboard panes as key-value array
      *
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 45044234c..b9ce5e9e2 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -20,6 +20,7 @@ class GeneralForm extends Form
     public function init()
     {
         $this->setName('form_config_preferences');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -123,23 +124,6 @@ class GeneralForm extends Form
         return $elements;
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Populate the form with the given preferences
      *
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 8dc7e9f82..b71e8800b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -23,6 +23,13 @@ class Form extends Zend_Form
      */
     protected $created = false;
 
+    /**
+     * Label to use for the standard submit button
+     *
+     * @var string
+     */
+    protected $submitLabel;
+
     /**
      * The view script to use when rendering this form
      *
@@ -46,6 +53,29 @@ class Form extends Zend_Form
      */
     protected $tokenElementName = 'CSRFToken';
 
+    /**
+     * Set the label to use for the standard submit button
+     *
+     * @param   string  $label  The label to use for the submit button
+     *
+     * @return  self
+     */
+    public function setSubmitLabel($label)
+    {
+        $this->submitLabel = $label;
+        return $this;
+    }
+
+    /**
+     * Return the label being used for the standard submit button
+     *
+     * @return  string
+     */
+    public function getSubmitLabel()
+    {
+        return $this->submitLabel;
+    }
+
     /**
      * Set the view script to use when rendering this form
      *
@@ -162,12 +192,24 @@ class Form extends Zend_Form
     /**
      * Add a submit button to this form
      *
-     * Intended to be implemented by concrete form classes.
+     * 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
      */
     public function addSubmitButton()
     {
+        if ($this->submitLabel !== null) {
+            $this->addElement(
+                'submit',
+                'btn_submit',
+                array(
+                    'ignore'    => true,
+                    'label'     => $this->submitLabel
+                )
+            );
+        }
+
         return $this;
     }
 
@@ -261,6 +303,22 @@ class Form extends Zend_Form
         return empty($missingValues);
     }
 
+    /**
+     * Return whether the submit button of this form was pressed
+     *
+     * When overwriting Form::addSubmitButton() be sure to overwrite this method as well.
+     *
+     * @return  bool                True in case it was pressed, False otherwise or no submit label was set
+     */
+    public function isSubmitted()
+    {
+        if ($this->submitLabel !== null) {
+            return $this->getElement('btn_submit')->isChecked();
+        }
+
+        return false;
+    }
+
     /**
      * Return whether the given values (possibly incomplete) are valid
      *
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
index f9ea25806..f74c9bbaf 100644
--- a/modules/monitoring/application/forms/Config/BackendForm.php
+++ b/modules/monitoring/application/forms/Config/BackendForm.php
@@ -18,6 +18,7 @@ class BackendForm extends Form
     public function init()
     {
         $this->setName('form_config_monitoring_backends');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -73,23 +74,6 @@ class BackendForm extends Form
         );
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Return the backend configuration values and its name
      *
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
index 422a3a9e2..3794e3c54 100644
--- a/modules/monitoring/application/forms/Config/InstanceForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceForm.php
@@ -20,6 +20,7 @@ class InstanceForm extends Form
     public function init()
     {
         $this->setName('form_config_monitoring_instances');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -120,23 +121,6 @@ class InstanceForm extends Form
         return $elements;
     }
 
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
-
     /**
      * Return the instance configuration values and its name
      *
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index 7c38976a1..48368d0f1 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -17,6 +17,7 @@ class SecurityForm extends Form
     public function init()
     {
         $this->setName('form_config_monitoring_security');
+        $this->setSubmitLabel(t('Save Changes'));
     }
 
     /**
@@ -38,21 +39,4 @@ class SecurityForm extends Form
             )
         );
     }
-
-    /**
-     * @see Form::addSubmitButton()
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'submit',
-            'btn_submit',
-            array(
-                'ignore'    => true,
-                'label'     => t('Save Changes')
-            )
-        );
-
-        return $this;
-    }
 }

From c93ab7951d0fe801bd800b72858043849c3e5488 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 25 Aug 2014 16:49:54 +0200
Subject: [PATCH 076/277] Check whether a form's data was sent instead of
 whether it's complete

It is not sufficient to just check whether all required elements are being
submitted. We definetely need to check whether the submit button was
pressed. But doing this and providing a standard button with a static name
simultaneously will produce conflicts if forms are using the same action
urls. To fix this, we'll add an additional form-identification check by using
a form's name or class.

refs #5525
---
 library/Icinga/Web/Form.php | 96 +++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index b71e8800b..8d2e4f333 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Web;
 
-use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Web\Form\Decorator\HelpText;
@@ -161,7 +160,9 @@ class Form extends Zend_Form
     {
         if (false === $this->created) {
             $this->addElements($this->createElements($formData));
-            $this->addCsrfCounterMeasure()->addSubmitButton();
+            $this->addFormIdentification()
+                ->addCsrfCounterMeasure()
+                ->addSubmitButton();
 
             if ($this->getAction() === '') {
                 // We MUST set an action as JS gets confused otherwise, if
@@ -245,6 +246,25 @@ class Form extends Zend_Form
         return $el;
     }
 
+    /**
+     * Add a field with a unique and form specific ID
+     *
+     * @return  self
+     */
+    public function addFormIdentification()
+    {
+        $this->addElement(
+            'hidden',
+            'form_uid',
+            array(
+                'ignore'    => true,
+                'value'     => $this->getName()
+            )
+        );
+
+        return $this;
+    }
+
     /**
      * Add CSRF counter measure field to this form
      *
@@ -272,37 +292,6 @@ class Form extends Zend_Form
         return parent::setDefaults($defaults);
     }
 
-    /**
-     * Return whether the given data provides a value for each element of this form
-     *
-     * Note that elements that are disabled or of type submit are not taken into consideration.
-     *
-     * @param   array   $formData   The data to check
-     *
-     * @return  bool
-     *
-     * @throws  LogicException      In case this form has no elements
-     */
-    public function isComplete(array $formData)
-    {
-        $elements = $this->create($formData)->getElements();
-        if (empty($elements)) {
-            throw new LogicException('Forms without elements cannot be complete');
-        }
-
-        $missingValues = array_diff_key(
-            array_filter(
-                $elements,
-                function ($el) {
-                    return $el->getAttrib('disabled') === null
-                        && 0 === preg_match('@(submit|button)@', strtolower(get_class($el)));
-                }
-            ),
-            $formData
-        );
-        return empty($missingValues);
-    }
-
     /**
      * Return whether the submit button of this form was pressed
      *
@@ -319,6 +308,21 @@ class Form extends Zend_Form
         return false;
     }
 
+    /**
+     * Return whether the data sent by the user refers to this form
+     *
+     * Ensures that the correct form gets processed in case there are multiple forms
+     * with equal submit button names being posted against the same route.
+     *
+     * @param   array   $formData   The data sent by the user
+     *
+     * @return  bool                Whether the given data refers to this form
+     */
+    public function wasSent(array $formData)
+    {
+        return isset($formData['form_uid']) && $formData['form_uid'] === $this->getName();
+    }
+
     /**
      * Return whether the given values (possibly incomplete) are valid
      *
@@ -336,7 +340,7 @@ class Form extends Zend_Form
     }
 
     /**
-     * Return whether the given values are complete and valid
+     * Return whether the given values are valid
      *
      * @param   array   $formData   The data to validate
      *
@@ -344,12 +348,8 @@ class Form extends Zend_Form
      */
     public function isValid($formData)
     {
-        if ($this->isComplete($formData)) {
-            return parent::isValid($formData);
-        }
-
-        $this->isValidPartial($formData); // The form can't be processed but we want to show validation errors though
-        return false;
+        $this->create($formData);
+        return parent::isValid($formData);
     }
 
     /**
@@ -391,6 +391,22 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Return the name of this form
+     *
+     * @return  string
+     */
+    public function getName()
+    {
+        $name = parent::getName();
+        if (! $name) {
+            $name = get_class($this);
+            $this->setName($name);
+        }
+
+        return $name;
+    }
+
     /**
      * Render this form
      *

From 52534a2f460aa760b539e63ebefa7994b94f718c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 25 Aug 2014 17:06:45 +0200
Subject: [PATCH 077/277] It is a form's responsibility to process the request
 it was submitted with

How forms are being validated should not be a task that is part of the
controller action, but should be handled by the form base class as it is
most of the time the same procedure. Now a controller action just sets
up the form to use, calls handleRequest() and acts upon its return value.
(e.g. calling handleRequest() from another form or any redirection)

refs #5525
---
 library/Icinga/Web/Form.php | 55 +++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 8d2e4f333..54d89e271 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -190,6 +190,30 @@ class Form extends Zend_Form
         return array();
     }
 
+    /**
+     * Perform actions after this form was submitted using a valid request
+     *
+     * Intended to be implemented by concrete form classes.
+     *
+     * @param   Request     $request    The valid request used to process this form
+     */
+    public function onSuccess(Request $request)
+    {
+
+    }
+
+    /**
+     * Perform actions after this form was submitted using an invalid request
+     *
+     * Intended to be implemented by concrete form classes.
+     *
+     * @param   Request     $request    The invalid request supposed to process this form
+     */
+    public function onFailure(Request $request)
+    {
+
+    }
+
     /**
      * Add a submit button to this form
      *
@@ -292,6 +316,37 @@ class Form extends Zend_Form
         return parent::setDefaults($defaults);
     }
 
+    /**
+     * Process the given request using this form
+     *
+     * @param   Request     $request    The request to be processed
+     *
+     * @return  null|bool               True in case the request was handled and valid,
+     *                                  false if invalid and null if it was not handled
+     */
+    public function handleRequest(Request $request)
+    {
+        if (strtolower($request->getMethod()) === $this->getMethod()) {
+            $formData = $request->{'get' . $request->isPost() ? 'Post' : 'Query'}();
+            if ($this->wasSent($formData)) {
+                $this->populate($formData); // Necessary to get isSubmitted() to work
+                if ($this->isSubmitted()) {
+                    if ($this->isValid($formData)) {
+                        $this->onSuccess($request);
+                        return true;
+                    } else {
+                        $this->onFailure($request);
+                    }
+                } else {
+                    // The form can't be processed but we want to show validation errors though
+                    $this->isValidPartial($formData);
+                }
+
+                return false;
+            }
+        }
+    }
+
     /**
      * Return whether the submit button of this form was pressed
      *

From 5c7999fe9b4cdec4c37477d0e2551289d68de1f0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 Aug 2014 12:30:37 +0200
Subject: [PATCH 078/277] Forms should be responsible for any redirection as
 well

If no specific url has been set with setRedirectUrl() a form redirects to the
current action it was posted to.

refs #5525
---
 library/Icinga/Web/Form.php | 64 +++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 54d89e271..8b1e2510b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -6,6 +6,7 @@ namespace Icinga\Web;
 
 use Zend_Form;
 use Zend_View_Interface;
+use Icinga\Application\Icinga;
 use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
@@ -29,6 +30,13 @@ class Form extends Zend_Form
      */
     protected $submitLabel;
 
+    /**
+     * The url to redirect to upon success
+     *
+     * @var string|Url
+     */
+    protected $redirectUrl;
+
     /**
      * The view script to use when rendering this form
      *
@@ -75,6 +83,34 @@ class Form extends Zend_Form
         return $this->submitLabel;
     }
 
+    /**
+     * Set the url to redirect to upon success
+     *
+     * @param   string|Url  $url    The url to redirect to
+     *
+     * @return  self
+     */
+    public function setRedirectUrl($url)
+    {
+        $this->redirectUrl = $url;
+        return $this;
+    }
+
+    /**
+     * Return the url to redirect to upon success
+     *
+     * @return  string|Url
+     */
+    public function getRedirectUrl()
+    {
+        if ($this->redirectUrl === null) {
+            // Be sure to remove all form dependent params because we do not want to submit it again
+            $this->redirectUrl = Url::fromRequest()->without(array_keys($this->getElements()));
+        }
+
+        return $this->redirectUrl;
+    }
+
     /**
      * Set the view script to use when rendering this form
      *
@@ -196,10 +232,12 @@ class Form extends Zend_Form
      * Intended to be implemented by concrete form classes.
      *
      * @param   Request     $request    The valid request used to process this form
+     *
+     * @return  bool                    Whether any redirection should take place
      */
     public function onSuccess(Request $request)
     {
-
+        return true;
     }
 
     /**
@@ -319,10 +357,11 @@ class Form extends Zend_Form
     /**
      * Process the given request using this form
      *
+     * Redirects to the url set with setRedirectUrl() upon success.
+     *
      * @param   Request     $request    The request to be processed
      *
-     * @return  null|bool               True in case the request was handled and valid,
-     *                                  false if invalid and null if it was not handled
+     * @return  self
      */
     public function handleRequest(Request $request)
     {
@@ -332,8 +371,9 @@ class Form extends Zend_Form
                 $this->populate($formData); // Necessary to get isSubmitted() to work
                 if ($this->isSubmitted()) {
                     if ($this->isValid($formData)) {
-                        $this->onSuccess($request);
-                        return true;
+                        if ($this->onSuccess($request)) {
+                            $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                        }
                     } else {
                         $this->onFailure($request);
                     }
@@ -341,10 +381,10 @@ class Form extends Zend_Form
                     // The form can't be processed but we want to show validation errors though
                     $this->isValidPartial($formData);
                 }
-
-                return false;
             }
         }
+
+        return $this;
     }
 
     /**
@@ -462,6 +502,16 @@ class Form extends Zend_Form
         return $name;
     }
 
+    /**
+     * Return the current Response
+     *
+     * @return  Response
+     */
+    public function getResponse()
+    {
+        return Icinga::app()->getFrontController()->getResponse();
+    }
+
     /**
      * Render this form
      *

From 45cbd3f0678174278bbc7ee4e494b328def54088 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 Aug 2014 12:31:05 +0200
Subject: [PATCH 079/277] We do not require the request being passed to
 handleRequest()

refs #5525
---
 library/Icinga/Web/Form.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 8b1e2510b..fdeb0cd8b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -363,8 +363,12 @@ class Form extends Zend_Form
      *
      * @return  self
      */
-    public function handleRequest(Request $request)
+    public function handleRequest(Request $request = null)
     {
+        if ($request === null) {
+            $request = $this->getRequest();
+        }
+
         if (strtolower($request->getMethod()) === $this->getMethod()) {
             $formData = $request->{'get' . $request->isPost() ? 'Post' : 'Query'}();
             if ($this->wasSent($formData)) {
@@ -502,6 +506,16 @@ class Form extends Zend_Form
         return $name;
     }
 
+    /**
+     * Return the current request
+     *
+     * @return  Request
+     */
+    public function getRequest()
+    {
+        return Icinga::app()->getFrontController()->getRequest();
+    }
+
     /**
      * Return the current Response
      *

From 6b88f1c98e1caefe1387b7f3e8a96764517a93db Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 Aug 2014 16:35:30 +0200
Subject: [PATCH 080/277] Move Commandpipe/* classes from Icinga Web 2's
 library to the monitoring module

refs #6593
---
 .../monitoring/library/Monitoring/Command}/Command.php            | 0
 .../monitoring/library/Monitoring/Command}/CommandPipe.php        | 0
 .../monitoring/library/Monitoring/Command}/Comment.php            | 0
 .../Monitoring/Command}/Exception/InvalidCommandException.php     | 0
 .../monitoring/library/Monitoring/Command}/PropertyModifier.php   | 0
 .../library/Monitoring/Command}/Transport/LocalPipe.php           | 0
 .../library/Monitoring/Command}/Transport/SecureShell.php         | 0
 .../library/Monitoring/Command}/Transport/Transport.php           | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Command.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/CommandPipe.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Comment.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Exception/InvalidCommandException.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/PropertyModifier.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Transport/LocalPipe.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Transport/SecureShell.php (100%)
 rename {library/Icinga/Protocol/Commandpipe => modules/monitoring/library/Monitoring/Command}/Transport/Transport.php (100%)

diff --git a/library/Icinga/Protocol/Commandpipe/Command.php b/modules/monitoring/library/Monitoring/Command/Command.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Command.php
rename to modules/monitoring/library/Monitoring/Command/Command.php
diff --git a/library/Icinga/Protocol/Commandpipe/CommandPipe.php b/modules/monitoring/library/Monitoring/Command/CommandPipe.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/CommandPipe.php
rename to modules/monitoring/library/Monitoring/Command/CommandPipe.php
diff --git a/library/Icinga/Protocol/Commandpipe/Comment.php b/modules/monitoring/library/Monitoring/Command/Comment.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Comment.php
rename to modules/monitoring/library/Monitoring/Command/Comment.php
diff --git a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php b/modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
rename to modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
diff --git a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php b/modules/monitoring/library/Monitoring/Command/PropertyModifier.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/PropertyModifier.php
rename to modules/monitoring/library/Monitoring/Command/PropertyModifier.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php
rename to modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php b/modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php
rename to modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php b/modules/monitoring/library/Monitoring/Command/Transport/Transport.php
similarity index 100%
rename from library/Icinga/Protocol/Commandpipe/Transport/Transport.php
rename to modules/monitoring/library/Monitoring/Command/Transport/Transport.php

From 98b2bce15e40a26356e1c07d3aff710def579e7d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 10:09:29 +0200
Subject: [PATCH 081/277] Icinga\Web\Form::onSuccess() must not return TRUE

When using Icinga\Web\Form directly without creating a specific sub-class
and calling handleRequest() one must not get redirected.

refs #5525
---
 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 fdeb0cd8b..303abc711 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -229,7 +229,7 @@ class Form extends Zend_Form
     /**
      * Perform actions after this form was submitted using a valid request
      *
-     * Intended to be implemented by concrete form classes.
+     * Intended to be implemented by concrete form classes. The base implementation returns always FALSE.
      *
      * @param   Request     $request    The valid request used to process this form
      *
@@ -237,7 +237,7 @@ class Form extends Zend_Form
      */
     public function onSuccess(Request $request)
     {
-        return true;
+        return false;
     }
 
     /**

From 65dd3f9a5b971e8f0cbf5493f3297dda279bde64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 10:10:55 +0200
Subject: [PATCH 082/277] Make the form in view scripts accessible using $form
 instead of $element

refs #5525
---
 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 303abc711..b3ae5af46 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -479,7 +479,10 @@ class Form extends Zend_Form
         $decorators = $this->getDecorators();
         if (empty($decorators)) {
             if ($this->viewScript) {
-                $this->addDecorator('ViewScript', array('viewScript' => $this->viewScript));
+                $this->addDecorator('ViewScript', array(
+                    'viewScript'    => $this->viewScript,
+                    'form'          => $this
+                ));
             } else {
                 $this->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))

From d3c2fc858c71a0d31a239f27e32f0d2441abd9f0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 10:19:33 +0200
Subject: [PATCH 083/277] Access formdata internally using a public helper
 method

This way concrete form implementations can also simply fetch form
dependent request values without referring to the form's submission
method.

refs #5525
---
 library/Icinga/Web/Form.php | 44 ++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index b3ae5af46..93e66aa59 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -361,7 +361,7 @@ class Form extends Zend_Form
      *
      * @param   Request     $request    The request to be processed
      *
-     * @return  self
+     * @return  Request                 The request supposed to be processed
      */
     public function handleRequest(Request $request = null)
     {
@@ -369,26 +369,24 @@ class Form extends Zend_Form
             $request = $this->getRequest();
         }
 
-        if (strtolower($request->getMethod()) === $this->getMethod()) {
-            $formData = $request->{'get' . $request->isPost() ? 'Post' : 'Query'}();
-            if ($this->wasSent($formData)) {
-                $this->populate($formData); // Necessary to get isSubmitted() to work
-                if ($this->isSubmitted()) {
-                    if ($this->isValid($formData)) {
-                        if ($this->onSuccess($request)) {
-                            $this->getResponse()->redirectAndExit($this->getRedirectUrl());
-                        }
-                    } else {
-                        $this->onFailure($request);
+        $formData = $this->getRequestData($request);
+        if ($this->wasSent($formData)) {
+            $this->populate($formData); // Necessary to get isSubmitted() to work
+            if ($this->isSubmitted()) {
+                if ($this->isValid($formData)) {
+                    if ($this->onSuccess($request)) {
+                        $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                     }
                 } else {
-                    // The form can't be processed but we want to show validation errors though
-                    $this->isValidPartial($formData);
+                    $this->onFailure($request);
                 }
+            } else {
+                // The form can't be processed but we want to show validation errors though
+                $this->isValidPartial($formData);
             }
         }
 
-        return $this;
+        return $request;
     }
 
     /**
@@ -509,6 +507,22 @@ class Form extends Zend_Form
         return $name;
     }
 
+    /**
+     * Return the request data based on this form's request method
+     *
+     * @param   Request     $request    The request to fetch the data from
+     *
+     * @return  array
+     */
+    public function getRequestData(Request $request)
+    {
+        if (strtolower($request->getMethod()) === $this->getMethod()) {
+            return $request->{'get' . ($request->isPost() ? 'Post' : 'Query')}();
+        }
+
+        return array();
+    }
+
     /**
      * Return the current request
      *

From 0ff79b094868a5266b5584b45e79955d22dd5ee7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 10:25:50 +0200
Subject: [PATCH 084/277] Replace Form::onFailure() with Form::onShow()

There is currently no usecase for onFailure() but for onShow() wherewith
the case is covered when a form needs to be prepared before showing it
to the user while the form was not submitted in any way.

refs #5525
---
 library/Icinga/Web/Form.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 93e66aa59..d65db4780 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -241,13 +241,13 @@ class Form extends Zend_Form
     }
 
     /**
-     * Perform actions after this form was submitted using an invalid request
+     * Perform actions when no form dependent data was sent
      *
      * Intended to be implemented by concrete form classes.
      *
-     * @param   Request     $request    The invalid request supposed to process this form
+     * @param   Request     $request    The current request
      */
-    public function onFailure(Request $request)
+    public function onShow(Request $request)
     {
 
     }
@@ -357,7 +357,8 @@ class Form extends Zend_Form
     /**
      * Process the given request using this form
      *
-     * Redirects to the url set with setRedirectUrl() upon success.
+     * Redirects to the url set with setRedirectUrl() upon success. See onSuccess()
+     * and onShow() wherewith you can customize the processing logic.
      *
      * @param   Request     $request    The request to be processed
      *
@@ -373,17 +374,15 @@ class Form extends Zend_Form
         if ($this->wasSent($formData)) {
             $this->populate($formData); // Necessary to get isSubmitted() to work
             if ($this->isSubmitted()) {
-                if ($this->isValid($formData)) {
-                    if ($this->onSuccess($request)) {
-                        $this->getResponse()->redirectAndExit($this->getRedirectUrl());
-                    }
-                } else {
-                    $this->onFailure($request);
+                if ($this->isValid($formData) && $this->onSuccess($request)) {
+                    $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                 }
             } else {
                 // The form can't be processed but we want to show validation errors though
                 $this->isValidPartial($formData);
             }
+        } else {
+            $this->onShow($request);
         }
 
         return $request;

From 6783d51f769f57539f10f555902b232f0b81b5cf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 10:28:50 +0200
Subject: [PATCH 085/277] A form is "submitted" when it was "sent" but no
 submit label was set

This enables us to use handleRequest() as is when no specific submit button
is required.

refs #5525
---
 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 d65db4780..90733c13b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -373,7 +373,7 @@ class Form extends Zend_Form
         $formData = $this->getRequestData($request);
         if ($this->wasSent($formData)) {
             $this->populate($formData); // Necessary to get isSubmitted() to work
-            if ($this->isSubmitted()) {
+            if ($this->isSubmitted() || ! $this->getSubmitLabel()) {
                 if ($this->isValid($formData) && $this->onSuccess($request)) {
                     $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                 }

From e1329058db1bf0dd2554b79e67b5fb0ea72dd441 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 Aug 2014 13:14:40 +0200
Subject: [PATCH 086/277] Do not hard code the name of the form identification
 element

Like the csrf element name the form identification element name should
be publicly accessible as well.

refs #5525
---
 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 90733c13b..eb8fd7386 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -60,6 +60,13 @@ class Form extends Zend_Form
      */
     protected $tokenElementName = 'CSRFToken';
 
+    /**
+     * Name of the form identification element
+     *
+     * @var string
+     */
+    protected $uidElementName = 'formUID';
+
     /**
      * Set the label to use for the standard submit button
      *
@@ -185,6 +192,29 @@ class Form extends Zend_Form
         return $this->tokenElementName;
     }
 
+    /**
+     * Set the name to use for the form identification element
+     *
+     * @param   string  $name   The name to set
+     *
+     * @return  self
+     */
+    public function setUidElementName($name)
+    {
+        $this->uidElementName = $name;
+        return $this;
+    }
+
+    /**
+     * Return the name of the form identification element
+     *
+     * @return  string
+     */
+    public function getUidElementName()
+    {
+        return $this->uidElementName;
+    }
+
     /**
      * Create this form
      *
@@ -317,7 +347,7 @@ class Form extends Zend_Form
     {
         $this->addElement(
             'hidden',
-            'form_uid',
+            $this->uidElementName,
             array(
                 'ignore'    => true,
                 'value'     => $this->getName()
@@ -416,7 +446,7 @@ class Form extends Zend_Form
      */
     public function wasSent(array $formData)
     {
-        return isset($formData['form_uid']) && $formData['form_uid'] === $this->getName();
+        return isset($formData[$this->uidElementName]) && $formData[$this->uidElementName] === $this->getName();
     }
 
     /**

From 486104d59eb9a82b9fab819f58fee4ce2f78b76a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 09:04:20 +0200
Subject: [PATCH 087/277] Check explictly for FALSE when calling onSuccess()

This allows us to just end onSuccess() without requiring it to return TRUE
to initiate redirection.

refs #5525
---
 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 eb8fd7386..b2361701f 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -263,7 +263,7 @@ class Form extends Zend_Form
      *
      * @param   Request     $request    The valid request used to process this form
      *
-     * @return  bool                    Whether any redirection should take place
+     * @return  null|bool               Return FALSE in case no redirect should take place
      */
     public function onSuccess(Request $request)
     {
@@ -403,8 +403,8 @@ class Form extends Zend_Form
         $formData = $this->getRequestData($request);
         if ($this->wasSent($formData)) {
             $this->populate($formData); // Necessary to get isSubmitted() to work
-            if ($this->isSubmitted() || ! $this->getSubmitLabel()) {
-                if ($this->isValid($formData) && $this->onSuccess($request)) {
+            if (! $this->getSubmitLabel() || $this->isSubmitted()) {
+                if ($this->isValid($formData) && false !== $this->onSuccess($request)) {
                     $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                 }
             } else {

From bf23688e735ccf95e90403f0c9133f773038cba5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 09:08:53 +0200
Subject: [PATCH 088/277] Make autosubmit work in non-JS enviroments

We require forms to set autosubmit=true on elements which are supposed
to be submitted automatically now. The base form then ensures that this
works in JS environments and non-JS environments as well by applying the
right changes to the HTML.

refs #5525
---
 library/Icinga/Web/Form.php                   |  9 +++++
 .../Web/Form/Decorator/NoScriptApply.php      | 35 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 library/Icinga/Web/Form/Decorator/NoScriptApply.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index b2361701f..1e9ab786e 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,6 +8,7 @@ use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
 use Icinga\Web\Form\Decorator\HelpText;
+use Icinga\Web\Form\Decorator\NoScriptApply;
 use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
@@ -330,6 +331,14 @@ class Form extends Zend_Form
                 $el->removeDecorator('HtmlTag');
                 $el->removeDecorator('Label');
                 $el->removeDecorator('DtDdWrapper');
+
+                if ($el->getAttrib('autosubmit')) {
+                    // Need to add this decorator first or it interferes with the other's two HTML otherwise
+                    $el->addDecorator(new NoScriptApply()); // Non-JS environments
+                    $el->setAttrib('class', 'autosubmit'); // JS environments
+                    unset($el->autosubmit);
+                }
+
                 $el->addDecorator(new ElementWrapper());
                 $el->addDecorator(new HelpText());
             }
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
new file mode 100644
index 000000000..509c3531e
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -0,0 +1,35 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+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;
+    }
+}

From 79b0ed64ece96b78f402ebd0993993825e2bb544 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 12:21:31 +0200
Subject: [PATCH 089/277] Make it possible to provide a closure to be called
 instead of onSuccess()

This allows us to write generic forms like the ConfirmRemoval form but to
utilize handleRequest() while providing a closure in the array that is passed
to a form's constructor.

refs #5525
---
 library/Icinga/Web/Form.php | 39 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1e9ab786e..f47a42d9a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Web;
 
+use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
@@ -24,6 +25,13 @@ class Form extends Zend_Form
      */
     protected $created = false;
 
+    /**
+     * The callback to call instead of Form::onSuccess()
+     *
+     * @var Closure
+     */
+    protected $onSuccess;
+
     /**
      * Label to use for the standard submit button
      *
@@ -68,6 +76,33 @@ class Form extends Zend_Form
      */
     protected $uidElementName = 'formUID';
 
+    /**
+     * Create a new form
+     *
+     * Accepts an additional option `onSuccess' which is a
+     * callback that is called instead of this form's method.
+     *
+     * @see Zend_Form::__construct()
+     *
+     * @throws  LogicException      In case `onSuccess' is not callable
+     */
+    public function __construct($options = null)
+    {
+        if (is_array($options) && isset($options['onSuccess'])) {
+            $this->onSuccess = $options['onSuccess'];
+            unset($options['onSuccess']);
+        } elseif (isset($options->onSuccess)) {
+            $this->onSuccess = $options->onSuccess;
+            unset($options->onSuccess);
+        }
+
+        if ($this->onSuccess !== null && false === is_callable($this->onSuccess)) {
+            throw new LogicException('The option `onSuccess\' is not callable');
+        }
+
+        parent::__construct($options);
+    }
+
     /**
      * Set the label to use for the standard submit button
      *
@@ -413,7 +448,9 @@ class Form extends Zend_Form
         if ($this->wasSent($formData)) {
             $this->populate($formData); // Necessary to get isSubmitted() to work
             if (! $this->getSubmitLabel() || $this->isSubmitted()) {
-                if ($this->isValid($formData) && false !== $this->onSuccess($request)) {
+                if ($this->isValid($formData)
+                    && (($this->onSuccess !== null && false !== call_user_func($this->onSuccess, $request))
+                        || ($this->onSuccess === null && false !== $this->onSuccess($request)))) {
                     $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                 }
             } else {

From e020dd354107b75e21b4d1dac84c9989411b40c1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 12:23:48 +0200
Subject: [PATCH 090/277] Icinga\App..\Config: Rename __construct to fromIni
 and add setConfigPath

Prior to this change it was not possible to create an instance of Config
without passing a config file.
---
 library/Icinga/Application/Config.php | 51 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index e81e8062f..c06c6212b 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -7,7 +7,6 @@ namespace Icinga\Application;
 use Zend_Config;
 use Zend_Config_Ini;
 use Icinga\Exception\NotReadableError;
-use Icinga\Exception\ProgrammingError;
 
 /**
  * Global registry of application and module configuration.
@@ -22,11 +21,11 @@ class Config extends Zend_Config
     public static $configDir;
 
     /**
-     * The INI file this configuration has been loaded from
+     * The INI file this configuration has been loaded from or should be written to
      *
      * @var string
      */
-    private $configFile;
+    protected $configFile;
 
     /**
      * Application config instances per file
@@ -42,27 +41,28 @@ class Config extends Zend_Config
      */
     protected static $modules = array();
 
-    private $instance;
-
     /**
-     * Load configuration from the config file $filename
+     * Load configuration from the given INI file
+     *
+     * @param   string      $file   The file to parse
      *
-     * @param   string $filename    The filename to parse
-
      * @throws  NotReadableError    When the file does not exist or cannot be read
      */
-    public function __construct($filename)
+    public static function fromIni($file)
     {
-        parent::__construct(array(), true);
-        $filepath = realpath($filename);
+        $config = new static(array(), true);
+        $filepath = realpath($file);
+
         if ($filepath === false) {
-            $this->configFile = $filename;
+            $config->setConfigFile($file);
         } elseif (is_readable($filepath)) {
-            $this->configFile = $filepath;
-            $this->merge(new Zend_Config_Ini($filepath));
+            $config->setConfigFile($filepath);
+            $config->merge(new Zend_Config_Ini($filepath));
         } else {
-            throw new NotReadableError('Cannot read config file "' . $filename . '". Permission denied');
+            throw new NotReadableError('Cannot read config file "' . $filepath . '". Permission denied');
         }
+
+        return $config;
     }
 
     /**
@@ -77,7 +77,7 @@ class Config extends Zend_Config
     public static function app($configname = 'config', $fromDisk = false)
     {
         if (!isset(self::$app[$configname]) || $fromDisk) {
-            self::$app[$configname] = new Config(self::resolvePath($configname . '.ini'));
+            self::$app[$configname] = Config::fromIni(self::resolvePath($configname . '.ini'));
         }
         return self::$app[$configname];
     }
@@ -98,7 +98,7 @@ class Config extends Zend_Config
         }
         $moduleConfigs = self::$modules[$modulename];
         if (!isset($moduleConfigs[$configname]) || $fromDisk) {
-            $moduleConfigs[$configname] = new Config(
+            $moduleConfigs[$configname] = Config::fromIni(
                 self::resolvePath('modules/' . $modulename . '/' . $configname . '.ini')
             );
         }
@@ -123,15 +123,28 @@ class Config extends Zend_Config
     }
 
     /**
-     * Return the application wide config file
+     * Return this config's file path
      *
-     * @return string
+     * @return  string
      */
     public function getConfigFile()
     {
         return $this->configFile;
     }
 
+    /**
+     * Set this config's file path
+     *
+     * @param   string      $filepath   The path to the config file
+     *
+     * @return  self
+     */
+    public function setConfigFile($filepath)
+    {
+        $this->configFile = $filepath;
+        return $this;
+    }
+
     /**
      * Prepend configuration base dir if input is relative
      *

From 364c7c0858bcbf0094a9940c49f3bc6edbda595c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 12:25:25 +0200
Subject: [PATCH 091/277] Add base form class for configuration forms

refs #5525
---
 application/forms/ConfigForm.php              | 67 +++++++++++++++++++
 .../views/scripts/showConfiguration.phtml     | 28 ++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 application/forms/ConfigForm.php
 create mode 100644 application/views/scripts/showConfiguration.phtml

diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
new file mode 100644
index 000000000..1f3692473
--- /dev/null
+++ b/application/forms/ConfigForm.php
@@ -0,0 +1,67 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form;
+
+use Exception;
+use Icinga\Web\Form;
+use Icinga\Application\Config;
+use Icinga\Config\PreservingIniWriter;
+
+/**
+ * Form base-class providing standard functionality for configuration forms
+ */
+class ConfigForm extends Form
+{
+    /**
+     * The configuration to work with
+     *
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * Set the configuration to use when populating the form or when saving the user's input
+     *
+     * @param   Config      $config     The configuration to use
+     *
+     * @return  self
+     */
+    public function setConfig(Config $config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
+    /**
+     * Persist the current configuration to disk
+     *
+     * If an error occurs the user is shown a view describing the issue and displaying the raw INI configuration.
+     *
+     * @return  bool                    Whether the configuration could be persisted
+     */
+    public function save()
+    {
+        $writer = new PreservingIniWriter(
+            array(
+                'config'    => $this->config,
+                'filename'  => $this->config->getConfigFile()
+            )
+        );
+
+        try {
+            $writer->write();
+        } catch (Exception $e) {
+            $this->addDecorator('ViewScript', array(
+                'viewScript'    => 'showConfiguration.phtml',
+                'errorMessage'  => $e->getMessage(),
+                'configString'  => $writer->render(),
+                'filePath'      => $this->config->getConfigFile()
+            ));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/application/views/scripts/showConfiguration.phtml b/application/views/scripts/showConfiguration.phtml
new file mode 100644
index 000000000..1dde3b16b
--- /dev/null
+++ b/application/views/scripts/showConfiguration.phtml
@@ -0,0 +1,28 @@
+<div>
+  <h4><?= $this->translate('Saving Configuration Failed'); ?></h4>
+  <br>
+  <p>
+    <?= sprintf(
+      $this->translate('The file %s couldn\'t be stored. (Error: "%s")'),
+      $this->escape($filePath),
+      $this->escape($errorMessage)
+    ); ?>
+    <br>
+    <?= $this->translate('This could have one or more of the following reasons:'); ?>
+  </p>
+  <ul>
+    <li><?= $this->translate('You don\'t have file-system permissions to write to the file'); ?></li>
+    <li><?= $this->translate('Something went wrong while writing the file'); ?></li>
+    <li><?= $this->translate('There\'s an application error preventing you from persisting the configuration'); ?></li>
+  </ul>
+</div>
+<p>
+  <?= $this->translate('Details can be found in the application log. (If you don\'t have access to this log, call your administrator in this case)'); ?>
+  <br>
+  <?= $this->translate('In case you can access the file by yourself, you can open it and insert the config manually:'); ?>
+</p>
+<p>
+  <pre>
+    <code><?= $this->escape($configString); ?></code>
+  </pre>
+</p>
\ No newline at end of file

From 0e2e1bc0056ea5f1b59597312b0f1eeeb0cfd6fa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 14:34:16 +0200
Subject: [PATCH 092/277] monitoring/commands: Add `CommandTransportInterface'

All concrete Icinga command transport classes should implement the `CommandTransportInterface' .

refs #6593
---
 .../Transport/CommandTransportInterface.php   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
new file mode 100644
index 000000000..bb0da2716
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Transport;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
+/**
+ * Interface for Icinga command transports
+ */
+interface CommandTransportInterface
+{
+    /**
+     * Send the command
+     *
+     * @param   IcingaCommand $command
+     *
+     * @throws  \Icinga\Module\Monitoring\Command\Exception\TransportException
+     */
+    public function send(IcingaCommand $command);
+}

From e7eae87f16f8838f0b4cf44a6986d1c159892d68 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 14:38:52 +0200
Subject: [PATCH 093/277] monitoring/commands: Replace `Command' with
 `IcingaCommand'

Since there's already a `Cli\Command', `Command' is now named `IcingaCommand'.
All concrete Icinga commands should extend `IcingaCommand' which handles
command encoding. All other "features" of the `Command' object have been removed
because theses "features" should be handled by upcoming concrete command classes.

refs #6593
---
 .../library/Monitoring/Command/Command.php    | 177 ------------------
 .../Monitoring/Command/IcingaCommand.php      |  44 +++++
 2 files changed, 44 insertions(+), 177 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Command.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/IcingaCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Command.php b/modules/monitoring/library/Monitoring/Command/Command.php
deleted file mode 100644
index e89169f35..000000000
--- a/modules/monitoring/library/Monitoring/Command/Command.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe;
-
-use Icinga\Exception\ProgrammingError;
-
-/**
- * Base class for any concrete command implementation
- */
-abstract class Command
-{
-    /**
-     * Whether hosts are ignored in case of a host- or servicegroup
-     *
-     * @var bool
-     */
-    protected $withoutHosts = false;
-
-    /**
-     * Whether services are ignored in case of a host- or servicegroup
-     *
-     * @var bool
-     */
-    protected $withoutServices = false;
-
-    /**
-     * Whether child hosts are going to be included in case of a host command
-     *
-     * @var bool
-     */
-    protected $withChildren = false;
-
-    /**
-     * Whether only services are going to be included in case of a host command
-     *
-     * @var bool
-     */
-    protected $onlyServices = false;
-
-    /**
-     * Whether it is a global command or not
-     *
-     * @var bool
-     */
-    protected $globalCommand = false;
-
-    /**
-     * Set whether this command should only affect the services of a host- or servicegroup
-     *
-     * @param   bool    $state
-     * @return  self
-     */
-    public function excludeHosts($state = true)
-    {
-        $this->withoutHosts = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set whether this command should only affect the hosts of a host- or servicegroup
-     *
-     * @param   bool    $state
-     * @return  self
-     */
-    public function excludeServices($state = true)
-    {
-        $this->withoutServices = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set whether this command should also affect all children hosts of a host
-     *
-     * @param   bool    $state
-     * @return  self
-     */
-    public function includeChildren($state = true)
-    {
-        $this->withChildren = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set whether this command only affects the services associated with a particular host
-     *
-     * @param   bool    $state
-     * @return  self
-     */
-    public function excludeHost($state = true)
-    {
-        $this->onlyServices = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Getter for flag whether a command is global
-     * @return bool
-     */
-    public function provideGlobalCommand()
-    {
-        return (bool) $this->globalCommand;
-    }
-
-    /**
-     * Return this command's arguments in the order expected by the actual command definition
-     *
-     * @return array
-     */
-    abstract public function getArguments();
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     */
-    abstract public function getHostCommand($hostname);
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    abstract public function getServiceCommand($hostname, $servicename);
-
-    /**
-     * Return the command as a string with the given hostgroup being inserted
-     *
-     * @param   string  $hostgroup  The name of the hostgroup to insert
-     *
-     * @return  string              The string representation of the command
-     */
-    public function getHostgroupCommand($hostgroup)
-    {
-        throw new ProgrammingError(
-            '%s does not provide a hostgroup command',
-            get_class($this)
-        );
-    }
-
-    /**
-     * Return the command as a string with the given servicegroup being inserted
-     *
-     * @param   string  $servicegroup   The name of the servicegroup to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getServicegroupCommand($servicegroup)
-    {
-        throw new ProgrammingError(
-            '%s does not provide a servicegroup command',
-            get_class($this)
-        );
-    }
-
-    /**
-     * Return the command as a string for the whole instance
-     *
-     * @param   string $instance
-     *
-     * @return  string
-     * @throws  ProgrammingError
-     */
-    public function getGlobalCommand($instance = null)
-    {
-        throw new ProgrammingError(
-            '%s does not provide a global command',
-            getclass($this)
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
new file mode 100644
index 000000000..dd8dd97fe
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -0,0 +1,44 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command;
+
+/**
+ * Base class for commands sent to an Icinga instance
+ */
+abstract class IcingaCommand
+{
+    /**
+     * Get the command string
+     *
+     * @return string
+     */
+    abstract public function getCommandString();
+
+    /**
+     * Escape a command string
+     *
+     * @param   string $commandString
+     *
+     * @return  string
+     */
+    public function escape($commandString)
+    {
+        return str_replace(array("\r", "\n"), array('\r', '\n'), $commandString);
+    }
+
+    /**
+     * Get the command as string with the current timestamp as the command submission time
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return sprintf(
+            '[%u] %s',
+            time(),
+            $this->escape($this->getCommandString())
+        );
+    }
+}

From 2ac4a8503c5dd3e1f0815c1d5a7fefc6d0ae2059 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 14:43:44 +0200
Subject: [PATCH 094/277] monitoring/commands: Remove the `Transport' interface

The `Transport' interface is superseded by the `CommandTransportInterface'.

refs #6593
---
 .../Command/Transport/Transport.php           | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Transport/Transport.php

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/Transport.php b/modules/monitoring/library/Monitoring/Command/Transport/Transport.php
deleted file mode 100644
index c5a5b3883..000000000
--- a/modules/monitoring/library/Monitoring/Command/Transport/Transport.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe\Transport;
-
-use \Zend_Config;
-
-/**
- * Interface for Transport classes handling the concrete access to the command pipe
- */
-interface Transport
-{
-    /**
-     * Overwrite the target file of this Transport class using the given config from instances.ini
-     *
-     * @param Zend_Config $config A configuration file containing a 'path' setting
-     */
-    public function setEndpoint(Zend_Config $config);
-
-    /**
-     * Write the given external command to the command pipe
-     *
-     * @param string $message The command to send, without the timestamp (this will be added here)
-     */
-    public function send($message);
-}

From ec46b368dffdae9561dc2ad50bd63555cf9fc283 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:04:48 +0200
Subject: [PATCH 095/277] monitoring/commands: Replace `LocalPipe' with
 `LocalCommandFile'

`LocalCommandFile' is configured via property setters instead of the too general `setEndpoint' function.

refs #6593
---
 .../Command/Transport/LocalCommandFile.php    | 115 ++++++++++++++++++
 .../Command/Transport/LocalPipe.php           |  70 -----------
 2 files changed, 115 insertions(+), 70 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
new file mode 100644
index 000000000..8278b79b0
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -0,0 +1,115 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Transport;
+
+use Exception;
+use LogicException;
+use Icinga\Logger\Logger;
+use Icinga\Module\Monitoring\Command\Exception\TransportException;
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\Util\File;
+
+/**
+ * A local Icinga command file
+ */
+class LocalCommandFile implements CommandTransportInterface
+{
+    /**
+     * Path to the icinga command file
+     *
+     * @var String
+     */
+    protected $path;
+
+    /**
+     * Mode used to open the icinga command file
+     *
+     * @var string
+     */
+    protected $openMode = 'wn';
+
+    /**
+     * Set the path to the local Icinga command file
+     *
+     * @param   string $path
+     *
+     * @return  self
+     */
+    public function setPath($path)
+    {
+        $this->path = (string) $path;
+        return $this;
+    }
+
+    /**
+     * Get the path to the local Icinga command file
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Set the mode used to open the icinga command file
+     *
+     * @param   string $openMode
+     *
+     * @return  self
+     */
+    public function setOpenMode($openMode)
+    {
+        $this->openMode = (string) $openMode;
+        return $this;
+    }
+
+    /**
+     * Get the mode used to open the icinga command file
+     *
+     * @return string
+     */
+    public function getOpenMode()
+    {
+        return $this->openMode;
+    }
+
+    /**
+     * Write the command to the local Icinga command file
+     *
+     * @param   IcingaCommand $command
+     *
+     * @throws  LogicException
+     * @throws  TransportException
+     */
+    public function send(IcingaCommand $command)
+    {
+        if (! isset($this->path)) {
+            throw new LogicException;
+        }
+        Logger::debug(
+            sprintf(
+                mt('monitoring', 'Sending external Icinga command "%s" to the local command file "%s"'),
+                $command,
+                $this->path
+            )
+        );
+        try {
+            $file = new File($this->path, $this->openMode);
+            $file->fwrite($command . "\n");
+            $file->fflush();
+        } catch (Exception $e) {
+            throw new TransportException(
+                mt(
+                    'monitoring',
+                    'Can\'t send external Icinga command "%s" to the local command file "%s": %s'
+                ),
+                $command,
+                $this->path,
+                $e
+            );
+        }
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
deleted file mode 100644
index 32f745565..000000000
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalPipe.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe\Transport;
-
-use Exception;
-use Icinga\Util\File;
-use Icinga\Logger\Logger;
-use Icinga\Exception\ConfigurationError;
-
-/**
- * CommandPipe Transport class that writes to a file accessible by the filesystem
- */
-class LocalPipe implements Transport
-{
-    /**
-     * The path of the icinga commandpipe
-     *
-     * @var String
-     */
-    private $path;
-
-    /**
-     * The mode to use to access the pipe
-     *
-     * @var string
-     */
-    private $openMode = "wn";
-
-    /**
-     * @see Transport::setEndpoint()
-     */
-    public function setEndpoint(\Zend_Config $config)
-    {
-        $this->path = isset($config->path) ? $config->path : '/usr/local/icinga/var/rw/icinga.cmd';
-    }
-
-    /**
-     *  @see Transport::send()
-     */
-    public function send($message)
-    {
-        Logger::debug('Attempting to send external icinga command %s to local command file ', $message, $this->path);
-
-        try {
-            $file = new File($this->path, $this->openMode);
-            $file->fwrite('[' . time() . '] ' . $message . PHP_EOL);
-            $file->fflush();
-        } catch (Exception $e) {
-            throw new ConfigurationError(
-                'Could not open icinga command pipe at "%s" (%s)',
-                $this->path,
-                $e->getMessage()
-            );
-        }
-
-        Logger::debug('Command sent: [' . time() . '] ' . $message . PHP_EOL);
-    }
-
-    /**
-     * Overwrite the open mode (useful for testing)
-     *
-     * @param   string  $mode   The mode to use to access the pipe
-     */
-    public function setOpenMode($mode)
-    {
-        $this->openMode = $mode;
-    }
-}

From 249099348e87d966e9d1c4dd39ebb19b216c7dac Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:08:58 +0200
Subject: [PATCH 096/277] monitoring/commands: Replace `SecureShell' with
 `RemoteCommandFile'

`RemoteCommandFile' is configured via property setters instead of the too general `setEndpoint' function.
The ssh command to be executed only has the option 'BatchMode' set to 'yes' as this is enough to disable
interactive authentication methods. Further, all arguments become espaced.

refs #6593
---
 .../Command/Transport/RemoteCommandFile.php   | 188 ++++++++++++++++++
 .../Command/Transport/SecureShell.php         | 102 ----------
 2 files changed, 188 insertions(+), 102 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
new file mode 100644
index 000000000..fe1ae92c2
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -0,0 +1,188 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Transport;
+
+use LogicException;
+use Icinga\Logger\Logger;
+use Icinga\Module\Monitoring\Command\Exception\TransportException;
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
+/**
+ * A remote Icinga command file
+ *
+ * Key-based SSH login must be possible for the user to log in as on the remote host
+ */
+class RemoteCommandFile implements CommandTransportInterface
+{
+    /**
+     * Remote host
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Port to connect to on the remote host
+     *
+     * @var int
+     */
+    protected $port = 22;
+
+    /**
+     * User to log in as on the remote host
+     *
+     * Defaults to current PHP process' user
+     *
+     * @var string
+     */
+    protected $user;
+
+    /**
+     * Path to the Icinga command file on the remote host
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Set the remote host
+     *
+     * @param   string $host
+     *
+     * @return  self
+     */
+    public function setHost($host)
+    {
+        $this->host = (string) $host;
+        return $this;
+    }
+
+    /**
+     * Get the remote host
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Set the port to connect to on the remote host
+     *
+     * @param   int $port
+     *
+     * @return  self
+     */
+    public function setPort($port)
+    {
+        $this->port = (int) $port;
+        return $this;
+    }
+
+    /**
+     * Get the port to connect on the remote host
+     *
+     * @return int
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Set the user to log in as on the remote host
+     *
+     * @param   string $user
+     *
+     * @return  self
+     */
+    public function setUser($user)
+    {
+        $this->user = (string) $user;
+        return $this;
+    }
+
+    /**
+     * Get the user to log in as on the remote host
+     *
+     * Defaults to current PHP process' user
+     *
+     * @return string|null
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * Set the path to the Icinga command file on the remote host
+     *
+     * @param   string $path
+     *
+     * @return  self
+     */
+    public function setPath($path)
+    {
+        $this->path = (string) $path;
+        return $this;
+    }
+
+    /**
+     * Get the path to the Icinga command file on the remote host
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Write the command to the Icinga command file on the remote host
+     *
+     * @param   IcingaCommand $command
+     *
+     * @throws  LogicException
+     * @throws  TransportException
+     */
+    public function send(IcingaCommand $command)
+    {
+        if (! isset($this->path)) {
+            throw new LogicException;
+        }
+        Logger::debug(
+            sprintf(
+                mt('monitoring', 'Sending external Icinga command "%s" to the remote command file "%s:%u%s"'),
+                $command,
+                $this->host,
+                $this->port,
+                $this->path
+            )
+        );
+        $ssh = sprintf('ssh -o BatchMode=yes -p %u', $this->port);  // -o BatchMode=yes for disabling interactive
+                                                                    // authentication methods
+        if (isset($this->user)) {
+            $ssh .= sprintf(' -l %s', escapeshellarg($this->user));
+        }
+        $ssh .= sprintf(
+            ' %s "echo %s > %s" 2>&1',  // Redirect stderr to stdout
+            escapeshellarg($this->host),
+            escapeshellarg($command),
+            escapeshellarg($this->path)
+        );
+        exec($ssh, $output, $status);
+        if ($status !== 0) {
+            throw new TransportException(
+                mt(
+                    'monitoring',
+                    'Can\'t send external Icinga command "%s": %s'
+                ),
+                $ssh,
+                implode(' ', $output)
+            );
+        }
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php b/modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
deleted file mode 100644
index f1505c2ef..000000000
--- a/modules/monitoring/library/Monitoring/Command/Transport/SecureShell.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe\Transport;
-
-use RuntimeException;
-use Zend_Config;
-use Icinga\Logger\Logger;
-
-/**
- * Command pipe transport class that uses ssh for connecting to a remote filesystem with the icinga.cmd pipe
- *
- * The remote host must have KeyAuth enabled for this user
- */
-class SecureShell implements Transport
-{
-    /**
-     * The remote host to connect to
-     *
-     * @var string
-     */
-    private $host = 'localhost';
-
-    /**
-     * The location of the icinga pipe on the remote host
-     *
-     * @var string
-     */
-    private $path = "/usr/local/icinga/var/rw/icinga.cmd";
-
-    /**
-     * The SSH port of the remote host
-     *
-     * @var int
-     */
-    private $port = 22;
-
-    /**
-     * The user to authenticate with on the remote host
-     *
-     * @var String
-     */
-    private $user = null;
-
-    /**
-     * Overwrite the target file of this Transport class using the given config from instances.ini
-     *
-     * @param   Zend_Config $config
-     *
-     * @see     Transport::setEndpoint()
-     */
-    public function setEndpoint(Zend_Config $config)
-    {
-        $this->host = isset($config->host) ? $config->host : 'localhost';
-        $this->port = isset($config->port) ? $config->port : 22;
-        $this->user = isset($config->user) ? $config->user : null;
-        $this->path = isset($config->path) ? $config->path : '/usr/local/icinga/var/rw/icinga.cmd';
-    }
-
-    /**
-     * Write the given external command to the command pipe
-     *
-     * @param   string $command
-     *
-     * @throws  RuntimeException When the command could not be sent to the remote Icinga host
-     * @see     Transport::send()
-     */
-    public function send($command)
-    {
-        $retCode = 0;
-        $output = array();
-        Logger::debug(
-            'Icinga instance is on different host, attempting to send command %s via ssh to %s:%s/%s',
-            $command,
-            $this->host,
-            $this->port,
-            $this->path
-        );
-        $hostConnector = $this->user ? $this->user . "@" . $this->host : $this->host;
-        $command = escapeshellarg('['. time() .'] ' . $command);
-        $sshCommand = sprintf(
-            'ssh -o BatchMode=yes -o KbdInteractiveAuthentication=no %s -p %d'
-          . ' "echo %s > %s" 2>&1',
-            $hostConnector,
-            $this->port,
-            $command,
-            $this->path
-        );
-
-        exec($sshCommand, $output, $retCode);
-        Logger::debug("Command '%s' exited with %d: %s", $sshCommand, $retCode, $output);
-
-        if ($retCode != 0) {
-            $msg =  'Could not send command to remote Icinga host: '
-                . implode(PHP_EOL, $output)
-                . " (returncode $retCode)";
-            Logger::error($msg);
-            throw new RuntimeException($msg);
-        }
-    }
-}

From 6fdc436f653984ec61031268038e7563cc164dae Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:14:53 +0200
Subject: [PATCH 097/277] monitoring/commands: Add `TransportException'

`TransportException' should be thrown if a command was not sent.

refs #6593
---
 .../Command/Exception/TransportException.php         | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Exception/TransportException.php

diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
new file mode 100644
index 000000000..db06e67ba
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -0,0 +1,12 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Exception;
+
+use Icinga\Exception\IcingaException;
+
+/**
+ * Exception thrown if a command was not sent
+ */
+class TransportException extends IcingaException {}

From ae35650c7e516b2005f7bf2a6df269306eedff2e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 Aug 2014 15:16:13 +0200
Subject: [PATCH 098/277] Adjust authentication backend forms to suit.. some
 form implementation

refs #5525
---
 application/controllers/ConfigController.php  | 233 +++----------
 .../Authentication/AutologinBackendForm.php   |  18 +-
 .../Config/Authentication/BaseBackendForm.php |  94 ------
 .../Config/Authentication/DbBackendForm.php   |  76 +++--
 .../Config/Authentication/LdapBackendForm.php |  87 ++---
 .../AuthenticationBackendConfigForm.php       | 318 ++++++++++++++++++
 .../AuthenticationBackendReorderForm.php      |  68 ++++
 .../views/scripts/config/authentication.phtml |  57 ----
 .../config/authentication/create.phtml        |  18 +-
 .../config/authentication/modify.phtml        |  10 +-
 .../config/authentication/remove.phtml        |  10 +-
 .../config/authentication/reorder.phtml       |  11 +
 .../scripts/form/reorder-authbackend.phtml    |  40 +++
 13 files changed, 591 insertions(+), 449 deletions(-)
 delete mode 100644 application/forms/Config/Authentication/BaseBackendForm.php
 create mode 100644 application/forms/Config/AuthenticationBackendConfigForm.php
 create mode 100644 application/forms/Config/AuthenticationBackendReorderForm.php
 delete mode 100644 application/views/scripts/config/authentication.phtml
 create mode 100644 application/views/scripts/config/authentication/reorder.phtml
 create mode 100644 application/views/scripts/form/reorder-authbackend.phtml

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 423a59902..f5da2952a 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -6,19 +6,16 @@ use Icinga\Web\Controller\BaseConfigController;
 use Icinga\Web\Widget\AlertMessageBox;
 use Icinga\Web\Notification;
 use Icinga\Application\Modules\Module;
-use Icinga\Web\Form;
 use Icinga\Web\Widget;
 use Icinga\Application\Icinga;
 use Icinga\Application\Config as IcingaConfig;
 use Icinga\Form\Config\GeneralForm;
-use Icinga\Form\Config\Authentication\LdapBackendForm;
-use Icinga\Form\Config\Authentication\DbBackendForm;
-use Icinga\Form\Config\Authentication\AutologinBackendForm;
+use Icinga\Form\Config\AuthenticationBackendReorderForm;
+use Icinga\Form\Config\AuthenticationBackendConfigForm;
 use Icinga\Form\Config\ResourceForm;
-use Icinga\Form\Config\LoggingForm;
 use Icinga\Form\Config\ConfirmRemovalForm;
 use Icinga\Config\PreservingIniWriter;
-use Icinga\Exception\ConfigurationError;
+use Icinga\Data\ResourceFactory;
 
 
 /**
@@ -142,47 +139,17 @@ class ConfigController extends BaseConfigController
     }
 
     /**
-     * Action for reordering authentication backends
+     * Action for listing and reordering authentication backends
      */
     public function authenticationAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
+        $form = new AuthenticationBackendReorderForm();
+        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->handleRequest();
+
+        $this->view->form = $form;
         $this->view->tabs->activate('authentication');
-
-        $config = IcingaConfig::app('authentication');
-        $backendOrder = array_keys($config->toArray());
-        $form = new Form();
-        $form->setName('form_reorder_authbackend');
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            $requestData = $request->getPost();
-            if ($form->isValid($requestData)) { // Validate the CSRF token
-                $reordered = false;
-                foreach ($backendOrder as $backendName) {
-                    if (isset($requestData[$backendName])) {
-                        array_splice($backendOrder, array_search($backendName, $backendOrder), 1);
-                        array_splice($backendOrder, $requestData[$backendName], 0, $backendName);
-                        $reordered = true;
-                        break;
-                    }
-                }
-
-                if ($reordered) {
-                    $reorderedConfig = array();
-                    foreach ($backendOrder as $backendName) {
-                        $reorderedConfig[$backendName] = $config->{$backendName};
-                    }
-
-                    if ($this->writeAuthenticationFile($reorderedConfig)) {
-                        Notification::success($this->translate('Authentication order updated!'));
-                        $this->redirectNow('config/authentication');
-                    }
-                }
-            }
-        }
-
-        $this->view->form = $form->create(); // Necessary in case its a GET request
-        $this->view->backendNames = $backendOrder;
+        $this->render('authentication/reorder');
     }
 
     /**
@@ -190,172 +157,66 @@ class ConfigController extends BaseConfigController
      */
     public function createauthenticationbackendAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
-        $this->view->tabs->activate('authentication');
+        $form = new AuthenticationBackendConfigForm();
+        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        $form->setRedirectUrl('config/authentication');
+        $form->handleRequest();
 
-        $backendType = $this->getRequest()->getParam('type');
-        $authenticationConfig = IcingaConfig::app('authentication')->toArray();
-        try {
-            switch ($backendType) {
-                case 'ldap':
-                    $form = new LdapBackendForm();
-                    break;
-                case 'db':
-                    $form = new DbBackendForm();
-                    break;
-                case 'autologin':
-                    foreach ($authenticationConfig as $ac) {
-                        if (array_key_exists('backend', $ac) && $ac['backend'] === 'autologin') {
-                            throw new ConfigurationError(
-                                $this->translate('An autologin backend already exists')
-                            );
-                        }
-                    }
-                    $form = new AutologinBackendForm();
-                    break;
-                default:
-                    $this->addErrorMessage(sprintf(
-                        $this->translate('There is no backend type `%s\''),
-                        $backendType
-                    ));
-                    $this->redirectNow('config/configurationerror');
-            }
-        } catch (ConfigurationError $e) {
-            $this->addErrorMessage($e->getMessage());
-            $this->redirectNow('config/configurationerror');
-        }
-
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            list($backendName, $backendConfig) = $form->getBackendConfig();
-            if (isset($authenticationConfig[$backendName])) {
-                $this->addErrorMessage(
-                    $this->translate('Backend name already exists')
-                );
-            } else {
-                $authenticationConfig[$backendName] = $backendConfig;
-                if ($this->writeConfigFile($authenticationConfig, 'authentication')) {
-                    $this->addSuccessMessage(
-                        $this->translate('Backend Modification Written.')
-                    );
-                    $this->redirectNow('config/authentication');
-                }
-            }
-        }
-
-        $this->view->messageBox->addForm($form);
         $this->view->form = $form;
+        $this->view->tabs->activate('authentication');
         $this->render('authentication/create');
     }
 
-
     /**
-     *  Form for editing backends
-     *
-     *  Mostly the same like the createAuthenticationBackendAction, but with additional checks for backend existence
-     *  and form population
+     * Action for editing authentication backends
      */
     public function editauthenticationbackendAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
+        $form = new AuthenticationBackendConfigForm();
+        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        $form->setRedirectUrl('config/authentication');
+        $form->handleRequest();
 
-        $configArray = IcingaConfig::app('authentication', true)->toArray();
-        $authBackend =  $this->getParam('auth_backend');
-        if (false === isset($configArray[$authBackend])) {
-            $this->addErrorMessage(
-                $this->translate('Can\'t edit: Unknown Authentication Backend Provided')
-            );
-            $this->redirectNow('config/configurationerror');
-        }
-
-        if (false === array_key_exists('backend', $configArray[$authBackend])) {
-            $this->addErrorMessage(sprintf(
-                $this->translate('Backend "%s" has no `backend\' setting'),
-                $authBackend
-            ));
-            $this->redirectNow('config/configurationerror');
-        }
-        $type = $configArray[$authBackend]['backend'];
-        switch ($type) {
-            case 'ldap':
-                $form = new LdapBackendForm();
-                break;
-            case 'db':
-                $form = new DbBackendForm();
-                break;
-            case 'autologin':
-                $form = new AutologinBackendForm();
-                break;
-            default:
-                $this->addErrorMessage(sprintf(
-                    $this->translate('Can\'t edit: backend type "%s" of given resource not supported.'),
-                    $type
-                ));
-                $this->redirectNow('config/configurationerror');
-        }
-
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                list($backendName, $backendConfig) = $form->getBackendConfig();
-                $configArray[$backendName] = $backendConfig;
-                if ($backendName != $authBackend) {
-                    unset($configArray[$authBackend]);
-                }
-                if ($this->writeAuthenticationFile($configArray)) {
-                    // redirect to overview with success message
-                    Notification::success(sprintf(
-                        $this->translate('Backend "%s" saved'),
-                        $backendName
-                    ));
-                    $this->redirectNow('config/authentication');
-                }
-                return;
-            }
-        } else {
-            $form->setBackendConfig($authBackend, $configArray[$authBackend]);
-        }
-
-        $this->view->messageBox->addForm($form);
-        $this->view->name = $authBackend;
         $this->view->form = $form;
+        $this->view->tabs->activate('authentication');
         $this->render('authentication/modify');
     }
 
     /**
-     * Action for removing a backend from the authentication list.
-     *
-     * Redirects to the overview after removal is finished
+     * Action for removing a backend from the authentication list
      */
     public function removeauthenticationbackendAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
+        $form = new ConfirmRemovalForm(array(
+            'onSuccess' => function ($request) {
+                $configForm = new AuthenticationBackendConfigForm();
+                $configForm->setConfig(IcingaConfig::app('authentication'));
+                $authBackend = $request->getQuery('auth_backend');
 
-        $configArray = IcingaConfig::app('authentication', true)->toArray();
-        $authBackend =  $this->getParam('auth_backend');
-        if (false === array_key_exists($authBackend, $configArray)) {
-            $this->addErrorMessage(
-                $this->translate('Can\'t perform removal: Unknown authentication backend provided')
-            );
-            $this->redirectNow('config/configurationerror');
-        }
+                try {
+                    $configForm->remove($authBackend);
+                } catch (InvalidArgumentException $e) {
+                    Notification::error($e->getMessage());
+                    return;
+                }
 
-        $form = new ConfirmRemovalForm();
-        $request = $this->getRequest();
-
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            unset($configArray[$authBackend]);
-            if ($this->writeAuthenticationFile($configArray)) {
-                Notification::success(sprintf(
-                    $this->translate('Authentication Backend "%s" Removed'),
-                    $authBackend
-                ));
-                $this->redirectNow('config/authentication');
+                if ($configForm->save()) {
+                    Notification::success(sprintf(
+                        t('Authentication backend "%s" has been successfully removed'),
+                        $authBackend
+                    ));
+                } else {
+                    return false;
+                }
             }
-        }
+        ));
+        $form->setRedirectUrl('config/authentication');
+        $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->name = $authBackend;
+        $this->view->tabs->activate('authentication');
         $this->render('authentication/remove');
     }
 
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index c3cf56fa7..662106bcd 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -5,19 +5,19 @@
 namespace Icinga\Form\Config\Authentication;
 
 use Zend_Validate_Callback;
+use Icinga\Web\Form;
 
 /**
  * Form class for adding/modifying autologin authentication backends
  */
-class AutologinBackendForm extends BaseBackendForm
+class AutologinBackendForm extends Form
 {
     /**
      * Initialize this form
      */
     public function init()
     {
-        $this->setName('form_config_authentication_autologin');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setName('form_config_authbackend_autologin');
     }
 
     /**
@@ -31,7 +31,6 @@ class AutologinBackendForm extends BaseBackendForm
                 'name',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('Backend Name'),
                     'helptext'      => t('The name of this authentication backend'),
                     'validators'    => array(
@@ -53,7 +52,6 @@ class AutologinBackendForm extends BaseBackendForm
                 'strip_username_regexp',
                 array(
                     'required'      => true,
-                    'allowEmpty'    => false,
                     'label'         => t('Backend Domain Pattern'),
                     'helptext'      => t('The domain pattern of this authentication backend'),
                     'value'         => '/\@[^$]+$/',
@@ -76,13 +74,15 @@ class AutologinBackendForm extends BaseBackendForm
     }
 
     /**
-     * Validate the configuration state of this backend
+     * Validate the configuration by creating a backend and requesting the user count
      *
-     * Returns just true as autologins are being handled externally by the webserver.
+     * Returns always true as autologin backends are just "passive" backends. (The webserver authenticates users.)
      *
-     * @return  true
+     * @param   Form    $form   The form to fetch the configuration values from
+     *
+     * @return  bool            Whether validation succeeded or not
      */
-    public function isValidAuthenticationBackend()
+    public function isValidAuthenticationBackend(Form $form)
     {
         return true;
     }
diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
deleted file mode 100644
index 840b5f34c..000000000
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Config\Authentication;
-
-use Icinga\Web\Form;
-
-/**
- * Base form for authentication backend forms
- */
-abstract class BaseBackendForm extends Form
-{
-    /**
-     * Return whether the given values are complete/valid and check whether it is possible to connect to the backend
-     *
-     * If connection validation fails, a checkbox is prepended to the form to allow users to skip it.
-     *
-     * @param   array   $data   The data to validate
-     *
-     * @return  bool            Whether the validation succeeded or not
-     */
-    public function isValid($data)
-    {
-        if (false === parent::isValid($data)) {
-            return false;
-        }
-
-        if (
-            (false === isset($data['force_creation']) || false === $data['force_creation'])
-            && false === $this->isValidAuthenticationBackend()
-        ) {
-            $this->addForceCreationCheckbox();
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate the configuration state of this backend with the concrete authentication backend.
-     *
-     * An implementation should not throw any exception, but use the add/setErrorMessages method
-     * of Zend_Form. If the 'force_creation' checkbox is set, this method won't be called.
-     *
-     * @return  bool    Whether validation succeeded or not
-     */
-    abstract public function isValidAuthenticationBackend();
-
-    /**
-     * Return the backend's configuration values and its name
-     *
-     * The first value is the name and the second one the values as array.
-     *
-     * @return  array
-     */
-    public function getBackendConfig()
-    {
-        $values = $this->getValues();
-        $name = $values['name'];
-        unset($values['name']);
-        return array($name, $values);
-    }
-
-    /**
-     * Populate the form with the given configuration values
-     *
-     * @param   string  $name       The name of the backend
-     * @param   array   $config     The configuration values
-     */
-    public function setBackendConfig($name, array $config)
-    {
-        $config['name'] = $name;
-        $this->populate($config);
-    }
-
-    /**
-     * Add a checkbox to be displayed at the beginning of the form
-     * which allows the user to skip the connection validation
-     */
-    protected function addForceCreationCheckbox()
-    {
-        $this->addElement(
-            'checkbox',
-            'force_creation',
-            array(
-                'order'     => 0,
-                'ignore'    => true,
-                'label'     => t('Force Changes'),
-                'helptext'  => t('Check this box to enforce changes without connectivity validation')
-            )
-        );
-    }
-}
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 521414094..7ec9c3c26 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -5,17 +5,18 @@
 namespace Icinga\Form\Config\Authentication;
 
 use Exception;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
 use Icinga\Data\ResourceFactory;
-use Icinga\Exception\ConfigurationError;
 use Icinga\Authentication\Backend\DbUserBackend;
 
 /**
  * Form class for adding/modifying database authentication backends
  */
-class DbBackendForm extends BaseBackendForm
+class DbBackendForm extends Form
 {
     /**
-     * The available database resources prepared to be used as select input data
+     * The database resource names the user can choose from
      *
      * @var array
      */
@@ -23,28 +24,23 @@ class DbBackendForm extends BaseBackendForm
 
     /**
      * Initialize this form
-     *
-     * Populates $this->resources.
-     *
-     * @throws  ConfigurationError  In case no database resources can be found
      */
     public function init()
     {
-        $this->setName('form_config_authentication_db');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setName('form_config_authbackend_db');
+    }
 
-        $dbResources = array_keys(
-            ResourceFactory::getResourceConfigs('db')->toArray()
-        );
-
-        if (empty($dbResources)) {
-            throw new ConfigurationError(
-                t('There are no database resources')
-            );
-        }
-
-        // array_combine() is necessary in order to use the array as select input data
-        $this->resources = array_combine($dbResources, $dbResources);
+    /**
+     * Set the resource names the user can choose from
+     *
+     * @param   array   $resources      The resources to choose from
+     *
+     * @return  self
+     */
+    public function setResources(array $resources)
+    {
+        $this->resources = $resources;
+        return $this;
     }
 
     /**
@@ -69,7 +65,9 @@ class DbBackendForm extends BaseBackendForm
                     'required'      => true,
                     'label'         => t('Database Connection'),
                     'helptext'      => t('The database connection to use for authenticating with this provider'),
-                    'multiOptions'  => $this->resources
+                    'multiOptions'  => false === empty($this->resources)
+                        ? array_combine($this->resources, $this->resources)
+                        : array()
                 )
             ),
             $this->createElement(
@@ -84,25 +82,39 @@ class DbBackendForm extends BaseBackendForm
     }
 
     /**
-     * Validate the current configuration by creating a backend and requesting the user count
+     * Validate that the selected resource is a valid database authentication backend
      *
-     * @return  bool    Whether validation succeeded or not
-     *
-     * @see BaseBackendForm::isValidAuthenticationBackend()
+     * @see Form::onSuccess()
      */
-    public function isValidAuthenticationBackend()
+    public function onSuccess(Request $request)
     {
+        if (false === $this->isValidAuthenticationBackend($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 function isValidAuthenticationBackend(Form $form)
+    {
+        $element = $form->getElement('resource');
+
         try {
-            $testConnection = ResourceFactory::createResource(ResourceFactory::getResourceConfig(
-                $this->getValue('resource')
-            ));
+            $testConnection = ResourceFactory::createResource(
+                ResourceFactory::getResourceConfig($element->getValue())
+            );
             $dbUserBackend = new DbUserBackend($testConnection);
             if ($dbUserBackend->count() < 1) {
-                $this->addErrorMessage(t('No users found under the specified database backend'));
+                $element->addError(t('No users found under the specified database backend'));
                 return false;
             }
         } catch (Exception $e) {
-            $this->addErrorMessage(sprintf(t('Using the specified backend failed: %s'), $e->getMessage()));
+            $element->addError(sprintf(t('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 ed261c1f9..af627df48 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -5,17 +5,17 @@
 namespace Icinga\Form\Config\Authentication;
 
 use Exception;
+use Icinga\Web\Form;
 use Icinga\Data\ResourceFactory;
-use Icinga\Exception\ConfigurationError;
 use Icinga\Authentication\Backend\LdapUserBackend;
 
 /**
- * Form for adding or modifying LDAP authentication backends
+ * Form class for adding/modifying LDAP authentication backends
  */
-class LdapBackendForm extends BaseBackendForm
+class LdapBackendForm extends Form
 {
     /**
-     * The available ldap resources prepared to be used as select input data
+     * The ldap resource names the user can choose from
      *
      * @var array
      */
@@ -23,28 +23,23 @@ class LdapBackendForm extends BaseBackendForm
 
     /**
      * Initialize this form
-     *
-     * Populates $this->resources.
-     *
-     * @throws  ConfigurationError  In case no database resources can be found
      */
     public function init()
     {
-        $this->setName('form_config_authentication_ldap');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setName('form_config_authbackend_ldap');
+    }
 
-        $ldapResources = array_keys(
-            ResourceFactory::getResourceConfigs('ldap')->toArray()
-        );
-
-        if (empty($ldapResources)) {
-            throw new ConfigurationError(
-                t('There are no LDAP resources')
-            );
-        }
-
-        // array_combine() is necessary in order to use the array as select input data
-        $this->resources = array_combine($ldapResources, $ldapResources);
+    /**
+     * Set the resource names the user can choose from
+     *
+     * @param   array   $resources      The resources to choose from
+     *
+     * @return  self
+     */
+    public function setResources(array $resources)
+    {
+        $this->resources = $resources;
+        return $this;
     }
 
     /**
@@ -69,7 +64,9 @@ class LdapBackendForm extends BaseBackendForm
                     'required'      => true,
                     'label'         => t('LDAP Resource'),
                     'helptext'      => t('The resource to use for authenticating with this provider'),
-                    'multiOptions'  => $this->resources
+                    'multiOptions'  => false === empty($this->resources)
+                        ? array_combine($this->resources, $this->resources)
+                        : array()
                 )
             ),
             $this->createElement(
@@ -104,33 +101,39 @@ class LdapBackendForm extends BaseBackendForm
     }
 
     /**
-     * Validate the current configuration by connecting to a backend and requesting the user count
+     * Validate that the selected resource is a valid ldap authentication backend
      *
-     * @return  bool    Whether validation succeeded or not
-     *
-     * @see BaseBackendForm::isValidAuthenticationBacken()
+     * @see Form::onSuccess()
      */
-    public function isValidAuthenticationBackend()
+    public function onSuccess(Request $request)
     {
-        if (false === ResourceFactory::ldapAvailable()) {
-            // It should be possible to run icingaweb without the php ldap extension. When the user
-            // tries to create an ldap backend without ldap being installed we display an error.
-            $this->addErrorMessage(t('Using ldap is not possible, the php extension "ldap" is not installed.'));
+        if (false === $this->isValidAuthenticationBackend($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 function isValidAuthenticationBackend(Form $form)
+    {
+        $element = $form->getElement('resource');
 
         try {
-            $backend = ResourceFactory::createResource(
-                ResourceFactory::getResourceConfig($this->getValue('resource'))
+            $ldapUserBackend = new LdapUserBackend(
+                ResourceFactory::createResource(
+                    ResourceFactory::getResourceConfig($element->getValue())
+                ),
+                $form->getElement('user_class')->getValue(),
+                $form->getElement('user_name_attribute')->getValue()
             );
-            $testConn = new LdapUserBackend(
-                $backend,
-                $this->getValue('user_class'),
-                $this->getValue('user_name_attribute')
-            );
-            $testConn->assertAuthenticationPossible();
-        } catch (Exception $exc) {
-            $this->addErrorMessage(sprintf(t('Connection validation failed: %s'), $exc->getMessage()));
+            $ldapUserBackend->assertAuthenticationPossible();
+        } catch (Exception $e) {
+            $element->addError(sprintf(t('Connection validation failed: %s'), $e->getMessage()));
             return false;
         }
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
new file mode 100644
index 000000000..6aeccdd20
--- /dev/null
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -0,0 +1,318 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config;
+
+use InvalidArgumentException;
+use Icinga\Web\Request;
+use Icinga\Form\ConfigForm;
+use Icinga\Web\Notification;
+use Icinga\Application\Config;
+use Icinga\Data\ResourceFactory;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Form\Config\Authentication\DbBackendForm;
+use Icinga\Form\Config\Authentication\LdapBackendForm;
+use Icinga\Form\Config\Authentication\AutologinBackendForm;
+
+class AuthenticationBackendConfigForm extends ConfigForm
+{
+    /**
+     * The available resources split by type
+     *
+     * @var array
+     */
+    protected $resources;
+
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_authbackend');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * Set the resource configuration to use
+     *
+     * @param   Config      $resources      The resource configuration
+     *
+     * @return  self
+     *
+     * @throws  ConfigurationError          In case no resources are available for authentication
+     */
+    public function setResourceConfig(Config $resourceConfig)
+    {
+        $resources = array();
+        foreach ($resourceConfig as $name => $resource) {
+            $resources[strtolower($resource->type)][] = $name;
+        }
+
+        if (empty($resources)) {
+            throw new ConfigurationError(t('Could not find any resources for authentication'));
+        }
+
+        $this->resources = $resources;
+        return $this;
+    }
+
+    /**
+     * 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') {
+            $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 === 'autologin') {
+            $form = new AutologinBackendForm();
+        } else {
+            throw new InvalidArgumentException(sprintf(t('Invalid backend type "%s" provided'), $type));
+        }
+
+        return $form;
+    }
+
+    /**
+     * Add a particular authentication backend
+     *
+     * The backend to add is identified by the array-key `name'.
+     *
+     * @param   array   $values             The values to extend the configuration with
+     *
+     * @return  self
+     *
+     * @throws  InvalidArgumentException    In case the backend does already exist
+     */
+    public function add(array $values)
+    {
+        $name = isset($values['name']) ? $values['name'] : '';
+        if (! $name) {
+            throw new InvalidArgumentException(t('Authentication backend name missing'));
+        } elseif ($this->config->get($name) !== null) {
+            throw new InvalidArgumentException(t('Authentication backend already exists'));
+        }
+
+        unset($values['name']);
+        $this->config->{$name} = $values;
+        return $this;
+    }
+
+    /**
+     * Edit a particular authentication backend
+     *
+     * @param   string  $name               The name of the backend to edit
+     * @param   array   $values             The values to edit the configuration with
+     *
+     * @return  array                       The edited backend configuration
+     *
+     * @throws  InvalidArgumentException    In case the backend does not exist
+     */
+    public function edit($name, array $values)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Old authentication backend name missing'));
+        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
+            throw new InvalidArgumentException(t('New authentication backend name missing'));
+        } elseif (($backendConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+        }
+
+        if ($newName !== $name) {
+            // Only remove the old entry if it has changed as the order gets screwed when editing backend names
+            unset($this->config->{$name});
+        }
+
+        unset($values['name']);
+        $this->config->{$newName} = array_merge($backendConfig->toArray(), $values);
+        return $this->config->{$newName};
+    }
+
+    /**
+     * Remove the given authentication backend
+     *
+     * @param   string      $name           The name of the backend to remove
+     *
+     * @return  array                       The removed backend configuration
+     *
+     * @throws  InvalidArgumentException    In case the backend does not exist
+     */
+    public function remove($name)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Authentication backend name missing'));
+        } elseif (($backendConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+        }
+
+        unset($this->config->{$name});
+        return $backendConfig;
+    }
+
+    /**
+     * Move the given authentication 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
+     *
+     * @return  self
+     *
+     * @throws  InvalidArgumentException    In case the backend does not exist
+     */
+    public function move($name, $position)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Authentication backend name missing'));
+        } elseif ($this->config->get($name) === null) {
+            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+        }
+
+        $backendOrder = $this->config->keys();
+        array_splice($backendOrder, array_search($name, $backendOrder), 1);
+        array_splice($backendOrder, $position, 0, $name);
+
+        $newConfig = array();
+        foreach ($backendOrder as $backendName) {
+            $newConfig[$backendName] = $this->config->get($backendName);
+        }
+
+        $config = new Config($newConfig);
+        $this->config = $config->setConfigFile($this->config->getConfigFile());
+        return $this;
+    }
+
+    /**
+     * Add or edit an authentication 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.
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        if (($el = $this->getElement('force_creation')) === null || false === $el->isChecked()) {
+            $backendForm = $this->getBackendForm($this->getElement('type')->getValue());
+            if (false === $backendForm->isValidAuthenticationBackend($this)) {
+                $this->addForceCreationCheckbox();
+                return false;
+            }
+        }
+
+        $authBackend = $request->getQuery('auth_backend');
+        try {
+            if ($authBackend === null) { // create new backend
+                $this->add($this->getValues());
+                $message = t('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');
+            }
+        } 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 authentication backend is being edited
+     *
+     * @see Form::onShow()
+     *
+     * @throws  ConfigurationError      In case the backend name is missing in the request or is invalid
+     */
+    public function onShow(Request $request)
+    {
+        $authBackend = $request->getQuery('auth_backend');
+        if ($authBackend !== null) {
+            if ($authBackend === '') {
+                throw new ConfigurationError(t('Authentication backend name missing'));
+            } elseif (false === isset($this->config->{$authBackend})) {
+                throw new ConfigurationError(t('Unknown authentication backend provided'));
+            } elseif (false === isset($this->config->{$authBackend}->backend)) {
+                throw new ConfigurationError(sprintf(t('Backend "%s" has no `backend\' setting'), $authBackend));
+            }
+
+            $configValues = $this->config->{$authBackend}->toArray();
+            $configValues['type'] = $configValues['backend'];
+            $configValues['name'] = $authBackend;
+            $this->populate($configValues);
+        }
+    }
+
+    /**
+     * Add a checkbox to be displayed at the beginning of the form
+     * which allows the user to skip the connection validation
+     */
+    protected function addForceCreationCheckbox()
+    {
+        $this->addElement(
+            'checkbox',
+            'force_creation',
+            array(
+                'order'     => 0,
+                'ignore'    => true,
+                'label'     => t('Force Changes'),
+                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+            )
+        );
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $backendTypes = array();
+        $backendType = isset($formData['type']) ? $formData['type'] : 'db';
+
+        if (isset($this->resources['db'])) {
+            $backendTypes['db'] = t('Database');
+        }
+        if (isset($this->resources['ldap']) && ($backendType === 'ldap' || ResourceFactory::ldapAvailable())) {
+            $backendTypes['ldap'] = 'LDAP';
+        }
+
+        $autologinBackends = array_filter(
+            $this->config->toArray(),
+            function ($authBackendCfg) {
+                return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'autologin';
+            }
+        );
+        if ($backendType === 'autologin' || empty($autologinBackends)) {
+            $backendTypes['autologin'] = t('Autologin');
+        }
+
+        $typeSelection = $this->createElement(
+            'select',
+            'type',
+            array(
+                'ignore'        => true,
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => t('Backend Type'),
+                'helptext'      => t('The type of the resource to use for this authenticaton backend'),
+                'multiOptions'  => $backendTypes
+            )
+        );
+
+        return array_merge(
+            array($typeSelection),
+            $this->getBackendForm($backendType)->createElements($formData)
+        );
+    }
+}
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
new file mode 100644
index 000000000..d4be16c30
--- /dev/null
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -0,0 +1,68 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config;
+
+use InvalidArgumentException;
+use Icinga\Web\Request;
+use Icinga\Web\Notification;
+use Icinga\Form\ConfigForm;
+
+class AuthenticationBackendReorderForm extends ConfigForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_reorder_authbackend');
+        $this->setViewScript('form/reorder-authbackend.phtml');
+    }
+
+    /**
+     * Return the ordered backend names
+     *
+     * @return  array
+     */
+    public function getBackendOrder()
+    {
+        return $this->config->keys();
+    }
+
+    /**
+     * Update the authentication backend order and save the configuration
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        $formData = $this->getRequestData($request);
+        if (isset($formData['backend_newpos'])) {
+            $configForm = $this->getConfigForm();
+            list($backendName, $position) = explode('|', $formData['backend_newpos'], 2);
+
+            try {
+                if ($configForm->move($backendName, $position)->save()) {
+                    Notification::success(t('Authentication order updated!'));
+                } else {
+                    return false;
+                }
+            } catch (InvalidArgumentException $e) {
+                Notification::error($e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * Return the config form for authentication backends
+     *
+     * @return  ConfigForm
+     */
+    protected function getConfigForm()
+    {
+        $form = new AuthenticationBackendConfigForm();
+        $form->setConfig($this->config);
+        return $form;
+    }
+}
diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
deleted file mode 100644
index 5f1be17bd..000000000
--- a/application/views/scripts/config/authentication.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="controls">
-  <?= $tabs; ?>
-</div>
-<div class="content" data-base-target="_next">
-  <?= $messageBox; ?>
-  <p>
-    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'ldap')); ?>">
-      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New LDAP Authentication Backend'); ?>
-    </a>
-    <br>
-    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'db')); ?>">
-      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New DB Authentication Backend'); ?>
-    </a>
-    <br>
-    <a href="<?= $this->href('/config/createAuthenticationBackend', array('type' => 'autologin')); ?>">
-      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New Autologin Authentication Backend'); ?>
-    </a>
-  </p>
-  <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>">
-    <?= $form->getElement($form->getTokenElementName()); ?>
-    <table class="action">
-      <thead>
-        <th>Backend</th>
-        <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
-        <th style="width: 5em"><?= $this->translate('Order'); ?></th>
-      </thead>
-      <tbody>
-<?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.png'); ?> <?= $this->escape($backendNames[$i]); ?>
-            </a>
-          </td>
-          <td>
-            <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
-              <?= $this->icon('remove.png', $this->translate('Remove')); ?>
-            </a>
-          </td>
-          <td>
-<?php if ($i > 0): ?>
-            <button type="submit" name="<?= $backendNames[$i]; ?>" value="<?= $i - 1; ?>">
-              <?= $this->icon('up.png', $this->translate('Move up in authentication order')); ?>
-            </button>
-<?php endif; ?>
-<?php if ($i + 1 < count($backendNames)): ?>
-            <button type="submit" name="<?= $backendNames[$i]; ?>" value="<?= $i + 1; ?>">
-              <?= $this->icon('down.png', $this->translate('Move down in authentication order')); ?>
-            </button>
-<?php endif; ?>
-          </td>
-        </tr>
-<?php endfor; ?>
-      </tbody>
-    </table>
-  </form>
-</div>
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index fd329b63a..52fcbceb3 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -1,15 +1,7 @@
-<h4>
-    <i class="icinga-icon-create"></i>
-    Create New Authentication Backend
-</h4>
-
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
+<h4><?= $this->translate('Create New Authentication Backend'); ?></h4>
 <p>
-  Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.
+  <?= $this->translate(
+    'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
+  ); ?>
 </p>
-
-<?= $this->form ?>
\ No newline at end of file
+<?= $form; ?>
\ 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 4666ce686..19901ae5b 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -1,8 +1,2 @@
-<h4>
-    <?php printf(
-        $this->translate('Edit Backend "%s"'),
-        $this->escape($this->name)
-    ); ?>
-</h4>
-<?= $messageBox; ?>
-<?= $this->form; ?>
+<h4><?= $this->translate('Edit Backend'); ?></h4>
+<?= $form; ?>
\ No newline at end of file
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index 23b85f6d7..e1050db0d 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -1,8 +1,2 @@
-<h4>
-    <?php printf(
-        $this->translate('Remove Backend "%s"'),
-        $this->escape($name)
-    ); ?>
-</h4>
-<?= $messageBox ?>
-<?= $form ?>
+<h4><?= $this->translate('Remove Backend'); ?></h4>
+<?= $form; ?>
\ No newline at end of file
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
new file mode 100644
index 000000000..0ae7850eb
--- /dev/null
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -0,0 +1,11 @@
+<div class="controls">
+  <?= $tabs; ?>
+</div>
+<div class="content" data-base-target="_next">
+  <p>
+    <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
+      <?= $this->icon('create.png'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+    </a>
+  </p>
+  <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
new file mode 100644
index 000000000..8153e17d2
--- /dev/null
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -0,0 +1,40 @@
+<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>">
+  <table class="action">
+    <thead>
+      <th>Backend</th>
+      <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+      <th style="width: 5em"><?= $this->translate('Order'); ?></th>
+    </thead>
+    <tbody>
+<?php $backendNames = $form->getBackendOrder(); ?>
+<?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.png'); ?> <?= $this->escape($backendNames[$i]); ?>
+          </a>
+        </td>
+        <td>
+          <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
+            <?= $this->icon('remove.png', $this->translate('Remove')); ?>
+          </a>
+        </td>
+        <td>
+<?php if ($i > 0): ?>
+          <button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i - 1); ?>">
+            <?= $this->icon('up.png', $this->translate('Move up in authentication order')); ?>
+          </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.png', $this->translate('Move down in authentication order')); ?>
+          </button>
+<?php endif; ?>
+        </td>
+      </tr>
+<?php endfor; ?>
+    </tbody>
+  </table>
+  <?= $form->getElement($form->getTokenElementName()); ?>
+  <?= $form->getElement($form->getUidElementName()); ?>
+</form>
\ No newline at end of file

From 6324192127fec1ffb02042695c4dc7d38a3c66ed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:36:11 +0200
Subject: [PATCH 099/277] monitoring/commands: Throw `LogicException' if the
 remote host is not set in `RemoteCommandFile'

refs #6593
---
 .../library/Monitoring/Command/Transport/RemoteCommandFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index fe1ae92c2..8092a00bd 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -153,6 +153,9 @@ class RemoteCommandFile implements CommandTransportInterface
         if (! isset($this->path)) {
             throw new LogicException;
         }
+        if (! isset($this->host)) {
+            throw new LogicException;
+        }
         Logger::debug(
             sprintf(
                 mt('monitoring', 'Sending external Icinga command "%s" to the remote command file "%s:%u%s"'),

From 4d353ac7bff6ae2ee22b455def41ddb86ef86dd7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:36:55 +0200
Subject: [PATCH 100/277] monitoring/commands: Add `CommandTransport' factory

Instead of auto-detecting which transport class to use, the instances configuration
now supports a new setting named `transport' with the possible values 'local' and 'remote'.

refs #6593
---
 .../Command/Transport/CommandTransport.php    | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
new file mode 100644
index 000000000..9adbbb062
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -0,0 +1,101 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Transport;
+
+use Zend_Config;
+use Icinga\Application\Config;
+use Icinga\Exception\ConfigurationError;
+
+/**
+ * Command transport factory
+ *
+ * This class is subject to change as we do not have environments yet (#4471).
+ */
+abstract class CommandTransport
+{
+    /**
+     * Transport configuration
+     *
+     * @var Config
+     */
+    protected static $config;
+
+    /**
+     * Get transport configuration
+     *
+     * @return Config
+     * @throws ConfigurationError
+     */
+    public static function getConfig()
+    {
+        if (! isset(self::$config)) {
+            self::$config = Config::module('monitoring', 'instances');
+            if (self::$config->count() === 0) {
+                throw new ConfigurationError;
+            }
+        }
+        return self::$config;
+    }
+
+    /**
+     * Create a transport from config
+     *
+     * @param   Zend_Config $config
+     *
+     * @return  LocalCommandFile|RemoteCommandFile
+     * @throws  ConfigurationError
+     */
+    public static function fromConfig(Zend_Config $config)
+    {
+        switch (strtolower($config->transport)) {
+            case 'remote':
+                $transport = new RemoteCommandFile();
+                break;
+            case 'local':
+            case '':  // Casting null to string is the empty string
+                $transport = new LocalCommandFile();
+                break;
+            default:
+                throw new ConfigurationError;
+        }
+        unset($config->transport);
+        foreach ($config as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            if (! method_exists($transport, $method)) {
+                throw new ConfigurationError;
+            }
+            $transport->$method($value);
+        }
+        return $transport;
+    }
+
+    /**
+     * Create a transport by name
+     *
+     * @param   string $name
+     *
+     * @return  LocalCommandFile|RemoteCommandFile
+     * @throws  ConfigurationError
+     */
+    public static function create($name)
+    {
+        $config = self::getConfig()->get($name);
+        if ($config === null) {
+            throw new ConfigurationError;
+        }
+        return self::fromConfig($config);
+    }
+
+    /**
+     * Create a transport by the first section of the configuration
+     *
+     * @return LocalCommandFile|RemoteCommandFile
+     */
+    public static function first()
+    {
+        $config = self::getConfig()->current();
+        return self::fromConfig($config);
+    }
+}

From 8c82f1a8686dd0bf65c6c4be4f2910931498e039 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 Aug 2014 15:45:35 +0200
Subject: [PATCH 101/277] monitoring/commands: Add common `ToggleFeature'
 command

`ToggleFeature' should be used for enabling/disabling concrete features of the monitoring host.

refs #6593
---
 .../Command/Common/ToggleFeature.php          | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php

diff --git a/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php b/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
new file mode 100644
index 000000000..1ddb3b81d
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
@@ -0,0 +1,42 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Common;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
+/**
+ * Enable/disable features of the monitoring host
+ */
+abstract class ToggleFeature extends IcingaCommand
+{
+    /**
+     * Whether the feature should be enabled or disabled
+     *
+     * @var bool
+     */
+    protected $enable = true;
+
+    /**
+     * Enable the feature
+     *
+     * @return self
+     */
+    public function enable()
+    {
+        $this->enable = true;
+        return $this;
+    }
+
+    /**
+     * Disable the feature
+     *
+     * @return self
+     */
+    public function disable()
+    {
+        $this->enable = false;
+        return $this;
+    }
+}

From f3e74f0f24fa6973c20f62007ae09233098c72d0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 09:44:04 +0200
Subject: [PATCH 102/277] library/form: Append class 'autosubmit' in case the
 element to autosubmit has the class attribute set

Before, the class attribute would've been overwritten.

refs #5525
---
 library/Icinga/Web/Form.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index f47a42d9a..f4acaa5f1 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -370,7 +370,15 @@ class Form extends Zend_Form
                 if ($el->getAttrib('autosubmit')) {
                     // Need to add this decorator first or it interferes with the other's two HTML otherwise
                     $el->addDecorator(new NoScriptApply()); // Non-JS environments
-                    $el->setAttrib('class', 'autosubmit'); // JS environments
+                    $class = $el->getAttrib('class');
+                    if (is_array($class)) {
+                        $class[] = 'autosubmit';
+                    } elseif ($class === null) {
+                        $class = 'autosubmit';
+                    } else {
+                        $class .= ' autosubmit';
+                    }
+                    $el->setAttrib('class', $class); // JS environments
                     unset($el->autosubmit);
                 }
 

From 57dd9a699e50e002d10d29359a81204f585b5382 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 10:29:34 +0200
Subject: [PATCH 103/277] monitoring/commands: ToggleFeature: Use 'return
 $this' for documenting fluent interfaces

refs #6593
---
 .../library/Monitoring/Command/Common/ToggleFeature.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php b/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
index 1ddb3b81d..7002cd1e4 100644
--- a/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
+++ b/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
@@ -7,7 +7,7 @@ namespace Icinga\Module\Monitoring\Command\Common;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 
 /**
- * Enable/disable features of the monitoring host
+ * Enable/disable features of an Icinga instance
  */
 abstract class ToggleFeature extends IcingaCommand
 {
@@ -21,7 +21,7 @@ abstract class ToggleFeature extends IcingaCommand
     /**
      * Enable the feature
      *
-     * @return self
+     * @return $this
      */
     public function enable()
     {
@@ -32,7 +32,7 @@ abstract class ToggleFeature extends IcingaCommand
     /**
      * Disable the feature
      *
-     * @return self
+     * @return $this
      */
     public function disable()
     {

From 0822aff2930c876ab4f5b18508888f41adcbb26e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 14:40:45 +0200
Subject: [PATCH 104/277] library/form: Fix return value of `getName()' not
 being filterd the first time it's called

`Form::getName()' auto-detects the form's name if it's not set and sets the form's name using `Zend_Form::setName()'.
`Zend_Form::setName()' then filters the form name stripping backslash '\' characters. The first call to `Form::getName()'
did not regard the filtering and thus returned the unfiltered name which led to `Form::wasSent()' returning `false'.

refs #5525
---
 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 f4acaa5f1..8b0aef091 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -585,8 +585,8 @@ class Form extends Zend_Form
         if (! $name) {
             $name = get_class($this);
             $this->setName($name);
+            $name = parent::getName();
         }
-
         return $name;
     }
 

From cd8015f41a82482f177f5f3fe7da19f0292e0f3d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Sep 2014 14:58:16 +0200
Subject: [PATCH 105/277] Pass the current form instance to the callback as
 second argument

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

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 8b0aef091..cae745be5 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -28,7 +28,7 @@ class Form extends Zend_Form
     /**
      * The callback to call instead of Form::onSuccess()
      *
-     * @var Closure
+     * @var Callback
      */
     protected $onSuccess;
 
@@ -79,8 +79,8 @@ class Form extends Zend_Form
     /**
      * Create a new form
      *
-     * Accepts an additional option `onSuccess' which is a
-     * callback that is called instead of this form's method.
+     * Accepts an additional option `onSuccess' which is a callback that is called instead of this
+     * form's method. It is called using the following signature: (Request $request, Form $form).
      *
      * @see Zend_Form::__construct()
      *
@@ -457,7 +457,7 @@ class Form extends Zend_Form
             $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, $request))
+                    && (($this->onSuccess !== null && false !== call_user_func($this->onSuccess, $request, $this))
                         || ($this->onSuccess === null && false !== $this->onSuccess($request)))) {
                     $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                 }

From 8cacd2f00f91a3d3968639dded11de0aee92268d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:00:20 +0200
Subject: [PATCH 106/277] monitoring/commands: Add `InstanceCommandForm'

The `InstanceCommandForm' should be the base class for forms that handle program-wide commands.

refs #6593
---
 .../Command/Instance/InstanceCommandForm.php  | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php b/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
new file mode 100644
index 000000000..115de29a9
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
@@ -0,0 +1,92 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Backend;
+use Icinga\Module\Monitoring\Command\Transport\CommandTransport;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
+
+/**
+ * Base class for forms that handle program-wide commands
+ */
+abstract class InstanceCommandForm extends Form
+{
+    /**
+     * Monitoring backend
+     *
+     * @var Backend
+     */
+    protected $backend;
+
+    /**
+     * Whether the form's inline
+     *
+     * @var bool
+     */
+    protected $inline = false;
+
+    /**
+     * Set the monitoring backend
+     *
+     * @param   Backend $backend
+     *
+     * @return  $this
+     */
+    public function setBackend(Backend $backend)
+    {
+        $this->backend = $backend;
+        return $this;
+    }
+
+    /**
+     * Get the monitoring backend
+     *
+     * @return Backend
+     */
+    public function getBackend()
+    {
+        return $this->backend;
+    }
+
+    /**
+     * Set the form as inline
+     *
+     * @return $this
+     */
+    public function inline()
+    {
+        $this->inline = true;
+        $this->submitLabel = null;  // Inline forms must not have a submit button
+        $class = $this->getAttrib('class');
+        if (is_array($class)) {
+            $class[] = 'inline';
+        } elseif ($class === null) {
+            $class = 'inline';
+        } else {
+            $class .= 'inline';
+        }
+        $this->setAttrib('class', $class);
+        return $this;
+    }
+
+    /**
+     * Get the transport used to send commands
+     *
+     * @param   Request $request
+     *
+     * @return  \Icinga\Module\Monitoring\Command\CommandTransportInterface
+     */
+    public function getTransport(Request $request)
+    {
+        $instance = $request->getParam('instance');
+        if ($instance !== null) {
+            $transport = CommandTransport::create($instance);
+        } else {
+            $transport = CommandTransport::first();
+        }
+        return $transport;
+    }
+}

From dae29678dd8a21c3725c9e59914cac9a439bc5c9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:01:32 +0200
Subject: [PATCH 107/277] monitoring/commands: Add `ToggleFeatureCommandForm'

`ToggleFeatureCommandForm' should be the base class for forms enabling/disabling features of an Icinga instance.

refs #6593
---
 .../Instance/ToggleFeatureCommandForm.php     | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
new file mode 100644
index 000000000..f3f795834
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
@@ -0,0 +1,90 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Base class for forms enabling/disabling features of an Icinga instance
+ */
+abstract class ToggleFeatureCommandForm extends InstanceCommandForm
+{
+    /**
+     * @var string
+     */
+    protected $feature;
+
+    /**
+     * @var string
+     */
+    protected $label;
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return \Icinga\Module\Monitoring\Command\IcingaCommand
+     */
+    abstract public function getCommand();
+
+    /**
+     * Set the feature the form enables or disables
+     *
+     * @param   string $feature
+     * @param   string $label
+     *
+     * @return  $this
+     */
+    public function setFeature($feature, $label)
+    {
+        $this->feature = $feature;
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        if (isset($formData[$this->feature])) {
+            $enabled = (bool) $formData[$this->feature];
+        } else {
+            $enabled = (bool) $this->backend
+                ->select()
+                ->from(
+                    'programstatus',
+                    array($this->feature)
+                )
+                ->getQuery()
+                ->fetchRow();
+        }
+        return array(
+            $this->createElement(
+                'checkbox',
+                $this->feature,
+                array(
+                    'label'         => $this->label,
+                    'autosubmit'    => $this->inline,
+                    'value'         => $enabled
+                )
+            )
+        );
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        $toggleFeature = $this->getCommand();
+        (bool) $request->getParam($this->feature) === true ? $toggleFeature->enable() : $toggleFeature->disable();
+        $this->getTransport($request)->send($toggleFeature);
+        Notification::success(mt('monitoring', 'Command sent'));
+        return true;
+    }
+}

From 0e63e36ec02f7ed3016536f605e23fbf5415b635 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Sep 2014 15:11:09 +0200
Subject: [PATCH 108/277] Move Icinga\Form\Config\ConfirmRemovalForm to
 Icinga\Form

This is a generic form not necessarily being used just for configuration
purposes.

refs #5525
---
 application/controllers/ConfigController.php                    | 2 +-
 application/forms/{Config => }/ConfirmRemovalForm.php           | 2 +-
 modules/monitoring/application/controllers/ConfigController.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename application/forms/{Config => }/ConfirmRemovalForm.php (92%)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f5da2952a..06cab5bb2 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -13,7 +13,7 @@ use Icinga\Form\Config\GeneralForm;
 use Icinga\Form\Config\AuthenticationBackendReorderForm;
 use Icinga\Form\Config\AuthenticationBackendConfigForm;
 use Icinga\Form\Config\ResourceForm;
-use Icinga\Form\Config\ConfirmRemovalForm;
+use Icinga\Form\ConfirmRemovalForm;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Data\ResourceFactory;
 
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
similarity index 92%
rename from application/forms/Config/ConfirmRemovalForm.php
rename to application/forms/ConfirmRemovalForm.php
index 8851bd0e3..86a2eb02a 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Config;
+namespace Icinga\Form;
 
 use Icinga\Web\Form;
 
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index b38210e5d..ce22d73df 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -5,7 +5,7 @@
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
-use Icinga\Form\Config\ConfirmRemovalForm;
+use Icinga\Form\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\BackendForm;
 use Icinga\Module\Monitoring\Form\Config\InstanceForm;
 use Icinga\Module\Monitoring\Form\Config\SecurityForm;

From d2d69b9bcd3d12ce5d69783c8361a3273faf4937 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:03:33 +0200
Subject: [PATCH 109/277] monitoring/commands: Add
 (START|STOP)_EXECUTING_HOST_CHECKS commands

`ToggleActiveHostChecks' is the command object for enableing/disabling active host checks on an Icinga instance.

refs #6593
---
 .../Instance/ToggleActiveHostChecks.php       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php
new file mode 100644
index 000000000..99ea2992f
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable active host checks on an Icinga instance
+ */
+class ToggleActiveHostChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'START_EXECUTING_HOST_CHECKS' : 'STOP_EXECUTING_HOST_CHECKS';
+    }
+}

From fda48788ffd5d669ae1f9978895f49b7dd909e75 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:05:29 +0200
Subject: [PATCH 110/277] monitoring/commands: Add
 (START|STOP)_EXECUTING_SVC_CHECKS commands

`ToggleActiveServiceChecks' is the command object for enabling/disabling active service checks on an Icinga instance.

refs #6593
---
 .../Instance/ToggleActiveServiceChecks.php    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php
new file mode 100644
index 000000000..3ad2afe25
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable active service checks on an Icinga instance
+ */
+class ToggleActiveServiceChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'START_EXECUTING_SVC_CHECKS' : 'STOP_EXECUTING_SVC_CHECKS';
+    }
+}

From 010c5b45ba192e4a93cda3341a31ec535faf537b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:06:28 +0200
Subject: [PATCH 111/277] monitoring/commands: Add
 (ENABLE|DISABLE)_EVENT_HANDLERS commands

`ToggleEventHandlers' is the command object for enabling/disabling host and service event handlers on an Icinga instance.

refs #6593
---
 .../Command/Instance/ToggleEventHandlers.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php
new file mode 100644
index 000000000..e2e6cf3a2
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable host and service event handlers on an Icinga instance
+ */
+class ToggleEventHandlers extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_EVENT_HANDLERS' : 'DISABLE_EVENT_HANDLERS';
+    }
+}

From 5474c661e10e5f01c0ac210f3a4a41c727175053 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:08:01 +0200
Subject: [PATCH 112/277] monitoring/commands: Add
 (ENABLE|DISABLE)_FLAP_DETECTION commands

`ToggleFlapDetection' is the command object for enabling/disabling host and service flap detection on an Icinga instance.

refs #6593
---
 .../Command/Instance/ToggleFlapDetection.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
new file mode 100644
index 000000000..2951d448d
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable host and service flap detection on an Icinga instance
+ */
+class ToggleFlapDetection extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_FLAP_DETECTION' : 'DISABLE_FLAP_DETECTION';
+    }
+}

From cdbd24ec9995183204d16efab2f126d81c8622f1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:08:56 +0200
Subject: [PATCH 113/277] monitoring/commands: Add
 (ENABLE|DISABLE)_NOTIFICATIONS/DISABLE_NOTIFICATIONS_EXPIRE_TIME commands

`ToggleNotifications' is the command object for enabling/disabling host and service notifications on an Icinga instance with an optional expire time for disabling notifications.

refs #6593
---
 .../Command/Instance/ToggleNotifications.php  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php
new file mode 100644
index 000000000..6b1d5e362
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php
@@ -0,0 +1,54 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable host and service notifications on an Icinga instance
+ */
+class ToggleNotifications extends ToggleFeature
+{
+    /**
+     * The time when notifications should be re-enabled after disabling
+     *
+     * @var int|null Unix timestamp
+     */
+    protected $expireTime;
+
+    /**
+     * Disable notifications with optional expire time
+     *
+     * @param   int|null $expireTime The Unix timestamp when notifications should be re-enabled after disabling
+     *
+     * @return  $this
+     */
+    public function disable($expireTime = null)
+    {
+        $this->expireTime = $expireTime !== null ? (int) $expireTime : null;
+        return parent::disable();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        if ($this->enable === true) {
+            return 'ENABLE_NOTIFICATIONS';
+        }
+        if ($this->expireTime !== null) {
+            return sprintf(
+                '%s;%u;%u',
+                'DISABLE_NOTIFICATIONS_EXPIRE_TIME',
+                time(),  // Schedule time. According to the Icinga documentation schedule time has no effect currently
+                         // and should be set to the current timestamp.
+                $this->expireTime
+            );
+        }
+        return 'DISABLE_NOTIFICATIONS';
+    }
+}

From cd29adc0bd43ca3219b0feda163c14baae75e38e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:11:51 +0200
Subject: [PATCH 114/277] monitoring/commands: Add
 (START|STOP)_OBSESSING_OVER_HOST_CHECKS commands

`ToggleObsessingOverHostChecks' is the command object for enabling/disabling processing of host checks via the OCHP command on an Icinga instance.

refs #6593
---
 .../ToggleObsessingOverHostChecks.php         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php
new file mode 100644
index 000000000..0584c5e9c
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable processing of host checks via the OCHP command on an Icinga instance
+ */
+class ToggleObsessingOverHostChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'START_OBSESSING_OVER_HOST_CHECKS' : 'STOP_OBSESSING_OVER_HOST_CHECKS';
+    }
+}

From c5e35c9614f916e91d5273f5b8b55818797394c0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:15:11 +0200
Subject: [PATCH 115/277] monitoring/commands: Add
 (START|STOP)_OBSESSING_OVER_SERVICE_CHECKS commands

`ToggleObsessingOverServiceChecks' is the command object for enabling/disabling processing of service checks via the OCHP command on an Icinga instance.

refs #6593
---
 .../ToggleObsessingOverServiceChecks.php      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php
new file mode 100644
index 000000000..86653a4ba
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable processing of service checks via the OCHP command on an Icinga instance
+ */
+class ToggleObsessingOverServiceChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'START_OBSESSING_OVER_SVC_CHECKS' : 'STOP_OBSESSING_OVER_SVC_CHECKS';
+    }
+}

From efd16ba79f36d0437bf556f2164ca8849a5808a1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:18:31 +0200
Subject: [PATCH 116/277] monitoring/commands: Add
 (ENABLE|DISABLE)_PASSIVE_HOST_CHECKS commands

`TogglePassiveHostChecks' is the command object for enabling/disabling passive host checks on an Icinga instance.

refs #6593
---
 .../Instance/TogglePassiveHostChecks.php      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php
new file mode 100644
index 000000000..7ce45d7f0
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable passive host checks on an Icinga instance
+ */
+class TogglePassiveHostChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_PASSIVE_HOST_CHECKS' : 'DISABLE_PASSIVE_HOST_CHECKS';
+    }
+}

From 0edd14559c299a5b7b34d2d4cf31079a2cefc1e8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:18:40 +0200
Subject: [PATCH 117/277] monitoring/commands: Add
 (ENABLE|DISABLE)_PASSIVE_SERVICE_CHECKS commands

`TogglePassiveServiceChecks' is the command object for enabling/disabling passive service checks on an Icinga instance.

refs #6593
---
 .../Instance/TogglePassiveServiceChecks.php   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php
new file mode 100644
index 000000000..391b372c6
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable passive service checks on an Icinga instance
+ */
+class TogglePassiveServiceChecks extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_PASSIVE_SVC_CHECKS' : 'DISABLE_PASSIVE_SVC_CHECKS';
+    }
+}

From 920c0b9c6d60b348e995f813e813f7043ec835ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 15:20:14 +0200
Subject: [PATCH 118/277] monitoring/commands: Add
 (ENABLE|DISABLE)_PERFORMANCE_DATA commands

`TogglePerformanceData' is the command object for enabling/disabling the processing of host and service performance data on an Icinga instance.

refs #6593
---
 .../Instance/TogglePerformanceData.php        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php
new file mode 100644
index 000000000..16091ca11
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php
@@ -0,0 +1,22 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
+
+/**
+ * Enable/disable the processing of host and service performance data on an Icinga instance
+ */
+class TogglePerformanceData extends ToggleFeature
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return $this->enable === true ? 'ENABLE_PERFORMANCE_DATA' : 'DISABLE_PERFORMANCE_DATA';
+    }
+}

From e2cdff67b24bab36ff58a2a16460af3db9c404ce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:16:47 +0200
Subject: [PATCH 119/277] monitoring/commands: Add form for enabling/disabling
 active host checks on an Icinga instance

refs #6593
---
 .../ToggleActiveHostChecksCommandForm.php     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php
new file mode 100644
index 000000000..0ee0fe2ee
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleActiveHostChecks;
+
+/**
+ * Form for enabling/disabling active host checks on an Icinga instance
+ */
+class ToggleActiveHostChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Active Host Checks'));
+        $this->setFeature('active_host_checks_enabled', mt('monitoring', 'Active Host Checks Being Executed'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleActiveHostChecks
+     */
+    public function getCommand()
+    {
+        return new ToggleActiveHostChecks();
+    }
+}

From deebb6486991b1bc0e6241a224a211adbaf3912d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Sep 2014 16:16:56 +0200
Subject: [PATCH 120/277] Adjust Icinga\Form\Config\General* to use
 handleRequest() & Co.

refs #5525
---
 application/controllers/ConfigController.php  |  21 +-
 .../Config/General/ApplicationConfigForm.php  | 120 +++++++
 .../Config/General/LoggingConfigForm.php      | 120 +++++++
 .../forms/Config/GeneralConfigForm.php        |  76 +++++
 application/forms/Config/GeneralForm.php      | 312 ------------------
 5 files changed, 321 insertions(+), 328 deletions(-)
 create mode 100644 application/forms/Config/General/ApplicationConfigForm.php
 create mode 100644 application/forms/Config/General/LoggingConfigForm.php
 create mode 100644 application/forms/Config/GeneralConfigForm.php
 delete mode 100644 application/forms/Config/GeneralForm.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 06cab5bb2..9bf54b2cf 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -9,7 +9,7 @@ use Icinga\Application\Modules\Module;
 use Icinga\Web\Widget;
 use Icinga\Application\Icinga;
 use Icinga\Application\Config as IcingaConfig;
-use Icinga\Form\Config\GeneralForm;
+use Icinga\Form\Config\GeneralConfigForm;
 use Icinga\Form\Config\AuthenticationBackendReorderForm;
 use Icinga\Form\Config\AuthenticationBackendConfigForm;
 use Icinga\Form\Config\ResourceForm;
@@ -47,23 +47,12 @@ class ConfigController extends BaseConfigController
      */
     public function indexAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
-        $this->view->tabs->activate('index');
-
-        $form = new GeneralForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                if ($this->writeConfigFile($form->getConfiguration(), 'config')) {
-                    Notification::success($this->translate('New configuration has successfully been stored'));
-                    $this->redirectNow('config');
-                }
-            }
-        } else {
-            $form->setConfiguration(IcingaConfig::app());
-        }
+        $form = new GeneralConfigForm();
+        $form->setConfig(IcingaConfig::app());
+        $form->handleRequest();
 
         $this->view->form = $form;
+        $this->view->tabs->activate('index');
     }
 
     /**
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
new file mode 100644
index 000000000..89e75f66a
--- /dev/null
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -0,0 +1,120 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\General;
+
+use DateTimeZone;
+use Icinga\Web\Form;
+use Icinga\Util\Translator;
+use Icinga\Data\ResourceFactory;
+
+/**
+ * Form class to modify the general application configuration
+ */
+class ApplicationConfigForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_general_application');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $elements = array();
+
+        $languages = array();
+        foreach (Translator::getAvailableLocaleCodes() as $language) {
+            $languages[$language] = $language;
+        }
+
+        $elements[] = $this->createElement(
+            'select',
+            'global_language',
+            array(
+                'label'         => t('Default Language'),
+                'required'      => true,
+                'multiOptions'  => $languages,
+                'helptext'      => t(
+                    'Select the language to use by default. Can be overwritten by a user in his preferences.'
+                )
+            )
+        );
+
+        $tzList = array();
+        foreach (DateTimeZone::listIdentifiers() as $tz) {
+            $tzList[$tz] = $tz;
+        }
+
+        $elements[] = $this->createElement(
+            'select',
+            'global_timezone',
+            array(
+                'label'         => t('Default Application Timezone'),
+                'required'      => true,
+                'multiOptions'  => $tzList,
+                'helptext'      => t(
+                    'Select the timezone to be used as the default. User\'s can set their own timezone if'
+                    . ' they like to, but this is the timezone to be used as the default setting .'
+                ),
+                'value'         => date_default_timezone_get()
+            )
+        );
+
+        $elements[] = $this->createElement(
+            'text',
+            'global_modulePath',
+            array(
+                'label'     => t('Module Path'),
+                'required'  => true,
+                'helptext'  => t(
+                    '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.'
+                ),
+                'value'     => realpath(ICINGAWEB_APPDIR . '/../modules')
+            )
+        );
+
+        $elements[] = $this->createElement(
+            'select',
+            'preferences_type',
+            array(
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => t('User Preference Storage Type'),
+                'multiOptions'  => array(
+                    'ini'   => t('File System (INI Files)'),
+                    'db'    => t('Database'),
+                    'null'  => t('Don\'t Store Preferences')
+                )
+            )
+        );
+        if (isset($formData['preferences_type']) && $formData['preferences_type'] === 'db') {
+            $backends = array();
+            foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
+                if ($resource['type'] === 'db') {
+                    $backends[$name] = $name;
+                }
+            }
+
+            $elements[] = $this->createElement(
+                'select',
+                'preferences_resource',
+                array(
+                    'required'      => true,
+                    'multiOptions'  => $backends,
+                    'label'         => t('Database Connection')
+                )
+            );
+        }
+
+        return $elements;
+    }
+}
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
new file mode 100644
index 000000000..f91ce74b5
--- /dev/null
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -0,0 +1,120 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\General;
+
+use Icinga\Application\Icinga;
+use Icinga\Web\Form;
+use Icinga\Web\Form\Validator\WritablePathValidator;
+
+class LoggingConfigForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_general_logging');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $elements = array();
+
+        $elements[] = $this->createElement(
+            'select',
+            'logging_level',
+            array(
+                'required'      => true,
+                'label'         => t('Logging Level'),
+                'helptext'      => t('The maximum loglevel to emit.'),
+                'multiOptions'  => array(
+                    0 => t('None'),
+                    1 => t('Error'),
+                    2 => t('Warning'),
+                    3 => t('Information'),
+                    4 => t('Debug')
+                )
+            )
+        );
+        $elements[] = $this->createElement(
+            'select',
+            'logging_type',
+            array(
+                'required'      => true,
+                'class'         => 'autosubmit',
+                'label'         => t('Logging Type'),
+                'helptext'      => t('The type of logging to utilize.'),
+                'multiOptions'  => array(
+                    'syslog'    => 'Syslog',
+                    'file'      => t('File')
+                )
+            )
+        );
+
+        if (false === isset($formData['logging_type']) || $formData['logging_type'] === 'syslog') {
+            $elements[] = $this->createElement(
+                'text',
+                'logging_application',
+                array(
+                    'required'      => true,
+                    'label'         => t('Application Prefix'),
+                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
+                    'value'         => 'icingaweb',
+                    'validators'    => array(
+                        array(
+                            'Regex',
+                            false,
+                            array(
+                                'pattern'  => '/^[^\W]+$/',
+                                'messages' => array(
+                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
+                                )
+                            )
+                        )
+                    )
+                )
+            );
+            $elements[] = $this->createElement(
+                'select',
+                'logging_facility',
+                array(
+                    'required'      => true,
+                    'label'         => t('Facility'),
+                    'helptext'      => t('The Syslog facility to utilize.'),
+                    'multiOptions'  => array(
+                        'LOG_USER'  => 'LOG_USER'
+                    )
+                )
+            );
+        } elseif ($formData['logging_type'] === 'file') {
+            $elements[] = $this->createElement(
+                'text',
+                'logging_target',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('The logfile to write messages to.'),
+                    'value'         => $this->getDefaultLogDir(),
+                    'validators'    => array(new WritablePathValidator())
+                )
+            );
+        }
+
+        return $elements;
+    }
+
+    /**
+     * Return the default logging directory for type "file"
+     *
+     * @return  string
+     */
+    protected function getDefaultLogDir()
+    {
+        return realpath(Icinga::app()->getApplicationDir('../var/log/icingaweb.log'));
+    }
+}
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
new file mode 100644
index 000000000..29aac89fb
--- /dev/null
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -0,0 +1,76 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config;
+
+use Icinga\Web\Request;
+use Icinga\Web\Notification;
+use Icinga\Form\ConfigForm;
+use Icinga\Form\Config\General\LoggingConfigForm;
+use Icinga\Form\Config\General\ApplicationConfigForm;
+
+/**
+ * Form class for application-wide and logging specific settings
+ */
+class GeneralConfigForm extends ConfigForm
+{
+    /**
+     * Initialize this configuration form
+     */
+    public function init()
+    {
+        $this->setName('form_config_general');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $appConfigForm = new ApplicationConfigForm();
+        $loggingConfigForm = new LoggingConfigForm();
+
+        return array_merge(
+            $appConfigForm->createElements($formData),
+            $loggingConfigForm->createElements($formData)
+        );
+    }
+
+    /**
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->getValues() as $sectionAndPropertyName => $value) {
+            list($section, $property) = explode('_', $sectionAndPropertyName);
+            if (isset($this->config->{$section})) {
+                $this->config->{$section}->{$property} = $value;
+            } else {
+                $this->config->{$section} = array($property => $value);
+            }
+        }
+
+        if ($this->save()) {
+            Notification::success(t('New configuration has successfully been stored'));
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @see Form::onShow()
+     */
+    public function onShow(Request $request)
+    {
+        $values = array();
+        foreach ($this->config as $section => $properties) {
+            foreach ($properties as $name => $value) {
+                $values[$section . '_' . $name] = $value;
+            }
+        }
+
+        $this->populate($values);
+    }
+}
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
deleted file mode 100644
index 23f27f31e..000000000
--- a/application/forms/Config/GeneralForm.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Config;
-
-use DateTimeZone;
-use Zend_Config;
-use Icinga\Web\Form;
-use Icinga\Util\Translator;
-use Icinga\Application\Icinga;
-use Icinga\Data\ResourceFactory;
-use Icinga\Web\Form\Validator\WritablePathValidator;
-
-/**
- * Configuration form for general, application-wide settings
- */
-class GeneralForm extends Form
-{
-    /**
-     * Initialize this configuration form
-     */
-    public function init()
-    {
-        $this->setName('form_config_general');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $elements = array(
-            $this->getLanguageSelection(),
-            $this->getTimezoneSelection(),
-            $this->getModulePathInput()
-        );
-
-        return array_merge(
-            $elements,
-            $this->getPreferencesElements($formData),
-            $this->getLoggingElements($formData)
-        );
-    }
-
-    /**
-     * Populate this form with the given configuration
-     *
-     * @param   Zend_Config     $config     The configuration to populate this form with
-     *
-     * @return  self
-     */
-    public function setConfiguration(Zend_Config $config)
-    {
-        $defaults = array();
-        foreach ($config as $section => $properties) {
-            foreach ($properties as $name => $value) {
-                $defaults[$section . '_' . $name] = $value;
-            }
-        }
-
-        $this->populate($defaults);
-        return $this;
-    }
-
-    /**
-     * Return the configured configuration values
-     *
-     * @return  Zend_Config
-     */
-    public function getConfiguration()
-    {
-        $config = array();
-        $values = $this->getValues();
-        foreach ($values as $sectionAndPropertyName => $value) {
-            list($section, $property) = explode('_', $sectionAndPropertyName);
-            $config[$section][$property] = $value;
-        }
-
-        return new Zend_Config($config);
-    }
-
-    /**
-     * Return a select field for setting the default language
-     *
-     * Possible values are determined by Translator::getAvailableLocaleCodes.
-     *
-     * @return  Zend_Form_Element
-     */
-    protected function getLanguageSelection()
-    {
-        $languages = array();
-        foreach (Translator::getAvailableLocaleCodes() as $language) {
-            $languages[$language] = $language;
-        }
-
-        return $this->createElement(
-            'select',
-            'global_language',
-            array(
-                'label'         => t('Default Language'),
-                'required'      => true,
-                'multiOptions'  => $languages,
-                'helptext'      => t(
-                    'Select the language to use by default. Can be overwritten by a user in his preferences.'
-                )
-            )
-        );
-    }
-
-    /**
-     * Return a select field for setting the default timezone
-     *
-     * Possible values are determined by DateTimeZone::listIdentifiers.
-     *
-     * @return  Zend_Form_Element
-     */
-    protected function getTimezoneSelection()
-    {
-        $tzList = array();
-        foreach (DateTimeZone::listIdentifiers() as $tz) {
-            $tzList[$tz] = $tz;
-        }
-
-        $this->addElement(
-            'select',
-            'global_timezone',
-            array(
-                'label'         => t('Default Application Timezone'),
-                'required'      => true,
-                'multiOptions'  => $tzList,
-                'helptext'      => t(
-                    'Select the timezone to be used as the default. User\'s can set their own timezone if'
-                    . ' they like to, but this is the timezone to be used as the default setting .'
-                ),
-                'value'         => date_default_timezone_get()
-            )
-        );
-    }
-
-    /**
-     * Return a input field for setting the module path
-     */
-    protected function getModulePathInput()
-    {
-        $this->addElement(
-            'text',
-            'global_modulePath',
-            array(
-                'label'     => t('Module Path'),
-                'required'  => true,
-                'helptext'  => t(
-                    '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.'
-                ),
-                'value'     => realpath(ICINGAWEB_APPDIR . '/../modules')
-            )
-        );
-    }
-
-    /**
-     * Return form elements for setting the user preference storage backend
-     *
-     * @param   array   $formData   The data sent by the user
-     */
-    protected function getPreferencesElements(array $formData)
-    {
-        $elements = array(
-            $this->createElement(
-                'select',
-                'preferences_type',
-                array(
-                    'required'      => true,
-                    'class'         => 'autosubmit',
-                    'label'         => t('User Preference Storage Type'),
-                    'multiOptions'  => array(
-                        'ini'   => t('File System (INI Files)'),
-                        'db'    => t('Database'),
-                        'null'  => t('Don\'t Store Preferences')
-                    )
-                )
-            )
-        );
-
-        if (isset($formData['preferences_type']) && $formData['preferences_type'] === 'db') {
-            $backends = array();
-            foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
-                if ($resource['type'] === 'db') {
-                    $backends[$name] = $name;
-                }
-            }
-
-            $elements[] = $this->createElement(
-                'select',
-                'preferences_resource',
-                array(
-                    'required'      => true,
-                    'multiOptions'  => $backends,
-                    'label'         => t('Database Connection')
-                )
-            );
-        }
-
-        return $elements;
-    }
-
-    /**
-     * Return form elements to setup the application's logging
-     *
-     * @param   array   $formData   The data sent by the user
-     *
-     * @return  array
-     */
-    protected function getLoggingElements(array $formData)
-    {
-        $elements = array();
-
-        $elements[] = $this->createElement(
-            'select',
-            'logging_level',
-            array(
-                'required'      => true,
-                'label'         => t('Logging Level'),
-                'helptext'      => t('The maximum loglevel to emit.'),
-                'multiOptions'  => array(
-                    0 => t('None'),
-                    1 => t('Error'),
-                    2 => t('Warning'),
-                    3 => t('Information'),
-                    4 => t('Debug')
-                )
-            )
-        );
-        $elements[] = $this->createElement(
-            'select',
-            'logging_type',
-            array(
-                'required'      => true,
-                'class'         => 'autosubmit',
-                'label'         => t('Logging Type'),
-                'helptext'      => t('The type of logging to utilize.'),
-                'multiOptions'  => array(
-                    'syslog'    => 'Syslog',
-                    'file'      => t('File')
-                )
-            )
-        );
-
-        if (false === isset($formData['logging_type']) || $formData['logging_type'] === 'syslog') {
-            $elements[] = $this->createElement(
-                'text',
-                'logging_application',
-                array(
-                    'required'      => true,
-                    'label'         => t('Application Prefix'),
-                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
-                    'value'         => 'icingaweb',
-                    'validators'    => array(
-                        array(
-                            'Regex',
-                            false,
-                            array(
-                                'pattern'  => '/^[^\W]+$/',
-                                'messages' => array(
-                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
-                                )
-                            )
-                        )
-                    )
-                )
-            );
-            $elements[] = $this->createElement(
-                'select',
-                'logging_facility',
-                array(
-                    'required'      => true,
-                    'label'         => t('Facility'),
-                    'helptext'      => t('The Syslog facility to utilize.'),
-                    'multiOptions'  => array(
-                        'LOG_USER'  => 'LOG_USER'
-                    )
-                )
-            );
-        } elseif ($formData['logging_type'] === 'file') {
-            $elements[] = $this->createElement(
-                'text',
-                'logging_target',
-                array(
-                    'required'      => true,
-                    'label'         => t('Filepath'),
-                    'helptext'      => t('The logfile to write messages to.'),
-                    'value'         => $this->getDefaultLogDir(),
-                    'validators'    => array(new WritablePathValidator())
-                )
-            );
-        }
-
-        return $elements;
-    }
-
-    /**
-     * Return the default logging directory for type "file"
-     *
-     * @return  string
-     */
-    protected function getDefaultLogDir()
-    {
-        return realpath(Icinga::app()->getApplicationDir('../var/log/icingaweb.log'));
-    }
-}

From e8b70ffccd7db74e10fc4c353d18e0fdf575e282 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:17:13 +0200
Subject: [PATCH 121/277] monitoring/commands: Add form for enabling/disabling
 active service checks on an Icinga instance

refs #6593
---
 .../ToggleActiveServiceChecksCommandForm.php  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php
new file mode 100644
index 000000000..8d412392a
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleActiveServiceChecks;
+
+/**
+ * Form for enabling/disabling active service checks on an Icinga instance
+ */
+class ToggleActiveServiceChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Active Service Checks'));
+        $this->setFeature('active_service_checks_enabled', mt('monitoring', 'Active Service Checks Being Executed'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleActiveServiceChecks
+     */
+    public function getCommand()
+    {
+        return new ToggleActiveServiceChecks();
+    }
+}

From 939f8b82cc11fe3e335ef13ddb0c8613c3235fbd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:18:23 +0200
Subject: [PATCH 122/277] monitoring/commands: Add form enabling/disabling host
 and service event handlers on an Icinga instance

refs #6593
---
 .../ToggleEventHandlersCommandForm.php        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php
new file mode 100644
index 000000000..a90fb529a
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleEventHandlers;
+
+/**
+ * Form for enabling/disabling host and service event handlers on an Icinga instance
+ */
+class ToggleEventHandlersCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Event Handlers'));
+        $this->setFeature('event_handlers_enabled', mt('monitoring', 'Event Handlers Enabled'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleEventHandlers
+     */
+    public function getCommand()
+    {
+        return new ToggleEventHandlers();
+    }
+}

From 5a100ea99f15c4f7903677c5a482797c4b83f912 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:19:37 +0200
Subject: [PATCH 123/277] monitoring/commands: Add form for enabling/disabling
 host and service flap detection on an Icinga instance

refs #6593
---
 .../ToggleFlapDetectionCommandForm.php        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php
new file mode 100644
index 000000000..a436ec2ff
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleFlapDetection;
+
+/**
+ * Form for enabling/disabling host and service flap detection on an Icinga instance
+ */
+class ToggleFlapDetectionCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Flap Detection'));
+        $this->setFeature('flap_detection_enabled', mt('monitoring', 'Flap Detection Enabled'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleFlapDetection
+     */
+    public function getCommand()
+    {
+        return new ToggleFlapDetection();
+    }
+}

From ff10cdaf033744ce82e46f2abb61170d948c880f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:20:07 +0200
Subject: [PATCH 124/277] monitoring/commands: Add form for enabling/disabling
 processing of host checks via the OCHP command on an Icinga instance

refs #6593
---
 ...ggleObsessingOverHostChecksCommandForm.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php
new file mode 100644
index 000000000..3e230e639
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleObsessingOverHostChecks;
+
+/**
+ * Form for enabling/disabling processing of host checks via the OCHP command on an Icinga instance
+ */
+class ToggleObsessingOverHostChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Obsessing Over Host Checks'));
+        $this->setFeature('obsess_over_hosts', mt('monitoring', 'Obsessing Over Hosts'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleObsessingOverHostChecks
+     */
+    public function getCommand()
+    {
+        return new ToggleObsessingOverHostChecks();
+    }
+}

From 176a1a72ca81e60f831619587d4e8a2fd96eb22c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:20:31 +0200
Subject: [PATCH 125/277] monitoring/commands: Add form for enabling/disabling
 processing of service checks via the OCHP command on an Icinga instance

refs #6593
---
 ...eObsessingOverServiceChecksCommandForm.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php
new file mode 100644
index 000000000..012ccb73e
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleObsessingOverServiceChecks;
+
+/**
+ * Form for enabling/disabling processing of service checks via the OCHP command on an Icinga instance
+ */
+class ToggleObsessingOverServiceChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Obsessing Over Service Checks'));
+        $this->setFeature('obsess_over_services', mt('monitoring', 'Obsessing Over Services'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleObsessingOverServiceChecks
+     */
+    public function getCommand()
+    {
+        return new ToggleObsessingOverServiceChecks();
+    }
+}

From 8686074fb1f7146c4050a7efbcf06cd1cb60c1a2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:20:56 +0200
Subject: [PATCH 126/277] monitoring/commands: Add form for enabling/disabling
 passive host checks on an Icinga instance

refs #6593
---
 .../TogglePassiveHostChecksCommandForm.php    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php
new file mode 100644
index 000000000..0c9b657b9
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\TogglePassiveHostChecks;
+
+/**
+ * Form for enabling/disabling passive host checks on an Icinga instance
+ */
+class TogglePassiveHostChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Passive Host Checks'));
+        $this->setFeature('passive_host_checks_enabled', mt('monitoring', 'Passive Host Checks Being Accepted'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return TogglePassiveHostChecks
+     */
+    public function getCommand()
+    {
+        return new TogglePassiveHostChecks();
+    }
+}

From d47951f9d6e5082bf7c2a82da3643ef907d6b7eb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:21:23 +0200
Subject: [PATCH 127/277] monitoring/commands: Add form for enabling/disabling
 passive service checks on an Icinga instance

refs #6593
---
 .../TogglePassiveServiceChecksCommandForm.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php
new file mode 100644
index 000000000..09db8e625
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\TogglePassiveServiceChecks;
+
+/**
+ * Form for enabling/disabling passive service checks on an Icinga instance
+ */
+class TogglePassiveServiceChecksCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Passive Service Checks'));
+        $this->setFeature('passive_service_checks_enabled', mt('monitoring', 'Passive Service Checks Being Accepted'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return TogglePassiveServiceChecks
+     */
+    public function getCommand()
+    {
+        return new TogglePassiveServiceChecks();
+    }
+}

From c005ef434efcb302cfe0840ef58621a3eacee926 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Sep 2014 16:21:49 +0200
Subject: [PATCH 128/277] monitoring/commands: Add form for enabling/disabling
 the processing of host and service performance data on an Icinga instance

refs #6593
---
 .../TogglePerformanceDataCommandForm.php      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php
new file mode 100644
index 000000000..b151cbb1b
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\TogglePerformanceData;
+
+/**
+ * Form for enabling/disabling the processing of host and service performance data on an Icinga instance
+ */
+class TogglePerformanceDataCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Performance Data'));
+        $this->setFeature('process_performance_data', mt('monitoring', 'Performance Data Being Processed'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return TogglePerformanceData
+     */
+    public function getCommand()
+    {
+        return new TogglePerformanceData();
+    }
+}

From 4b210f95ea696b8bf5ed84ab6c862a42935995c6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 09:51:40 +0200
Subject: [PATCH 129/277] monitoring/commands: Remove `CommandForm' which will
 be replaced

Remove the rubbish.

refs #6593
---
 .../application/forms/Command/CommandForm.php | 156 ------------------
 1 file changed, 156 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Command/CommandForm.php

diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
deleted file mode 100644
index df1bed008..000000000
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Zend_Config;
-use Zend_Controller_Request_Abstract;
-use Zend_Form_Element_Hidden;
-use Icinga\Module\Monitoring\Command\AcknowledgeCommand;
-use Icinga\Web\Form;
-
-/**
- * Simple confirmation command
- */
-abstract class CommandForm extends Form
-{
-    /**
-     * If the form is for a global command
-     *
-     * @var bool
-     */
-    protected $globalCommand = false;
-
-    /**
-     * Set command program wide
-     *
-     * @param bool $flag
-     */
-    public function setProvideGlobalCommand($flag = true)
-    {
-        $this->globalCommand = (boolean) $flag;
-    }
-
-    /**
-     * Getter for globalCommand
-     *
-     * @return bool
-     */
-    public function provideGlobalCommand()
-    {
-        return (boolean) $this->globalCommand;
-    }
-
-    /**
-     * Create an instance name containing hidden field
-     *
-     * @return Zend_Form_Element_Hidden
-     */
-    private function createInstanceHiddenField()
-    {
-        $field = new Zend_Form_Element_Hidden('instance');
-        $value = $this->getRequest()->getParam($field->getName());
-        $field->setValue($value);
-        return $field;
-    }
-
-    /**
-     * Add elements to this form (used by extending classes)
-     *
-     * @see Form::create
-     */
-    protected function create()
-    {
-        $this->addElement($this->createInstanceHiddenField());
-    }
-
-    /**
-     * Get the author name
-     *
-     * @return string
-     */
-    protected function getAuthorName()
-    {
-        if (is_a($this->getRequest(), "Zend_Controller_Request_HttpTestCase")) {
-            return "Test user";
-        }
-        return $this->getRequest()->getUser()->getUsername();
-    }
-
-    /**
-     * Creator for author field
-     *
-     * @return Zend_Form_Element_Hidden
-     */
-    protected function createAuthorField()
-    {
-        $authorName = $this->getAuthorName();
-
-        $authorField = new Zend_Form_Element_Hidden(
-            array(
-                'name'       => 'author',
-                'label'      => t('Author (Your Name)'),
-                'value'      => $authorName,
-                'required'   => true
-            )
-        );
-
-        $authorField->addDecorator(
-            'Callback',
-            array(
-                'callback' => function () use ($authorName) {
-                    return sprintf('<strong>%s</strong>', $authorName);
-                }
-            )
-        );
-
-        return $authorField;
-    }
-
-    /**
-     * Get a list of valid datetime formats
-     *
-     * @return array
-     */
-    public function getValidDateTimeFormats()
-    {
-        $config = $this->getConfiguration();
-        $global = $config->global;
-        if ($global === null) {
-            $global = new Zend_Config(array());
-        }
-        $preferences = $this->getUserPreferences();
-        return array(
-            implode(
-                ' ',
-                array(
-                    $preferences->get('app.dateFormat', $global->get('dateFormat', 'd/m/Y')),
-                    $preferences->get('app.timeFormat', $global->get('timeFormat', 'g:i A'))
-                )
-            )
-        );
-    }
-
-    /**
-     * Sets the form to global if we have data in the request
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        parent::setRequest($request);
-
-        if ($request->getParam('global')) {
-            $this->setProvideGlobalCommand(true);
-        }
-    }
-
-
-    /**
-     * Create command object for CommandPipe protocol
-     *
-     * @return AcknowledgeCommand
-     */
-    abstract public function createCommand();
-}

From c27c5690ba5be22f61e71587799f98a21a1f93f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 09:55:38 +0200
Subject: [PATCH 130/277] monitoring/commands: Rename `InstanceCommandForm' to
 `CommandForm'

Since the old `CommandForm' is removed, `InstanceCommandForm' is now the new base class for all command forms.

refs #6593
---
 .../{Instance/InstanceCommandForm.php => CommandForm.php}   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename modules/monitoring/application/forms/Command/{Instance/InstanceCommandForm.php => CommandForm.php} (91%)

diff --git a/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
similarity index 91%
rename from modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
rename to modules/monitoring/application/forms/Command/CommandForm.php
index 115de29a9..4a0be0e32 100644
--- a/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Command\Transport\CommandTransport;
@@ -10,9 +10,9 @@ use Icinga\Web\Form;
 use Icinga\Web\Request;
 
 /**
- * Base class for forms that handle program-wide commands
+ * Base class for command forms
  */
-abstract class InstanceCommandForm extends Form
+abstract class CommandForm extends Form
 {
     /**
      * Monitoring backend

From ae180166b37f47103f8459e5c84988f46e324c8b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 09:57:15 +0200
Subject: [PATCH 131/277] monitoring/commands: Let `ToggleFeatureCommandForm'
 extend `CommandForm'

`InstanceCommandForm' was renamed to `CommandForm'.

efs #659
---
 .../forms/Command/Instance/ToggleFeatureCommandForm.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
index f3f795834..40413cced 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
@@ -4,13 +4,14 @@
 
 namespace Icinga\Module\Monitoring\Form\Command\Instance;
 
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
 /**
  * Base class for forms enabling/disabling features of an Icinga instance
  */
-abstract class ToggleFeatureCommandForm extends InstanceCommandForm
+abstract class ToggleFeatureCommandForm extends CommandForm
 {
     /**
      * @var string
@@ -25,7 +26,7 @@ abstract class ToggleFeatureCommandForm extends InstanceCommandForm
     /**
      * Get the command which is to be sent to an Icinga instance
      *
-     * @return \Icinga\Module\Monitoring\Command\IcingaCommand
+     * @return \Icinga\Module\Monitoring\Command\ToggleFeature
      */
     abstract public function getCommand();
 

From 7143837ae3c2c8c0907cc86ea1273097daafc31e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 15:04:23 +0200
Subject: [PATCH 132/277] lib: Remove `ElementWrapper' form element decorator

Zend has a `Label' decorator already.

refs #5525
---
 .../Web/Form/Decorator/ElementWrapper.php     | 70 -------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 library/Icinga/Web/Form/Decorator/ElementWrapper.php

diff --git a/library/Icinga/Web/Form/Decorator/ElementWrapper.php b/library/Icinga/Web/Form/Decorator/ElementWrapper.php
deleted file mode 100644
index b9c6e0ba7..000000000
--- a/library/Icinga/Web/Form/Decorator/ElementWrapper.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Form\Decorator;
-
-use Zend_Form_Decorator_Abstract;
-
-/**
- * Decorator that wraps form elements with their labels to allow easier styling
- *
- * Labels are drawn for all elements, except hidden, button and submit elements. If you want a
- * placeholder for these elements, set the 'addLabelPlaceholder' property. This can be useful in
- * cases where you want to put inputs with and inputs without labels on the same line and don't
- * want buttons to 'jump'
- */
-class ElementWrapper extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * An array of elements that won't get a <label> dom added per default
-     *
-     * @var array
-     */
-    protected static $noLabel = array(
-        'Zend_Form_Element_Hidden',
-        'Zend_Form_Element_Button',
-        'Zend_Form_Element_Submit'
-    );
-
-    /**
-     * Return the DOM for the element label
-     *
-     * @param   String  $elementName    The name of the element
-     *
-     * @return  String                  The DOM for the form element's label
-     */
-    public function getLabel($elementName)
-    {
-        $label = $this->getElement()->getLabel();
-        if (! $label) {
-            $label = '&nbsp;';
-        }
-
-        if (in_array($this->getElement()->getType(), self::$noLabel)
-            && false === $this->getElement()->getAttrib('addLabelPlaceholder', false)) {
-            $label = '';
-        } else {
-            if (in_array($this->getElement()->getType(), self::$noLabel)) {
-                $label = '&nbsp;';
-            }
-            $label = '<label for="' . $elementName . '">' . $label . '</label>';
-        }
-
-        return $label;
-    }
-
-    /**
-     * Render this element
-     *
-     * @param   String  $content    The content of the form element
-     *
-     * @return  String              The decorated form element
-     */
-    public function render($content)
-    {
-        $elementName = $this->getElement()->getName();
-        $label = $this->getLabel($elementName);
-        return '<div class="form-element" id="' . $elementName . '-element">' . $label . $content . '</div>';
-    }
-}

From 8478ef3fcec5a3e5b6cb66669e54ea60e231484a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 15:05:47 +0200
Subject: [PATCH 133/277] lib: Remove `HelpText' form element decorator

Zend already has a `Description' decorator.

refs #5525
---
 .../Icinga/Web/Form/Decorator/HelpText.php    | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 library/Icinga/Web/Form/Decorator/HelpText.php

diff --git a/library/Icinga/Web/Form/Decorator/HelpText.php b/library/Icinga/Web/Form/Decorator/HelpText.php
deleted file mode 100644
index 970da5cfb..000000000
--- a/library/Icinga/Web/Form/Decorator/HelpText.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Form\Decorator;
-
-use Zend_Form_Decorator_Abstract;
-
-/**
- * Decorator that automatically adds a helptext to an input element
- * when the 'helptext' attribute is set
- */
-class HelpText extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Add a helptext to an input field
-     *
-     * @param   string $content The help text
-     *
-     * @return  string The generated tag
-     */
-    public function render($content = '')
-    {
-        $attributes = $this->getElement()->getAttribs();
-        $visible = true;
-        if (isset($attributes['condition'])) {
-            $visible = $attributes['condition'] == '1';
-        }
-        if (isset($attributes['helptext']) && $visible) {
-            $content =  $content
-                . '<p class="help-block">'
-                . $attributes['helptext']
-                . '</p>';
-        }
-        return $content;
-    }
-}

From d4c4ab7b2c9373647f551443fa44da3e8106dc3e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 15:23:07 +0200
Subject: [PATCH 134/277] lib/form: Fix default element decorators but breaking
 noscript layout

Replaced `ElementWrapper' and `HelpText' with Zend's `HtmlTag' and `Label' respectively.

Instances of Zend_Form_Element returned by `Form::createElements()' now receive our desired default decorators.

refs #5525
---
 library/Icinga/Web/Form.php | 69 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index cae745be5..78755f00b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -99,7 +99,15 @@ class Form extends Zend_Form
         if ($this->onSuccess !== null && false === is_callable($this->onSuccess)) {
             throw new LogicException('The option `onSuccess\' is not callable');
         }
-
+        if (! isset($options['elementDecorators'])) {
+            $options['elementDecorators'] = array(
+                'ViewHelper',
+                'Errors',
+                array('Description', array('tag' => 'span', 'class' => 'description')),
+                'Label',
+                array('HtmlTag', array('tag' => 'div'))
+            );
+        }
         parent::__construct($options);
     }
 
@@ -333,8 +341,12 @@ class Form extends Zend_Form
                 'submit',
                 'btn_submit',
                 array(
-                    'ignore'    => true,
-                    'label'     => $this->submitLabel
+                    'ignore'        => true,
+                    'label'         => $this->submitLabel,
+                    'decorators'    => array(
+                        'ViewHelper',
+                        array('HtmlTag', array('tag' => 'div'))
+                    )
                 )
             );
         }
@@ -357,36 +369,23 @@ class Form extends Zend_Form
      */
     public function createElement($type, $name, $options = null)
     {
-        $el = parent::createElement($type, $name, $options);
-
-        if ($el) {
-            if (strpos(strtolower(get_class($el)), 'hidden') !== false) {
-                $el->setDecorators(array('ViewHelper'));
-            } else {
-                $el->removeDecorator('HtmlTag');
-                $el->removeDecorator('Label');
-                $el->removeDecorator('DtDdWrapper');
-
-                if ($el->getAttrib('autosubmit')) {
-                    // Need to add this decorator first or it interferes with the other's two HTML otherwise
-                    $el->addDecorator(new NoScriptApply()); // Non-JS environments
-                    $class = $el->getAttrib('class');
-                    if (is_array($class)) {
-                        $class[] = 'autosubmit';
-                    } elseif ($class === null) {
-                        $class = 'autosubmit';
-                    } else {
-                        $class .= ' autosubmit';
-                    }
-                    $el->setAttrib('class', $class); // JS environments
-                    unset($el->autosubmit);
-                }
-
-                $el->addDecorator(new ElementWrapper());
-                $el->addDecorator(new HelpText());
-            }
+        if (is_array($options) && ! isset($options['disableLoadDefaultDecorators'])) {
+            $options['disableLoadDefaultDecorators'] = true;
+        }
+        $el = parent::createElement($type, $name, $options);
+        if ($el && $el->getAttrib('autosubmit')) {
+            $el->addDecorator(new NoScriptApply()); // Non-JS environments
+            $class = $el->getAttrib('class');
+            if (is_array($class)) {
+                $class[] = 'autosubmit';
+            } elseif ($class === null) {
+                $class = 'autosubmit';
+            } else {
+                $class .= ' autosubmit';
+            }
+            $el->setAttrib('class', $class); // JS environments
+            unset($el->autosubmit);
         }
-
         return $el;
     }
 
@@ -556,7 +555,6 @@ class Form extends Zend_Form
         if ($this->loadDefaultDecoratorsIsDisabled()) {
             return $this;
         }
-
         $decorators = $this->getDecorators();
         if (empty($decorators)) {
             if ($this->viewScript) {
@@ -565,12 +563,11 @@ class Form extends Zend_Form
                     'form'          => $this
                 ));
             } else {
-                $this->addDecorator('FormElements')
-                    //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
+                $this
+                    ->addDecorator('FormElements')
                     ->addDecorator('Form');
             }
         }
-
         return $this;
     }
 

From 39bb01b43352a1f6bb561ac0f34371c52754b25b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 14:35:01 +0200
Subject: [PATCH 135/277] Rename Icinga\Web\Form::onShow() to onRequest()

onShow() is misleading because at the time this method is being called the
form is neither shown nor created.

refs #5525
---
 .../forms/Config/AuthenticationBackendConfigForm.php        | 4 ++--
 application/forms/Config/GeneralConfigForm.php              | 4 ++--
 library/Icinga/Web/Form.php                                 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 2a882ff2b..660658404 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -231,11 +231,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
     /**
      * Populate the form in case an authentication backend is being edited
      *
-     * @see Form::onShow()
+     * @see Form::onRequest()
      *
      * @throws  ConfigurationError      In case the backend name is missing in the request or is invalid
      */
-    public function onShow(Request $request)
+    public function onRequest(Request $request)
     {
         $authBackend = $request->getQuery('auth_backend');
         if ($authBackend !== null) {
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 29aac89fb..ea89e1b76 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -60,9 +60,9 @@ class GeneralConfigForm extends ConfigForm
     }
 
     /**
-     * @see Form::onShow()
+     * @see Form::onRequest()
      */
-    public function onShow(Request $request)
+    public function onRequest(Request $request)
     {
         $values = array();
         foreach ($this->config as $section => $properties) {
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 78755f00b..7f858f26a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -321,7 +321,7 @@ class Form extends Zend_Form
      *
      * @param   Request     $request    The current request
      */
-    public function onShow(Request $request)
+    public function onRequest(Request $request)
     {
 
     }
@@ -439,7 +439,7 @@ class Form extends Zend_Form
      * Process the given request using this form
      *
      * Redirects to the url set with setRedirectUrl() upon success. See onSuccess()
-     * and onShow() wherewith you can customize the processing logic.
+     * and onRequest() wherewith you can customize the processing logic.
      *
      * @param   Request     $request    The request to be processed
      *
@@ -465,7 +465,7 @@ class Form extends Zend_Form
                 $this->isValidPartial($formData);
             }
         } else {
-            $this->onShow($request);
+            $this->onRequest($request);
         }
 
         return $request;

From aedc8cc8b1ba21e1ca604f30d576ba8d44fa23f4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 14:42:06 +0200
Subject: [PATCH 136/277] Fix spelling issue in german translation catalog

---
 application/locale/de_DE/LC_MESSAGES/icinga.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.po b/application/locale/de_DE/LC_MESSAGES/icinga.po
index e174b6621..205cd7f3d 100644
--- a/application/locale/de_DE/LC_MESSAGES/icinga.po
+++ b/application/locale/de_DE/LC_MESSAGES/icinga.po
@@ -486,7 +486,7 @@ msgstr "Die Objekt-Klasse welche benutzt wird, um Benutzer auf diesem LDAP-Serve
 
 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:182
 msgid "The password to use for authentication"
-msgstr "Das Kennwort welche zur Authentifizierung benutzt werden soll"
+msgstr "Das Kennwort welches zur Authentifizierung benutzt werden soll"
 
 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:270
 msgid "The password to use for querying the ldap server"

From 338f5492338ab5b8b30ec5e973e1efc32aeb6326 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 14:42:24 +0200
Subject: [PATCH 137/277] Add class ReadablePathValidator

---
 .../Form/Validator/ReadablePathValidator.php  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 library/Icinga/Web/Form/Validator/ReadablePathValidator.php

diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
new file mode 100644
index 000000000..4060f6ecd
--- /dev/null
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -0,0 +1,58 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web\Form\Validator;
+
+use Zend_Validate_Abstract;
+
+/**
+ * Validator that interprets the value as a filepath and checks if it's readable
+ *
+ * This validator should be preferred due to Zend_Validate_File_Exists is
+ * getting confused if there is another element in the form called `name'.
+ */
+class ReadablePathValidator extends Zend_Validate_Abstract
+{
+    /**
+     * The messages to write on different error states
+     *
+     * @var array
+     *
+     * @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')
+        );
+    }
+
+    /**
+     * Check whether the given value is a readable filepath
+     *
+     * @param   string  $value      The value submitted in the form
+     * @param   mixed   $context    The context of the form
+     *
+     * @return  bool                Whether the value was successfully validated
+     */
+    public function isValid($value, $context = null)
+    {
+        if (false === file_exists($value)) {
+            $this->_error('DOES_NOT_EXIST');
+            return false;
+        }
+
+        if (false === is_readable($value)) {
+            $this->_error('NOT_READABLE');
+        }
+
+        return true;
+    }
+}

From 539ab91ffa93396ec035a551d2bc43a87e11c604 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 14:48:37 +0200
Subject: [PATCH 138/277] Add the FormErrors decorator as default decorator for
 forms

This allows us to use Zend_Form::addError() to show error messages for
the entire form context.

refs #5525
---
 library/Icinga/Web/Form.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 7f858f26a..bdbecfc40 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -99,6 +99,7 @@ class Form extends Zend_Form
         if ($this->onSuccess !== null && false === is_callable($this->onSuccess)) {
             throw new LogicException('The option `onSuccess\' is not callable');
         }
+
         if (! isset($options['elementDecorators'])) {
             $options['elementDecorators'] = array(
                 'ViewHelper',
@@ -108,6 +109,7 @@ class Form extends Zend_Form
                 array('HtmlTag', array('tag' => 'div'))
             );
         }
+
         parent::__construct($options);
     }
 
@@ -372,6 +374,7 @@ class Form extends Zend_Form
         if (is_array($options) && ! isset($options['disableLoadDefaultDecorators'])) {
             $options['disableLoadDefaultDecorators'] = true;
         }
+
         $el = parent::createElement($type, $name, $options);
         if ($el && $el->getAttrib('autosubmit')) {
             $el->addDecorator(new NoScriptApply()); // Non-JS environments
@@ -386,6 +389,7 @@ class Form extends Zend_Form
             $el->setAttrib('class', $class); // JS environments
             unset($el->autosubmit);
         }
+
         return $el;
     }
 
@@ -555,6 +559,7 @@ class Form extends Zend_Form
         if ($this->loadDefaultDecoratorsIsDisabled()) {
             return $this;
         }
+
         $decorators = $this->getDecorators();
         if (empty($decorators)) {
             if ($this->viewScript) {
@@ -563,11 +568,13 @@ class Form extends Zend_Form
                     'form'          => $this
                 ));
             } else {
-                $this
+                $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormElements')
+                    //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
                     ->addDecorator('Form');
             }
         }
+
         return $this;
     }
 

From 5b14d8fed3762f8b99951971a273a86f253fc513 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 14:53:15 +0200
Subject: [PATCH 139/277] Fix that the force_creation checkbox disappears after
 another error

Once the user enters invalid data after he tried to save a backend without
success (because the backend was not successfully validated) the shown
checkbox disappeared in this case regardless of whether it was checked
or not.

refs #5525
---
 .../AuthenticationBackendConfigForm.php       | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 660658404..6b1cacbdc 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -202,7 +202,7 @@ 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)) {
-                $this->addForceCreationCheckbox();
+                $this->addElement($this->getForceCreationCheckbox());
                 return false;
             }
         }
@@ -255,12 +255,14 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add a checkbox to be displayed at the beginning of the form
+     * 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 addForceCreationCheckbox()
+    protected function getForceCreationCheckbox()
     {
-        $this->addElement(
+        return $this->createElement(
             'checkbox',
             'force_creation',
             array(
@@ -297,7 +299,8 @@ class AuthenticationBackendConfigForm extends ConfigForm
             $backendTypes['autologin'] = t('Autologin');
         }
 
-        $typeSelection = $this->createElement(
+        $elements = array();
+        $elements[] = $this->createElement(
             'select',
             'type',
             array(
@@ -310,9 +313,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
             )
         );
 
-        return array_merge(
-            array($typeSelection),
-            $this->getBackendForm($backendType)->createElements($formData)
-        );
+        if (isset($formData['force_creation']) && $formData['force_creation']) {
+            // In case another error occured and the checkbox was displayed before
+            $elements[] = $this->getForceCreationCheckbox();
+        }
+
+        return array_merge($elements, $this->getBackendForm($backendType)->createElements($formData));
     }
 }

From 2d86e6ba3b516d7bcaaac23fd3801b7122b55bb1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 15:39:21 +0200
Subject: [PATCH 140/277] Rename ResourceForm and make it use handleRequest() &
 Co.

refs #5525
---
 application/controllers/ConfigController.php  | 126 ++---
 .../forms/Config/Resource/DbResourceForm.php  | 136 ++++++
 .../Config/Resource/FileResourceForm.php      |  50 ++
 .../Config/Resource/LdapResourceForm.php      | 122 +++++
 .../Resource/LivestatusResourceForm.php       |  77 +++
 .../Config/Resource/StatusdatResourceForm.php |  54 +++
 .../forms/Config/ResourceConfigForm.php       | 258 ++++++++++
 application/forms/Config/ResourceForm.php     | 444 ------------------
 .../views/scripts/config/resource.phtml       |  11 +-
 .../scripts/config/resource/create.phtml      |   5 +-
 .../scripts/config/resource/modify.phtml      |   1 -
 .../scripts/config/resource/remove.phtml      |   1 -
 12 files changed, 746 insertions(+), 539 deletions(-)
 create mode 100644 application/forms/Config/Resource/DbResourceForm.php
 create mode 100644 application/forms/Config/Resource/FileResourceForm.php
 create mode 100644 application/forms/Config/Resource/LdapResourceForm.php
 create mode 100644 application/forms/Config/Resource/LivestatusResourceForm.php
 create mode 100644 application/forms/Config/Resource/StatusdatResourceForm.php
 create mode 100644 application/forms/Config/ResourceConfigForm.php
 delete mode 100644 application/forms/Config/ResourceForm.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9bf54b2cf..bf3784a7a 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -12,7 +12,7 @@ use Icinga\Application\Config as IcingaConfig;
 use Icinga\Form\Config\GeneralConfigForm;
 use Icinga\Form\Config\AuthenticationBackendReorderForm;
 use Icinga\Form\Config\AuthenticationBackendConfigForm;
-use Icinga\Form\Config\ResourceForm;
+use Icinga\Form\Config\ResourceConfigForm;
 use Icinga\Form\ConfirmRemovalForm;
 use Icinga\Config\PreservingIniWriter;
 use Icinga\Data\ResourceFactory;
@@ -210,14 +210,12 @@ class ConfigController extends BaseConfigController
     }
 
     /**
-     * Display all available resources and a link to create a new one
+     * Display all available resources and a link to create a new one and to remove existing ones
      */
     public function resourceAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
-        $this->view->tabs->activate('resources');
-
         $this->view->resources = IcingaConfig::app('resources', true)->toArray();
+        $this->view->tabs->activate('resources');
     }
 
     /**
@@ -225,26 +223,12 @@ class ConfigController extends BaseConfigController
      */
     public function createresourceAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
-
-        $form = new ResourceForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            list($name, $config) = $form->getResourceConfig();
-            $resources = IcingaConfig::app('resources')->toArray();
-            if (array_key_exists($name, $resources)) {
-                $this->addErrorMessage(sprintf($this->translate('Resource name "%s" already in use.'), $name));
-            } else {
-                $resources[$name] = $config;
-                if ($this->writeConfigFile($resources, 'resources')) {
-                    $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully created.'), $name));
-                    $this->redirectNow('config/resource');
-                }
-            }
-        }
+        $form = new ResourceConfigForm();
+        $form->setConfig(IcingaConfig::app('resources'));
+        $form->setRedirectUrl('config/resource');
+        $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->messageBox->addForm($form);
         $this->render('resource/create');
     }
 
@@ -253,39 +237,12 @@ class ConfigController extends BaseConfigController
      */
     public function editresourceAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
-
-        // Fetch the resource to be edited
-        $resources = IcingaConfig::app('resources')->toArray();
-        $name = $this->getParam('resource');
-        if (false === array_key_exists($name, $resources)) {
-            $this->addErrorMessage(sprintf($this->translate('Cannot edit "%s". Resource not found.'), $name));
-            $this->redirectNow('config/configurationerror');
-        }
-
-        $form = new ResourceForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                list($newName, $config) = $form->getResourceConfig();
-
-                if ($newName !== $name) {
-                    // Resource name has changed
-                    unset($resources[$name]); // We can safely use unset as all values are part of the form
-                }
-
-                $resources[$newName] = $config;
-                if ($this->writeConfigFile($resources, 'resources')) {
-                    $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully edited.'), $name));
-                    $this->redirectNow('config/resource');
-                }
-            }
-        } else {
-            $form->setResourceConfig($name, $resources[$name]);
-        }
+        $form = new ResourceConfigForm();
+        $form->setConfig(IcingaConfig::app('resources'));
+        $form->setRedirectUrl('config/resource');
+        $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->messageBox->addForm($form);
         $this->render('resource/modify');
     }
 
@@ -294,45 +251,46 @@ class ConfigController extends BaseConfigController
      */
     public function removeresourceAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
+        $form = new ConfirmRemovalForm(array(
+            'onSuccess' => function ($request) {
+                $configForm = new ResourceConfigForm();
+                $configForm->setConfig(IcingaConfig::app('resources'));
+                $resource = $request->getQuery('resource');
 
-        // Fetch the resource to be removed
-        $resources = IcingaConfig::app('resources')->toArray();
-        $name = $this->getParam('resource');
-        if (false === array_key_exists($name, $resources)) {
-            $this->addErrorMessage(sprintf($this->translate('Cannot remove "%s". Resource not found.'), $name));
-            $this->redirectNow('config/configurationerror');
-        }
+                try {
+                    $configForm->remove($resource);
+                } catch (InvalidArgumentException $e) {
+                    Notification::error($e->getMessage());
+                    return;
+                }
+
+                if ($configForm->save()) {
+                    Notification::success(sprintf(t('Resource "%s" has been successfully removed'), $resource));
+                } else {
+                    return false;
+                }
+            }
+        ));
+        $form->setRedirectUrl('config/resource');
+        $form->handleRequest();
 
         // Check if selected resource is currently used for authentication
+        $resource = $this->getRequest()->getQuery('resource');
         $authConfig = IcingaConfig::app('authentication')->toArray();
         foreach ($authConfig as $backendName => $config) {
-            if (array_key_exists('resource', $config) && $config['resource'] === $name) {
-                $this->addWarningMessage(
-                    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.'
-                        ),
-                        $name,
-                        $backendName
-                    )
-                );
-            }
-        }
-
-        $form = new ConfirmRemovalForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            unset($resources[$name]);
-            if ($this->writeConfigFile($resources, 'resources')) {
-                $this->addSuccessMessage(sprintf($this->translate('Resource "%s" successfully removed.'), $name));
-                $this->redirectNow('config/resource');
+            if (array_key_exists('resource', $config) && $config['resource'] === $resource) {
+                $form->addError(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.'
+                    ),
+                    $resource,
+                    $backendName
+                ));
             }
         }
 
         $this->view->form = $form;
-        $this->view->messageBox->addForm($form);
         $this->render('resource/remove');
     }
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
new file mode 100644
index 000000000..586544d26
--- /dev/null
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -0,0 +1,136 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Resource;
+
+use Exception;
+use Zend_Config;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
+use Icinga\Web\Form\Element\Number;
+use Icinga\Web\Form\Decorator\HelpText;
+use Icinga\Web\Form\Decorator\ElementWrapper;
+use Icinga\Data\ResourceFactory;
+
+/**
+ * Form class for adding/modifying database resources
+ */
+class DbResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_db');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'select',
+                'db',
+                array(
+                    'required'      => true,
+                    'label'         => t('Database Type'),
+                    'helptext'      => t('The type of SQL database'),
+                    'multiOptions'  => array(
+                        'mysql'         => 'MySQL',
+                        'pgsql'         => 'PostgreSQL'
+                        //'oracle'        => 'Oracle'
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'host',
+                array (
+                    'required'  => true,
+                    'label'     => t('Host'),
+                    'helptext'  => t('The hostname of the database'),
+                    'value'     => 'localhost'
+                )
+            ),
+            new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Port'),
+                    'helptext'      => t('The port to use'),
+                    'value'         => 3306,
+                    'decorators'    => array( // The order is important!
+                        'ViewHelper',
+                        'Errors',
+                        new ElementWrapper(),
+                        new HelpText()
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'dbname',
+                array(
+                    'required'  => true,
+                    'label'     => t('Database Name'),
+                    'helptext'  => t('The name of the database to use')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'username',
+                array (
+                    'required'  => true,
+                    'label'     => t('Username'),
+                    'helptext'  => t('The user name to use for authentication')
+                )
+            ),
+            $this->createElement(
+                'password',
+                'password',
+                array(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => t('Password'),
+                    'helptext'          => t('The password to use for authentication')
+                )
+            )
+        );
+    }
+
+    /**
+     * Validate that the current configuration points to a valid resource
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        if (false === $this->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 function isValidResource(Form $form)
+    {
+        try {
+            $resource = ResourceFactory::createResource(new Zend_Config($form->getValues()));
+            $resource->getConnection()->getConnection();
+        } catch (Exception $e) {
+            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
new file mode 100644
index 000000000..0bebf09d3
--- /dev/null
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -0,0 +1,50 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Resource;
+
+use Icinga\Web\Form;
+use Icinga\Web\Form\Validator\ReadablePathValidator;
+
+/**
+ * Form class for adding/modifying file resources
+ */
+class FileResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_file');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'filename',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('The filename to fetch information from'),
+                    'validators'    => array(new ReadablePathValidator())
+                )
+            ),
+            $this->createElement(
+                'text',
+                'fields',
+                array(
+                    'required'  => true,
+                    'label'     => t('Pattern'),
+                    'helptext'  => t('The regular expression by which to identify columns')
+                )
+            )
+        );
+    }
+}
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
new file mode 100644
index 000000000..bdd57ef09
--- /dev/null
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -0,0 +1,122 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Resource;
+
+use Exception;
+use Zend_Config;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
+use Icinga\Web\Form\Element\Number;
+use Icinga\Web\Form\Decorator\HelpText;
+use Icinga\Web\Form\Decorator\ElementWrapper;
+use Icinga\Data\ResourceFactory;
+
+/**
+ * Form class for adding/modifying ldap resources
+ */
+class LdapResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_ldap');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'hostname',
+                array(
+                    'required'      => true,
+                    'label'         => t('Host'),
+                    'helptext'      => t('The hostname or address of the LDAP server to use for authentication'),
+                    'value'         => 'localhost'
+                )
+            ),
+            new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Port'),
+                    'helptext'      => t('The port of the LDAP server to use for authentication'),
+                    'value'         => 389,
+                    'decorators'    => array( // The order is important!
+                        'ViewHelper',
+                        'Errors',
+                        new ElementWrapper(),
+                        new HelpText()
+                    )
+                )
+            ),
+            $this->createElement(
+                'text',
+                'root_dn',
+                array(
+                    'required'  => true,
+                    'label'     => t('Root DN'),
+                    'helptext'  => t('The path where users can be found on the ldap server')
+                )
+            ),
+            $this->createElement(
+                'text',
+                'bind_dn',
+                array(
+                    'required'  => true,
+                    'label'     => t('Bind DN'),
+                    'helptext'  => t('The user dn to use for querying the ldap server')
+                )
+            ),
+            $this->createElement(
+                'password',
+                'bind_pw',
+                array(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => t('Bind Password'),
+                    'helptext'          => t('The password to use for querying the ldap server')
+                )
+            )
+        );
+    }
+
+    /**
+     * Validate that the current configuration points to a valid resource
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        if (false === $this->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 function isValidResource(Form $form)
+    {
+        try {
+            $resource = ResourceFactory::createResource(new Zend_Config($form->getValues()));
+            $resource->connect();
+        } catch (Exception $e) {
+            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
new file mode 100644
index 000000000..359fe4978
--- /dev/null
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -0,0 +1,77 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Resource;
+
+use Exception;
+use Zend_Config;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
+use Icinga\Application\Icinga;
+use Icinga\Data\ResourceFactory;
+
+/**
+ * Form class for adding/modifying livestatus resources
+ */
+class LivestatusResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_livestatus');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'socket',
+                array(
+                    'required'  => true,
+                    'label'     => t('Socket'),
+                    'helptext'  => t('The path to your livestatus socket used for querying monitoring data'),
+                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
+                )
+            )
+        );
+    }
+
+    /**
+     * Validate that the current configuration points to a valid resource
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        if (false === $this->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 function isValidResource(Form $form)
+    {
+        try {
+            $resource = ResourceFactory::createResource(new Zend_Config($form->getValues()));
+            $resource->connect()->disconnect();
+        } catch (Exception $e) {
+            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
new file mode 100644
index 000000000..5cdddc6d6
--- /dev/null
+++ b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -0,0 +1,54 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config\Resource;
+
+use Icinga\Web\Form;
+use Icinga\Application\Icinga;
+use Icinga\Web\Form\Validator\ReadablePathValidator;
+
+/**
+ * Form class for adding/modifying statusdat resources
+ */
+class StatusdatResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_statusdat');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        return array(
+            $this->createElement(
+                'text',
+                'status_file',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('Location of your icinga status.dat file'),
+                    'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'),
+                    'validators'    => array(new ReadablePathValidator())
+                )
+            ),
+            $this->createElement(
+                'text',
+                'object_file',
+                array(
+                    'required'      => true,
+                    'label'         => t('Filepath'),
+                    'helptext'      => t('Location of your icinga objects.cache file'),
+                    'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'),
+                    'validators'    => array(new ReadablePathValidator())
+                )
+            )
+        );
+    }
+}
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
new file mode 100644
index 000000000..7527ca1e7
--- /dev/null
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -0,0 +1,258 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form\Config;
+
+use InvalidArgumentException;
+use Icinga\Web\Request;
+use Icinga\Web\Notification;
+use Icinga\Form\ConfigForm;
+use Icinga\Form\Config\Resource\DbResourceForm;
+use Icinga\Form\Config\Resource\FileResourceForm;
+use Icinga\Form\Config\Resource\LdapResourceForm;
+use Icinga\Form\Config\Resource\LivestatusResourceForm;
+use Icinga\Form\Config\Resource\StatusdatResourceForm;
+use Icinga\Application\Platform;
+use Icinga\Exception\ConfigurationError;
+
+class ResourceConfigForm extends ConfigForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * Return a form object for the given resource type
+     *
+     * @param   string      $type      The resource type for which to return a form
+     *
+     * @return  Form
+     */
+    public function getResourceForm($type)
+    {
+        if ($type === 'db') {
+            return new DbResourceForm();
+        } elseif ($type === 'ldap') {
+            return new LdapResourceForm();
+        } elseif ($type === 'livestatus') {
+            return new LivestatusResourceForm();
+        } elseif ($type === 'statusdat') {
+            return new StatusdatResourceForm();
+        } elseif ($type === 'file') {
+            return new FileResourceForm();
+        } else {
+            throw new InvalidArgumentException(sprintf(t('Invalid resource type "%s" provided'), $type));
+        }
+    }
+
+    /**
+     * Add a particular resource
+     *
+     * The backend to add is identified by the array-key `name'.
+     *
+     * @param   array   $values             The values to extend the configuration with
+     *
+     * @return  self
+     *
+     * @thrwos  InvalidArgumentException    In case the resource does already exist
+     */
+    public function add(array $values)
+    {
+        $name = isset($values['name']) ? $values['name'] : '';
+        if (! $name) {
+            throw new InvalidArgumentException(t('Resource name missing'));
+        } elseif ($this->config->{$name} !== null) {
+            throw new InvalidArgumentException(t('Resource already exists'));
+        }
+
+        unset($values['name']);
+        $this->config->{$name} = $values;
+        return $this;
+    }
+
+    /**
+     * Edit a particular resource
+     *
+     * @param   string      $name           The name of the resource to edit
+     * @param   array       $values         The values to edit the configuration with
+     *
+     * @return  array                       The edited configuration
+     *
+     * @throws  InvalidArgumentException    In case the resource does not exist
+     */
+    public function edit($name, array $values)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Old resource name missing'));
+        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
+            throw new InvalidArgumentException(t('New resource name missing'));
+        } elseif (($resourceConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown resource provided'));
+        }
+
+        unset($values['name']);
+        unset($this->config->{$name});
+        $this->config->{$newName} = array_merge($resourceConfig->toArray(), $values);
+        return $this->config->{$newName};
+    }
+
+    /**
+     * Remove a particular resource
+     *
+     * @param   string      $name           The name of the resource to remove
+     *
+     * @return  array                       The removed resource configuration
+     *
+     * @throws  InvalidArgumentException    In case the resource does not exist
+     */
+    public function remove($name)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Resource name missing'));
+        } elseif (($resourceConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown resource provided'));
+        }
+
+        unset($this->config->{$name});
+        return $resourceConfig;
+    }
+
+    /**
+     * Add or edit a resource 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.
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        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;
+            }
+        }
+
+        $resource = $request->getQuery('resource');
+        try {
+            if ($resource === null) { // create new resource
+                $this->add($this->getValues());
+                $message = t('Resource "%s" has been successfully created');
+            } else { // edit existing resource
+                $this->edit($resource, $this->getValues());
+                $message = t('Resource "%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 a resource is being edited
+     *
+     * @see Form::onRequest()
+     *
+     * @throws  ConfigurationError      In case the backend name is missing in the request or is invalid
+     */
+    public function onRequest(Request $request)
+    {
+        $resource = $request->getQuery('resource');
+        if ($resource !== null) {
+            if ($resource === '') {
+                throw new ConfigurationError(t('Resource name missing'));
+            } elseif (false === isset($this->config->{$resource})) {
+                throw new ConfigurationError(t('Unknown resource provided'));
+            }
+
+            $configValues = $this->config->{$resource}->toArray();
+            $configValues['name'] = $resource;
+            $this->populate($configValues);
+        }
+    }
+
+    /**
+     * 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'     => t('Force Changes'),
+                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+            )
+        );
+    }
+
+    /**
+     * @see Form::createElemeents()
+     */
+    public function createElements(array $formData)
+    {
+        $resourceType = isset($formData['type']) ? $formData['type'] : 'db';
+
+        $resourceTypes = array(
+            'file'          => t('File'),
+            'statusdat'     => 'Status.dat',
+            'livestatus'    => 'Livestatus',
+        );
+        if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) {
+            $resourceTypes['ldap'] = 'LDAP';
+        }
+        if ($resourceType === 'db' || Platform::extensionLoaded('mysql') || Platform::extensionLoaded('pgsql')) {
+            $resourceTypes['db'] = t('SQL Database');
+        }
+
+        $elements = array(
+            $this->createElement(
+                'text',
+                'name',
+                array(
+                    'required'  => true,
+                    'label'     => t('Resource Name'),
+                    'helptext'  => t('The unique name of this resource')
+                )
+            ),
+            $this->createElement(
+                'select',
+                'type',
+                array(
+                    'required'      => true,
+                    'autosubmit'    => true,
+                    'label'         => t('Resource Type'),
+                    'helptext'      => t('The type of resource'),
+                    'multiOptions'  => $resourceTypes,
+                    'value'         => $resourceType
+                )
+            )
+        );
+
+        if (isset($formData['force_creation']) && $formData['force_creation']) {
+            // In case another error occured and the checkbox was displayed before
+            $elements[] = $this->getForceCreationCheckbox();
+        }
+
+        return array_merge($elements, $this->getResourceForm($resourceType)->createElements($formData));
+    }
+}
diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
deleted file mode 100644
index f7c6314fa..000000000
--- a/application/forms/Config/ResourceForm.php
+++ /dev/null
@@ -1,444 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Config;
-
-use Exception;
-use Icinga\Application\Platform;
-use Zend_Config;
-use Icinga\Web\Form;
-use Icinga\Application\Icinga;
-use Icinga\Data\ResourceFactory;
-use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
-
-class ResourceForm extends Form
-{
-    /**
-     * Initialize this form
-     */
-    public function init()
-    {
-        $this->setName('form_config_resource');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * @see Form::createElemeents()
-     */
-    public function createElements(array $formData)
-    {
-        $elements = array();
-        $elements[] = $this->createElement(
-            'text',
-            'name',
-            array(
-                'required'  => true,
-                'label'     => t('Resource Name'),
-                'helptext'  => t('The unique name of this resource')
-            )
-        );
-        $elements[] = $this->createElement(
-            'select',
-            'type',
-            array(
-                'required'      => true,
-                'class'         => 'autosubmit',
-                'label'         => t('Resource Type'),
-                'helptext'      => t('The type of resource'),
-                'multiOptions'  => array(
-                    'db'            => t('SQL Database'),
-                    'ldap'          => 'LDAP',
-                    'statusdat'     => 'Status.dat',
-                    'livestatus'    => 'Livestatus',
-                    'file'          => t('File')
-                )
-            )
-        );
-
-        if (isset($formData['force_creation']) && $formData['force_creation']) {
-            // In case the resource name already exists and the checkbox was displayed before
-            $elements[] = $this->getForceCreationCheckbox();
-        }
-
-        if (false === isset($formData['type']) || $formData['type'] === 'db') {
-            return array_merge($elements, $this->getDbElements());
-        } elseif ($formData['type'] === 'statusdat') {
-            return array_merge($elements, $this->getStatusdatElements());
-        } elseif ($formData['type'] === 'livestatus') {
-            return array_merge($elements, $this->getLivestatusElements());
-        } elseif ($formData['type'] === 'ldap') {
-            return array_merge($elements, $this->getLdapElements());
-        } elseif ($formData['type'] === 'file') {
-            return array_merge($elements, $this->getFileElements());
-        }
-    }
-
-    /**
-     * Return whether the given values are complete/valid and check whether it is possible to connect to the resource
-     *
-     * If connection validation fails, a checkbox is prepended to the form to allow users to skip it.
-     *
-     * @param   array   $data   The data to validate
-     *
-     * @return  bool            Whether the validation succeeded or not
-     */
-    public function isValid($data)
-    {
-        if (false === parent::isValid($data)) {
-            return false;
-        }
-
-        if (
-            (false === isset($data['force_creation']) || false == $data['force_creation'])
-            && false === $this->isValidResource()
-        ) {
-            $this->addElement($this->getForceCreationCheckbox());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return whether a connection can be established with the current resource configuration values
-     *
-     * @return  bool    Whether the connection validation was successful or not
-     */
-    public function isValidResource()
-    {
-        list($name, $config) = $this->getResourceConfig();
-
-        try {
-            switch ($config['type']) {
-                case 'db':
-                    /*
-                     * It should be possible to run icingaweb without the pgsql or mysql extension or Zend-Pdo-Classes,
-                     * in case they aren't actually used. When the user tries to create a resource that depends on an
-                     * uninstalled extension, an error should be displayed.
-                     */
-                    if ($config['db'] === 'mysql' && false === Platform::extensionLoaded('mysql')) {
-                        $this->addErrorMessage(
-                            t('You need to install the php extension "mysql" and the ' .
-                              'Zend_Pdo_Mysql classes to use  MySQL database resources.')
-                        );
-                        return false;
-                    }
-                    if ($config['db'] === 'pgsql' && false === Platform::extensionLoaded('pgsql')) {
-                        $this->addErrorMessage(
-                            t('You need to install the php extension "pgsql" and the ' .
-                              'Zend_Pdo_Pgsql classes to use  PostgreSQL database resources.')
-                        );
-                        return false;
-                    }
-
-                    $resource = ResourceFactory::createResource(new Zend_Config($config));
-                    $resource->getConnection()->getConnection();
-                    break;
-                case 'statusdat':
-                    if (
-                        false === file_exists($config['object_file'])
-                        || false === file_exists($config['status_file'])
-                    ) {
-                        $this->addErrorMessage(
-                            t('Connectivity validation failed. At least one of the provided files does not exist.')
-                        );
-                        return false;
-                    }
-                    break;
-                case 'livestatus':
-                    $resource = ResourceFactory::createResource(new Zend_Config($config));
-                    $resource->connect()->disconnect();
-                    break;
-                case 'ldap':
-                    $resource = ResourceFactory::createResource(new Zend_Config($config));
-                    $resource->connect();
-                    break;
-                case 'file':
-                    if (false === file_exists($config['filename'])) {
-                        $this->addErrorMessage(t('Connectivity validation failed. The provided file does not exist.'));
-                        return false;
-                    }
-                    break;
-            }
-        } catch (Exception $e) {
-            $this->addErrorMessage(t('Connectivity validation failed, connection to the given resource not possible.'));
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the resource configuration values and its name
-     *
-     * The first value is the name and the second one the values as array.
-     *
-     * @return  array
-     */
-    public function getResourceConfig()
-    {
-        $values = $this->getValues();
-        $name = $values['name'];
-        unset($values['name']);
-        return array($name, $values);
-    }
-
-    /**
-     * Populate the form with the given configuration values
-     *
-     * @param   string  $name       The name of the resource
-     * @param   array   $config     The configuration values
-     */
-    public function setResourceConfig($name, array $config)
-    {
-        $config['name'] = $name;
-        $this->populate($config);
-    }
-
-    /**
-     * 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'     => t('Force Changes'),
-                'helptext'  => t('Check this box to enforce changes without connectivity validation')
-            )
-        );
-    }
-
-    /**
-     * Return all required elements to define a resource of type "db"
-     *
-     * @return  array
-     */
-    protected function getDbElements()
-    {
-        return array(
-            $this->createElement(
-                'select',
-                'db',
-                array(
-                    'required'      => true,
-                    'label'         => t('Database Type'),
-                    'helptext'      => t('The type of SQL database'),
-                    'multiOptions'  => array(
-                        'mysql'         => 'MySQL',
-                        'pgsql'         => 'PostgreSQL'
-                        //'oracle'        => 'Oracle'
-                    )
-                )
-            ),
-            $this->createElement(
-                'text',
-                'host',
-                array (
-                    'required'  => true,
-                    'label'     => t('Host'),
-                    'helptext'  => t('The hostname of the database'),
-                    'value'     => 'localhost'
-                )
-            ),
-            new Number(
-                array(
-                    'required'      => true,
-                    'name'          => 'port',
-                    'label'         => t('Port'),
-                    'helptext'      => t('The port to use'),
-                    'value'         => 3306,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
-                )
-            ),
-            $this->createElement(
-                'text',
-                'dbname',
-                array(
-                    'required'  => true,
-                    'label'     => t('Database Name'),
-                    'helptext'  => t('The name of the database to use')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'username',
-                array (
-                    'required'  => true,
-                    'label'     => t('Username'),
-                    'helptext'  => t('The user name to use for authentication')
-                )
-            ),
-            $this->createElement(
-                'password',
-                'password',
-                array(
-                    'required'          => true,
-                    'renderPassword'    => true,
-                    'label'             => t('Password'),
-                    'helptext'          => t('The password to use for authentication')
-                )
-            )
-        );
-    }
-
-    /**
-     * Return all required elements to define a resource of type "statusdat"
-     *
-     * @return  array
-     */
-    protected function getStatusdatElements()
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'status_file',
-                array(
-                    'required'  => true,
-                    'label'     => t('Filepath'),
-                    'helptext'  => t('Location of your icinga status.dat file'),
-                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'object_file',
-                array(
-                    'required'  => true,
-                    'label'     => t('Filepath'),
-                    'helptext'  => t('Location of your icinga objects.cache file'),
-                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache')
-                )
-            )
-        );
-    }
-
-    /**
-     * Return all required elements to define a resource of type "livestatus"
-     *
-     * @return  array
-     */
-    protected function getLivestatusElements()
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'socket',
-                array(
-                    'required'  => true,
-                    'label'     => t('Socket'),
-                    'helptext'  => t('The path to your livestatus socket used for querying monitoring data'),
-                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
-                )
-            )
-        );
-    }
-
-    /**
-     * Return all required elements to define a resource of type "ldap"
-     *
-     * @return  array
-     */
-    protected function getLdapElements()
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'hostname',
-                array(
-                    'required'      => true,
-                    'allowEmpty'    => false,
-                    'label'         => t('Host'),
-                    'helptext'      => t('The hostname or address of the LDAP server to use for authentication'),
-                    'value'         => 'localhost'
-                )
-            ),
-            new Number(
-                array(
-                    'required'      => true,
-                    'name'          => 'port',
-                    'label'         => t('Port'),
-                    'helptext'      => t('The port of the LDAP server to use for authentication'),
-                    'value'         => 389,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
-                )
-            ),
-            $this->createElement(
-                'text',
-                'root_dn',
-                array(
-                    'required'  => true,
-                    'label'     => t('Root DN'),
-                    'helptext'  => t('The path where users can be found on the ldap server')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'bind_dn',
-                array(
-                    'required'  => true,
-                    'label'     => t('Bind DN'),
-                    'helptext'  => t('The user dn to use for querying the ldap server')
-                )
-            ),
-            $this->createElement(
-                'password',
-                'bind_pw',
-                array(
-                    'required'          => true,
-                    'renderPassword'    => true,
-                    'label'             => t('Bind Password'),
-                    'helptext'          => t('The password to use for querying the ldap server')
-                )
-            )
-        );
-    }
-
-    /**
-     * Return all required elements to define a resource of type "file"
-     *
-     * @return  array
-     */
-    protected function getFileElements()
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'filename',
-                array(
-                    'required'  => true,
-                    'label'     => t('Filepath'),
-                    'helptext'  => t('The filename to fetch information from')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'fields',
-                array(
-                    'required'  => true,
-                    'label'     => t('Pattern'),
-                    'helptext'  => t('The regular expression by which to identify columns')
-                )
-            )
-        );
-    }
-}
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 8e2c2eedd..51f98eadb 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,10 +2,9 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <?= $messageBox; ?>
   <p>
-    <a href="<?= $this->href('/config/createresource') ?>">
-      <?= $this->icon('create.png'); ?> <?= $this->translate('Create a new resource'); ?>
+    <a href="<?= $this->href('/config/createresource'); ?>">
+      <?= $this->icon('create.png'); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
   <table class="action">
@@ -17,12 +16,12 @@
 <?php foreach ($this->resources as $name => $resource): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('config/editresource', array('resource' => $name)) ?>">
-            <?= $this->icon('edit.png') ?> <?= $this->escape($name); ?>
+          <a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>">
+            <?= $this->icon('edit.png'); ?> <?= $this->escape($name); ?>
           </a>
         </td>
         <td style="text-align: center">
-          <a href="<?= $this->href('config/removeresource', array('resource' => $name)) ?>">
+          <a href="<?= $this->href('config/removeresource', array('resource' => $name)); ?>">
             <?= $this->icon('remove.png'); ?>
           </a>
         </td>
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 74639f056..5a07d832e 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -1,4 +1,3 @@
-<?= $messageBox; ?>
-<h4><?= $this->translate('Create a new resource'); ?></h4>
-<p><?= $this->translate('Resources are entities that provide data to Icingaweb.'); ?></p>
+<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
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index 7f549d537..5fa2536bd 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -1,3 +1,2 @@
 <h4><?= $this->translate('Edit Existing Resource'); ?></h4>
-<?= $messageBox; ?>
 <?= $form; ?>
\ 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 fba6b081b..a43bcd74c 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -1,3 +1,2 @@
 <h4><?= $this->translate('Remove Existing Resource'); ?></h4>
-<?= $messageBox; ?>
 <?= $form; ?>
\ No newline at end of file

From 1ba3df310c41e542c38e652a5fb27db93156462a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 16:18:49 +0200
Subject: [PATCH 141/277] Remove BaseConfigController, User\Message and
 Widget\AlertMesageBox

refs #6758
---
 application/controllers/ConfigController.php  |   6 +-
 application/views/scripts/error/error.phtml   |   3 -
 library/Icinga/User.php                       |  40 ------
 library/Icinga/User/Message.php               |  59 --------
 .../Web/Controller/BaseConfigController.php   |  75 ----------
 library/Icinga/Web/Widget/AlertMessageBox.php | 133 ------------------
 6 files changed, 2 insertions(+), 314 deletions(-)
 delete mode 100644 library/Icinga/User/Message.php
 delete mode 100644 library/Icinga/Web/Controller/BaseConfigController.php
 delete mode 100644 library/Icinga/Web/Widget/AlertMessageBox.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index bf3784a7a..1462c5293 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -2,8 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Web\Controller\BaseConfigController;
-use Icinga\Web\Widget\AlertMessageBox;
+use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Notification;
 use Icinga\Application\Modules\Module;
 use Icinga\Web\Widget;
@@ -21,7 +20,7 @@ use Icinga\Data\ResourceFactory;
 /**
  * Application wide controller for application preferences
  */
-class ConfigController extends BaseConfigController
+class ConfigController extends ActionController
 {
     public function init()
     {
@@ -302,7 +301,6 @@ class ConfigController extends BaseConfigController
      */
     public function configurationerrorAction()
     {
-        $this->view->messageBox = new AlertMessageBox(true);
         $this->render('error/error', null, true);
     }
 
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index e3a71f829..2a900651b 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -11,7 +11,4 @@
   <hr />
   <pre><?= $this->escape($stackTrace) ?></pre>
 <?php endif ?>
-<?php if (isset($this->messageBox)) : ?>
-  <?= $this->messageBox->render(); ?>
-<? endif ?>
 </div>
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 13f62881a..6d34e10ab 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -7,7 +7,6 @@ namespace Icinga;
 use DateTimeZone;
 use InvalidArgumentException;
 use Icinga\User\Preferences;
-use Icinga\User\Message;
 
 /**
  *  This class represents an authorized user
@@ -98,13 +97,6 @@ class User
      */
     protected $preferences;
 
-    /**
-     * Queued notifications for this user.
-     *
-     * @var array()
-     */
-    protected $messages;
-
     /**
      * Creates a user object given the provided information
      *
@@ -382,38 +374,6 @@ class User
         return new DateTimeZone($tz);
     }
 
-    /**
-     * Add a message that can be accessed from future requests, to this user.
-     *
-     * This function does NOT automatically write to the session, messages will not be persisted until you do.
-     *
-     * @param   Message     $msg    The message
-     */
-    public function addMessage(Message $msg)
-    {
-        $this->messages[] = $msg;
-    }
-
-    /**
-     * Get all currently pending messages
-     *
-     * @return  array   The messages
-     */
-    public function getMessages()
-    {
-        return isset($this->messages) ? $this->messages : array();
-    }
-
-    /**
-     * Remove all messages from this user
-     *
-     * This function does NOT automatically write the session, messages will not be persisted until you do.
-     */
-    public function clearMessages()
-    {
-        $this->messages = null;
-    }
-
     /**
      * Set additional remote user information
      *
diff --git a/library/Icinga/User/Message.php b/library/Icinga/User/Message.php
deleted file mode 100644
index 83d780563..000000000
--- a/library/Icinga/User/Message.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\User;
-
-use Zend_Log;
-
-/**
- * Class Message
- *
- * A Message with an additional logging level to indicate the type.
- *
- * @package Icinga\User
- */
-class Message
-{
-    /**
-     * The content of this message
-     *
-     * @var string
-     */
-    private $message;
-
-    /**
-     * The logging-level of this message
-     */
-    private $level;
-
-    /**
-     * Create a new Message
-     *
-     * @param string    $message  The message content
-     * @param           $level    The status of the message
-     *                            * Zend_Log::INFO
-     *                            * Zend_Log::ERR
-     */
-    public function __construct($message, $level = Zend_Log::INFO)
-    {
-        $this->message = $message;
-        $this->level = $level;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * @return The
-     */
-    public function getLevel()
-    {
-        return $this->level;
-    }
-}
diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php
deleted file mode 100644
index b4c90f3e2..000000000
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Controller;
-
-use Zend_Log;
-use Icinga\Web\Session;
-use Icinga\User\Message;
-use Icinga\Authentication\Manager as AuthenticationManager;
-
-/**
- *  Base class for Configuration Controllers
- *
- *  Module preferences use this class to make sure they are automatically
- *  added to the application's configuration dialog. If you create a subclass of
- *  BasePreferenceController and overwrite @see init(), make sure you call
- *  parent::init(), otherwise you won't have the $tabs property in your view.
- */
-class BaseConfigController extends ActionController
-{
-    /**
-     * Send a message with the logging level Zend_Log::INFO to the current user and
-     * commit the changes to the underlying session.
-     *
-     * @param $msg      The message content
-     */
-    protected function addSuccessMessage($msg)
-    {
-        AuthenticationManager::getInstance()->getUser()->addMessage(
-            new Message($msg, Zend_Log::INFO)
-        );
-        Session::getSession()->write();
-    }
-
-    /**
-     * Send a message with the logging level Zend_Log::ERR to the current user and
-     * commit the changes to the underlying session.
-     *
-     * @param $msg      The message content
-     */
-    protected function addErrorMessage($msg)
-    {
-        AuthenticationManager::getInstance()->getUser()->addMessage(
-            new Message($msg, Zend_Log::ERR)
-        );
-        Session::getSession()->write();
-    }
-
-    /**
-     * Send a message with the logging level Zend_Log::WARN to the current user and
-     * commit the changes to the underlying session.
-     *
-     * @param $msg      The message content
-     */
-    protected function addWarningMessage($msg)
-    {
-        AuthenticationManager::getInstance()->getUser()->addMessage(
-            new Message($msg, Zend_Log::WARN)
-        );
-        Session::getSession()->write();
-    }
-
-    /*
-     * Return an array of tabs provided by this configuration controller.
-     *
-     * Those tabs will automatically be added to the application's configuration dialog
-     *
-     * @return array
-     */
-    public static function createProvidedTabs()
-    {
-        return array();
-    }
-}
diff --git a/library/Icinga/Web/Widget/AlertMessageBox.php b/library/Icinga/Web/Widget/AlertMessageBox.php
deleted file mode 100644
index 13cf91068..000000000
--- a/library/Icinga/Web/Widget/AlertMessageBox.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Widget;
-
-use Zend_Log;
-use Zend_Form;
-use Zend_View_Abstract;
-use Icinga\User;
-use Icinga\User\Message;
-use Icinga\Web\Session;
-use Icinga\Authentication\Manager as AuthenticationManager;
-
-/**
- * Displays a set of alert messages to the user.
- *
- * The messages are fetched automatically from the current AuthenticationManager,
- * but this is done lazily when render() is called, to ensure that messages will
- * always be displayed before they are cleared.
- */
-class AlertMessageBox extends AbstractWidget
-{
-    /**
-     * Remove all messages from the current user, return them and commit
-     * changes to the underlying session.
-     *
-     * @return array    The messages
-     */
-    protected function getAndClearMessages()
-    {
-        $messages = $this->user->getMessages();
-        $this->user->clearMessages();
-        Session::getSession()->write();
-        return $messages;
-    }
-
-    /**
-     * The displayed alert messages
-     *
-     * @var array
-     */
-    private $messages = array();
-
-    /**
-     * The user to fetch the messages from
-     *
-     * @var User
-     */
-    private $user;
-
-    /**
-     * The available states.
-     *
-     * @var array
-     */
-    private $states = array(
-        Zend_Log::INFO => array(
-            'state' => 'alert-success',
-            'icon'  => 'success.png'
-        ),
-        Zend_Log::NOTICE => array(
-            'state' => 'alert-info',
-            'icon'  => 'info.png'
-        ),
-        Zend_Log::WARN => array(
-            'state' => 'alert-warning',
-            'icon'  => 'warning.png'
-        ),
-        Zend_Log::ERR =>  array(
-            'state' => 'alert-danger',
-            'icon'  => 'error.png'
-        )
-    );
-
-    /**
-     * Create a new AlertBox
-     *
-     * @param boolean showUserMessages 	If the current user messages should be displayed
-     *                                  in this AlertMessageBox. Defaults to false
-     */
-    public function __construct($showUserMessages = false)
-    {
-        if ($showUserMessages) {
-            $this->user = AuthenticationManager::getInstance()->getUser();
-        }
-    }
-
-    /**
-     * Add a new error
-     *
-     * @param $error
-     */
-    public function addError($error)
-    {
-        $this->messages[] = new Message($error, Zend_Log::ERR);
-    }
-
-    /**
-     * Add the error messages of the given Zend_Form
-     */
-    public function addForm(Zend_Form $form)
-    {
-        foreach ($form->getErrorMessages() as $error) {
-            $this->addError($error);
-        }
-    }
-
-    /**
-     * Output the HTML of the AlertBox
-     *
-     * @return string
-     */
-    public function render(Zend_View_Abstract $view = null)
-    {
-        $html = '';
-        if (isset($this->user)) {
-            $this->messages = array_merge($this->messages, $this->getAndClearMessages());
-        }
-        foreach ($this->messages as $message) {
-            $level = $message->getLevel();
-            if (!array_key_exists($level, $this->states)) {
-                continue;
-            }
-            $alert = $this->states[$level];
-            $html .= '<div class="alert ' . $alert['state']. '">' .
-                $this->view()->icon($alert['icon']) .
-                '<strong>' . htmlspecialchars($message->getMessage()) . '</strong>' .
-            '</div>';
-        }
-        return $html;
-    }
-}

From 5464321a1b3c2471dea2edf865e87a4117d37ee2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 16:19:17 +0200
Subject: [PATCH 142/277] ConfigController: Remove obsolete functionality

---
 application/controllers/ConfigController.php | 59 --------------------
 1 file changed, 59 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 1462c5293..39051011c 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -13,7 +13,6 @@ use Icinga\Form\Config\AuthenticationBackendReorderForm;
 use Icinga\Form\Config\AuthenticationBackendConfigForm;
 use Icinga\Form\Config\ResourceConfigForm;
 use Icinga\Form\ConfirmRemovalForm;
-use Icinga\Config\PreservingIniWriter;
 use Icinga\Data\ResourceFactory;
 
 
@@ -292,62 +291,4 @@ class ConfigController extends ActionController
         $this->view->form = $form;
         $this->render('resource/remove');
     }
-
-    /**
-     * Redirect target only for error-states
-     *
-     * When an error is opened in the side-pane, redirecting this request to the index or the overview will look
-     * weird. This action returns a clear page containing only an AlertMessageBox.
-     */
-    public function configurationerrorAction()
-    {
-        $this->render('error/error', null, true);
-    }
-
-    /**
-     * Write changes to an authentication file
-     *
-     * @param   array $config The configuration changes
-     *
-     * @return  bool True when persisting succeeded, otherwise false
-     *
-     * @see     writeConfigFile()
-     */
-    private function writeAuthenticationFile($config) {
-        return $this->writeConfigFile($config, 'authentication');
-    }
-
-    /**
-     * Write changes to a configuration file $file, using the supplied writer or PreservingIniWriter if none is set
-     *
-     * @param   array|Zend_Config   $config The configuration to write
-     * @param   string              $file   The filename to write to (without .ini)
-     * @param   Zend_Config_Writer  $writer An optional writer to use for persisting changes
-     *
-     * @return  bool True when persisting succeeded, otherwise false
-     */
-    private function writeConfigFile($config, $file, $writer = null)
-    {
-        if (is_array($config)) {
-            $config = new Zend_Config($config);
-        }
-        if ($writer === null) {
-            $writer = new PreservingIniWriter(
-                array(
-                    'config' => $config,
-                    'filename' => IcingaConfig::app($file)->getConfigFile()
-                )
-            );
-        }
-        try {
-            $writer->write();
-            return true;
-        } catch (Exception $exc) {
-            $this->view->exceptionMessage = $exc->getMessage();
-            $this->view->iniConfigurationString = $writer->render();
-            $this->view->file = $file;
-            $this->render('show-configuration');
-            return false;
-        }
-    }
 }

From 95c839a8bdec692d441e77f507192793eb6fb5ba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 16:50:59 +0200
Subject: [PATCH 143/277] Remove remaining usages of the ElementWrapper- and
 HelpText-Decorator

refs #5525
---
 application/forms/Config/Resource/DbResourceForm.php   | 10 +---------
 application/forms/Config/Resource/LdapResourceForm.php | 10 +---------
 library/Icinga/Web/Form.php                            |  2 --
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 586544d26..05e946f8e 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -9,8 +9,6 @@ use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
 use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Data\ResourceFactory;
 
 /**
@@ -62,13 +60,7 @@ class DbResourceForm extends Form
                     'name'          => 'port',
                     'label'         => t('Port'),
                     'helptext'      => t('The port to use'),
-                    'value'         => 3306,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
+                    'value'         => 3306
                 )
             ),
             $this->createElement(
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index bdd57ef09..af811c154 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -9,8 +9,6 @@ use Zend_Config;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
 use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Data\ResourceFactory;
 
 /**
@@ -48,13 +46,7 @@ class LdapResourceForm extends Form
                     'name'          => 'port',
                     'label'         => t('Port'),
                     'helptext'      => t('The port of the LDAP server to use for authentication'),
-                    'value'         => 389,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
+                    'value'         => 389
                 )
             ),
             $this->createElement(
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index bdbecfc40..2c0fb2a89 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,9 +8,7 @@ use LogicException;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
-use Icinga\Web\Form\Decorator\HelpText;
 use Icinga\Web\Form\Decorator\NoScriptApply;
-use Icinga\Web\Form\Decorator\ElementWrapper;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
 /**

From 5485ca8a25b41beff1d943ee6c6da7ed0aa1f9d6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 16:48:54 +0200
Subject: [PATCH 144/277] lib: Use Zend's `Int' validator in the `Number' form
 element

Further disabled default decorators since our form sets them.

refs #5525
---
 library/Icinga/Web/Form/Element/Number.php | 41 +++++++++++-----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index d87a6d09f..3bfbc6406 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -4,38 +4,37 @@
 
 namespace Icinga\Web\Form\Element;
 
-use Zend_Form_Element_Xhtml;
+use Zend_Form_Element;
 
 /**
- * Number form element
+ * A number input control
  */
-class Number extends Zend_Form_Element_Xhtml
+class Number extends Zend_Form_Element
 {
     /**
-     * Default form view helper to use for rendering
+     * Disable default decorators
+     *
+     * \Icinga\Web\Form sets default decorators for elements.
+     *
+     * @var bool
+     *
+     * @see \Icinga\Web\Form::__construct() For default element decorators.
+     */
+    protected $_disableLoadDefaultDecorators = true;
+
+    /**
+     * Form view helper to use for rendering
      *
      * @var string
      */
-    public $helper = "formNumber";
+    public $helper = 'formNumber';
 
     /**
-     * Check whether $value is of type integer
-     *
-     * @param   string      $value      The value to check
-     * @param   mixed       $context    Context to use
-     *
-     * @return  bool
+     * (non-PHPDoc)
+     * @see \Zend_Form_Element::init() For the method documentation.
      */
-    public function isValid($value, $context = null)
+    public function init()
     {
-        if (parent::isValid($value, $context)) {
-            if (is_numeric($value)) {
-                return true;
-            }
-
-            $this->addError(t('Please enter a number.'));
-        }
-
-        return false;
+        $this->addValidator('Int');
     }
 }

From c7a4098c04103093c1db45a2e067bf966cd67e8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 16:53:33 +0200
Subject: [PATCH 145/277] lib: Respect the disabled attribute in `FormNumber'

refs #5525
---
 application/views/helpers/FormNumber.php | 42 +++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index a8768f0b7..1590d9b51 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -2,29 +2,41 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
+use Zend_View_Helper_FormElement;
+
 /**
- * Helper to generate a number input
+ * Render number input controls
  */
-class Zend_View_Helper_FormNumber extends \Zend_View_Helper_FormText
+class Zend_View_Helper_FormNumber extends Zend_View_Helper_FormElement
 {
     /**
-     * Generates a html number input
+     * Render the number input control
      *
-     * @access public
+     * @param   string  $name
+     * @param   int     $value
+     * @param   array   $attribs
      *
-     * @param string $name The element name.
-     * @param string $value The default value.
-     * @param array $attribs Attributes which should be added to the input tag.
-     *
-     * @return string The input tag and options XHTML.
+     * @return  string  The rendered number input control
      */
     public function formNumber($name, $value = null, $attribs = null)
     {
-        return '<input type="number"'
-             . ' name="' . $this->view->escape($name) . '"'
-             . ' value="' . $this->view->escape($value) . '"'
-             . ' id="' . $this->view->escape($name) . '"'
-             . $this->_htmlAttribs($attribs)
-             . $this->getClosingBracket();
+        $info = $this->_getInfo($name, $value, $attribs);
+        extract($info);  // name, id, value, attribs, options, listsep, disable
+        /** @var string $id  */
+        /** @var bool $disable  */
+        $disabled = '';
+        if ($disable) {
+            $disabled = ' disabled="disabled"';
+        }
+        $html5 = sprintf(
+            '<input type="number" name="%s" id="%s" value="%s"%s%s%s',
+            $this->view->escape($name),
+            $this->view->escape($id),
+            $this->view->escape($value),
+            $disabled,
+            $this->_htmlAttribs($attribs),
+            $this->getClosingBracket()
+        );
+        return $html5;
     }
 }

From 5ce9bef689b63572aab8499e17208ce9c526a860 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Sep 2014 17:03:32 +0200
Subject: [PATCH 146/277] Replace usages of the `helptext' form element option
 with `description'

refs #5525
---
 .../Authentication/AutologinBackendForm.php   |  4 +--
 .../Config/Authentication/DbBackendForm.php   |  4 +--
 .../Config/Authentication/LdapBackendForm.php | 20 ++++++------
 .../AuthenticationBackendConfigForm.php       | 20 ++++++------
 .../Config/General/ApplicationConfigForm.php  | 10 +++---
 .../Config/General/LoggingConfigForm.php      | 10 +++---
 .../forms/Config/Resource/DbResourceForm.php  | 32 +++++++++----------
 .../Config/Resource/FileResourceForm.php      |  8 ++---
 .../Config/Resource/LdapResourceForm.php      | 18 +++++------
 .../Resource/LivestatusResourceForm.php       |  8 ++---
 .../Config/Resource/StatusdatResourceForm.php |  4 +--
 .../forms/Config/ResourceConfigForm.php       | 26 +++++++--------
 12 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index 662106bcd..cb4d100a0 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -32,7 +32,7 @@ class AutologinBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Backend Name'),
-                    'helptext'      => t('The name of this authentication backend'),
+                    'description'   => t('The name of this authentication backend'),
                     'validators'    => array(
                         array(
                             'Regex',
@@ -53,7 +53,7 @@ class AutologinBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Backend Domain Pattern'),
-                    'helptext'      => t('The domain pattern of this authentication backend'),
+                    'description'   => t('The domain pattern of this authentication backend'),
                     'value'         => '/\@[^$]+$/',
                     'validators'    => array(
                         new Zend_Validate_Callback(function ($value) {
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 338b01c60..603aaeb79 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -55,7 +55,7 @@ class DbBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Backend Name'),
-                    'helptext'      => t('The name of this authentication provider'),
+                    'description'   => t('The name of this authentication provider'),
                 )
             ),
             $this->createElement(
@@ -64,7 +64,7 @@ class DbBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Database Connection'),
-                    'helptext'      => t('The database connection to use for authenticating with this provider'),
+                    'description'   => t('The database connection to use for authenticating with this provider'),
                     'multiOptions'  => false === empty($this->resources)
                         ? array_combine($this->resources, $this->resources)
                         : array()
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index f451417ea..79949e2de 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -54,7 +54,7 @@ class LdapBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Backend Name'),
-                    'helptext'      => t('The name of this authentication backend')
+                    'description'   => t('The name of this authentication backend')
                 )
             ),
             $this->createElement(
@@ -63,7 +63,7 @@ class LdapBackendForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('LDAP Resource'),
-                    'helptext'      => t('The resource to use for authenticating with this provider'),
+                    'description'   => t('The resource to use for authenticating with this provider'),
                     'multiOptions'  => false === empty($this->resources)
                         ? array_combine($this->resources, $this->resources)
                         : array()
@@ -73,20 +73,20 @@ class LdapBackendForm extends Form
                 'text',
                 'user_class',
                 array(
-                    'required'  => true,
-                    'label'     => t('LDAP User Object Class'),
-                    'helptext'  => t('The object class used for storing users on the ldap server'),
-                    'value'     => 'inetOrgPerson'
+                    'required'      => true,
+                    'label'         => t('LDAP User Object Class'),
+                    'description'   => t('The object class used for storing users on the ldap server'),
+                    'value'         => 'inetOrgPerson'
                 )
             ),
             $this->createElement(
                 'text',
                 'user_name_attribute',
                 array(
-                    'required'  => true,
-                    'label'     => t('LDAP User Name Attribute'),
-                    'helptext'  => t('The attribute name used for storing the user name on the ldap server'),
-                    'value'     => 'uid'
+                    'required'      => true,
+                    'label'         => t('LDAP User Name Attribute'),
+                    'description'   => t('The attribute name used for storing the user name on the ldap server'),
+                    'value'         => 'uid'
                 )
             ),
             $this->createElement(
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 6b1cacbdc..f91044446 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -266,10 +266,10 @@ class AuthenticationBackendConfigForm extends ConfigForm
             'checkbox',
             'force_creation',
             array(
-                'order'     => 0,
-                'ignore'    => true,
-                'label'     => t('Force Changes'),
-                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+                'order'         => 0,
+                'ignore'        => true,
+                'label'         => t('Force Changes'),
+                'description'   => t('Check this box to enforce changes without connectivity validation')
             )
         );
     }
@@ -304,12 +304,12 @@ class AuthenticationBackendConfigForm extends ConfigForm
             'select',
             'type',
             array(
-                'ignore'        => true,
-                'required'      => true,
-                'autosubmit'    => true,
-                'label'         => t('Backend Type'),
-                'helptext'      => t('The type of the resource to use for this authenticaton backend'),
-                'multiOptions'  => $backendTypes
+                'ignore'            => true,
+                'required'          => true,
+                'autosubmit'        => true,
+                'label'             => t('Backend Type'),
+                'description'       => t('The type of the resource to use for this authenticaton backend'),
+                'multiOptions'      => $backendTypes
             )
         );
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 89e75f66a..7f3b746e4 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -41,7 +41,7 @@ class ApplicationConfigForm extends Form
                 'label'         => t('Default Language'),
                 'required'      => true,
                 'multiOptions'  => $languages,
-                'helptext'      => t(
+                'description'   => t(
                     'Select the language to use by default. Can be overwritten by a user in his preferences.'
                 )
             )
@@ -59,7 +59,7 @@ class ApplicationConfigForm extends Form
                 'label'         => t('Default Application Timezone'),
                 'required'      => true,
                 'multiOptions'  => $tzList,
-                'helptext'      => t(
+                'description'   => t(
                     'Select the timezone to be used as the default. User\'s can set their own timezone if'
                     . ' they like to, but this is the timezone to be used as the default setting .'
                 ),
@@ -71,9 +71,9 @@ class ApplicationConfigForm extends Form
             'text',
             'global_modulePath',
             array(
-                'label'     => t('Module Path'),
-                'required'  => true,
-                'helptext'  => t(
+                'label'         => t('Module Path'),
+                'required'      => true,
+                'description'   => t(
                     '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.'
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index f91ce74b5..07f2e4d78 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -31,7 +31,7 @@ class LoggingConfigForm extends Form
             array(
                 'required'      => true,
                 'label'         => t('Logging Level'),
-                'helptext'      => t('The maximum loglevel to emit.'),
+                'description'   => t('The maximum loglevel to emit.'),
                 'multiOptions'  => array(
                     0 => t('None'),
                     1 => t('Error'),
@@ -48,7 +48,7 @@ class LoggingConfigForm extends Form
                 'required'      => true,
                 'class'         => 'autosubmit',
                 'label'         => t('Logging Type'),
-                'helptext'      => t('The type of logging to utilize.'),
+                'description'   => t('The type of logging to utilize.'),
                 'multiOptions'  => array(
                     'syslog'    => 'Syslog',
                     'file'      => t('File')
@@ -63,7 +63,7 @@ class LoggingConfigForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Application Prefix'),
-                    'helptext'      => t('The name of the application by which to prefix syslog messages.'),
+                    'description'   => t('The name of the application by which to prefix syslog messages.'),
                     'value'         => 'icingaweb',
                     'validators'    => array(
                         array(
@@ -85,7 +85,7 @@ class LoggingConfigForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Facility'),
-                    'helptext'      => t('The Syslog facility to utilize.'),
+                    'description'   => t('The Syslog facility to utilize.'),
                     'multiOptions'  => array(
                         'LOG_USER'  => 'LOG_USER'
                     )
@@ -98,7 +98,7 @@ class LoggingConfigForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Filepath'),
-                    'helptext'      => t('The logfile to write messages to.'),
+                    'description'   => t('The logfile to write messages to.'),
                     'value'         => $this->getDefaultLogDir(),
                     'validators'    => array(new WritablePathValidator())
                 )
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 05e946f8e..e5ae4b9a7 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -36,11 +36,11 @@ class DbResourceForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Database Type'),
-                    'helptext'      => t('The type of SQL database'),
+                    'description'   => t('The type of SQL database'),
                     'multiOptions'  => array(
-                        'mysql'         => 'MySQL',
-                        'pgsql'         => 'PostgreSQL'
-                        //'oracle'        => 'Oracle'
+                        'mysql'     => 'MySQL',
+                        'pgsql'     => 'PostgreSQL'
+                        //'oracle'    => 'Oracle'
                     )
                 )
             ),
@@ -48,10 +48,10 @@ class DbResourceForm extends Form
                 'text',
                 'host',
                 array (
-                    'required'  => true,
-                    'label'     => t('Host'),
-                    'helptext'  => t('The hostname of the database'),
-                    'value'     => 'localhost'
+                    'required'      => true,
+                    'label'         => t('Host'),
+                    'description'   => t('The hostname of the database'),
+                    'value'         => 'localhost'
                 )
             ),
             new Number(
@@ -59,7 +59,7 @@ class DbResourceForm extends Form
                     'required'      => true,
                     'name'          => 'port',
                     'label'         => t('Port'),
-                    'helptext'      => t('The port to use'),
+                    'description'   => t('The port to use'),
                     'value'         => 3306
                 )
             ),
@@ -67,18 +67,18 @@ class DbResourceForm extends Form
                 'text',
                 'dbname',
                 array(
-                    'required'  => true,
-                    'label'     => t('Database Name'),
-                    'helptext'  => t('The name of the database to use')
+                    'required'      => true,
+                    'label'         => t('Database Name'),
+                    'description'   => t('The name of the database to use')
                 )
             ),
             $this->createElement(
                 'text',
                 'username',
                 array (
-                    'required'  => true,
-                    'label'     => t('Username'),
-                    'helptext'  => t('The user name to use for authentication')
+                    'required'      => true,
+                    'label'         => t('Username'),
+                    'description'   => t('The user name to use for authentication')
                 )
             ),
             $this->createElement(
@@ -88,7 +88,7 @@ class DbResourceForm extends Form
                     'required'          => true,
                     'renderPassword'    => true,
                     'label'             => t('Password'),
-                    'helptext'          => t('The password to use for authentication')
+                    'description'       => t('The password to use for authentication')
                 )
             )
         );
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 0bebf09d3..422979585 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -32,7 +32,7 @@ class FileResourceForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Filepath'),
-                    'helptext'      => t('The filename to fetch information from'),
+                    'description'   => t('The filename to fetch information from'),
                     'validators'    => array(new ReadablePathValidator())
                 )
             ),
@@ -40,9 +40,9 @@ class FileResourceForm extends Form
                 'text',
                 'fields',
                 array(
-                    'required'  => true,
-                    'label'     => t('Pattern'),
-                    'helptext'  => t('The regular expression by which to identify columns')
+                    'required'      => true,
+                    'label'         => t('Pattern'),
+                    'description'   => t('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 af811c154..3b3075dc7 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -36,7 +36,7 @@ class LdapResourceForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Host'),
-                    'helptext'      => t('The hostname or address of the LDAP server to use for authentication'),
+                    'description'   => t('The hostname or address of the LDAP server to use for authentication'),
                     'value'         => 'localhost'
                 )
             ),
@@ -45,7 +45,7 @@ class LdapResourceForm extends Form
                     'required'      => true,
                     'name'          => 'port',
                     'label'         => t('Port'),
-                    'helptext'      => t('The port of the LDAP server to use for authentication'),
+                    'description'   => t('The port of the LDAP server to use for authentication'),
                     'value'         => 389
                 )
             ),
@@ -53,18 +53,18 @@ class LdapResourceForm extends Form
                 'text',
                 'root_dn',
                 array(
-                    'required'  => true,
-                    'label'     => t('Root DN'),
-                    'helptext'  => t('The path where users can be found on the ldap server')
+                    'required'      => true,
+                    'label'         => t('Root DN'),
+                    'description'   => t('The path where users can be found on the ldap server')
                 )
             ),
             $this->createElement(
                 'text',
                 'bind_dn',
                 array(
-                    'required'  => true,
-                    'label'     => t('Bind DN'),
-                    'helptext'  => t('The user dn to use for querying the ldap server')
+                    'required'      => true,
+                    'label'         => t('Bind DN'),
+                    'description'   => t('The user dn to use for querying the ldap server')
                 )
             ),
             $this->createElement(
@@ -74,7 +74,7 @@ class LdapResourceForm extends Form
                     'required'          => true,
                     'renderPassword'    => true,
                     'label'             => t('Bind Password'),
-                    'helptext'          => t('The password to use for querying the ldap server')
+                    'description'       => t('The password to use for querying the ldap server')
                 )
             )
         );
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index 359fe4978..e7e49a375 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -34,10 +34,10 @@ class LivestatusResourceForm extends Form
                 'text',
                 'socket',
                 array(
-                    'required'  => true,
-                    'label'     => t('Socket'),
-                    'helptext'  => t('The path to your livestatus socket used for querying monitoring data'),
-                    'value'     => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
+                    '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')
                 )
             )
         );
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
index 5cdddc6d6..69c3d9040 100644
--- a/application/forms/Config/Resource/StatusdatResourceForm.php
+++ b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -33,7 +33,7 @@ class StatusdatResourceForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Filepath'),
-                    'helptext'      => t('Location of your icinga status.dat file'),
+                    'description'   => t('Location of your icinga status.dat file'),
                     'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'),
                     'validators'    => array(new ReadablePathValidator())
                 )
@@ -44,7 +44,7 @@ class StatusdatResourceForm extends Form
                 array(
                     'required'      => true,
                     'label'         => t('Filepath'),
-                    'helptext'      => t('Location of your icinga objects.cache file'),
+                    'description'   => t('Location of your icinga objects.cache file'),
                     'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'),
                     'validators'    => array(new ReadablePathValidator())
                 )
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 7527ca1e7..9a3ae7793 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -197,10 +197,10 @@ class ResourceConfigForm extends ConfigForm
             'checkbox',
             'force_creation',
             array(
-                'order'     => 0,
-                'ignore'    => true,
-                'label'     => t('Force Changes'),
-                'helptext'  => t('Check this box to enforce changes without connectivity validation')
+                'order'         => 0,
+                'ignore'        => true,
+                'label'         => t('Force Changes'),
+                'description'   => t('Check this box to enforce changes without connectivity validation')
             )
         );
     }
@@ -229,21 +229,21 @@ class ResourceConfigForm extends ConfigForm
                 'text',
                 'name',
                 array(
-                    'required'  => true,
-                    'label'     => t('Resource Name'),
-                    'helptext'  => t('The unique name of this resource')
+                    'required'      => true,
+                    'label'         => t('Resource Name'),
+                    'description'   => t('The unique name of this resource')
                 )
             ),
             $this->createElement(
                 'select',
                 'type',
                 array(
-                    'required'      => true,
-                    'autosubmit'    => true,
-                    'label'         => t('Resource Type'),
-                    'helptext'      => t('The type of resource'),
-                    'multiOptions'  => $resourceTypes,
-                    'value'         => $resourceType
+                    'required'          => true,
+                    'autosubmit'        => true,
+                    'label'             => t('Resource Type'),
+                    'description'       => t('The type of resource'),
+                    'multiOptions'      => $resourceTypes,
+                    'value'             => $resourceType
                 )
             )
         );

From dd3901e89155734b745e37687c18be915d1e50e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Sep 2014 17:08:32 +0200
Subject: [PATCH 147/277] `FormNumber': Fix "The use statement with
 non-compound name..."

refs #5525
---
 application/views/helpers/FormNumber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 1590d9b51..98cb8d06f 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Zend_View_Helper_FormElement;
+use \Zend_View_Helper_FormElement;
 
 /**
  * Render number input controls

From 54a834266cd140f12610ca4a2d78a29988d071a3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Sep 2014 12:21:31 +0200
Subject: [PATCH 148/277] Form::createElements() should add elements instead of
 returning them

In case createElements() would still return the elements while requiring
the caller to add them to the form all form dependent configurations get
lost. (displaygroups, belongTo, ...) Wizards or parent forms can still
retrieve only input relevant fields by just calling createElements() and
getElements().

refs #5525
---
 .../forms/Authentication/LoginForm.php        |  54 ++++-----
 .../Authentication/AutologinBackendForm.php   |  76 ++++++-------
 .../Config/Authentication/DbBackendForm.php   |  58 +++++-----
 .../Config/Authentication/LdapBackendForm.php |  98 ++++++++--------
 .../AuthenticationBackendConfigForm.php       |   9 +-
 .../Config/General/ApplicationConfigForm.php  |  14 +--
 .../Config/General/LoggingConfigForm.php      |  14 +--
 .../forms/Config/GeneralConfigForm.php        |   7 +-
 .../forms/Config/Resource/DbResourceForm.php  | 106 +++++++++---------
 .../Config/Resource/FileResourceForm.php      |  38 +++----
 .../Config/Resource/LdapResourceForm.php      |  80 ++++++-------
 .../Resource/LivestatusResourceForm.php       |  20 ++--
 .../Config/Resource/StatusdatResourceForm.php |  44 ++++----
 .../forms/Config/ResourceConfigForm.php       |  46 ++++----
 library/Icinga/Web/Form.php                   |  10 +-
 15 files changed, 337 insertions(+), 337 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index bdf8956a3..0d9b8dedc 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -26,34 +26,34 @@ class LoginForm extends Form
      */
     public function createElements($formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'username',
-                array(
-                    'required'      => true,
-                    'label'         => t('Username'),
-                    'placeholder'   => t('Please enter your username...'),
-                    'class'         => false === isset($formData['username']) ? 'autofocus' : ''
-                )
-            ),
-            $this->createElement(
-                'password',
-                'password',
-                array(
-                    'required'      => true,
-                    'label'         => t('Password'),
-                    'placeholder'   => t('...and your password'),
-                    'class'         => isset($formData['username']) ? 'autofocus' : ''
-                )
-            ),
-            $this->createElement(
-                'hidden',
-                'redirect',
-                array(
-                    'value' => Url::fromRequest()->getParam('redirect')
-                )
+        $this->addElement(
+            'text',
+            'username',
+            array(
+                'required'      => true,
+                'label'         => t('Username'),
+                'placeholder'   => t('Please enter your username...'),
+                'class'         => false === isset($formData['username']) ? 'autofocus' : ''
             )
         );
+        $this->addElement(
+            'password',
+            'password',
+            array(
+                'required'      => true,
+                'label'         => t('Password'),
+                'placeholder'   => t('...and your password'),
+                'class'         => isset($formData['username']) ? 'autofocus' : ''
+            )
+        );
+        $this->addElement(
+            'hidden',
+            'redirect',
+            array(
+                'value' => Url::fromRequest()->getParam('redirect')
+            )
+        );
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index cb4d100a0..4f4df73e3 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -25,52 +25,52 @@ class AutologinBackendForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'      => true,
-                    'label'         => t('Backend Name'),
-                    'description'   => t('The name of this authentication backend'),
-                    'validators'    => array(
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Backend Name'),
+                'description'   => t('The name of this authentication backend'),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
                         array(
-                            'Regex',
-                            false,
-                            array(
-                                'pattern'  => '/^[^\\[\\]:]+$/',
-                                'messages' => array(
-                                    'regexNotMatch' => 'The backend name cannot contain \'[\', \']\' or \':\'.'
-                                )
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => 'The backend name cannot contain \'[\', \']\' or \':\'.'
                             )
                         )
                     )
                 )
-            ),
-            $this->createElement(
-                'text',
-                'strip_username_regexp',
-                array(
-                    'required'      => true,
-                    'label'         => t('Backend Domain Pattern'),
-                    'description'   => t('The domain pattern of this authentication backend'),
-                    'value'         => '/\@[^$]+$/',
-                    'validators'    => array(
-                        new Zend_Validate_Callback(function ($value) {
-                            return @preg_match($value, '') !== false;
-                        })
-                    )
-                )
-            ),
-            $this->createElement(
-                'hidden',
-                'backend',
-                array(
-                    'required'  => true,
-                    'value'     => 'autologin'
+            )
+        );
+        $this->addElement(
+            'text',
+            'strip_username_regexp',
+            array(
+                'required'      => true,
+                'label'         => t('Backend Domain Pattern'),
+                'description'   => t('The domain pattern of this authentication backend'),
+                'value'         => '/\@[^$]+$/',
+                'validators'    => array(
+                    new Zend_Validate_Callback(function ($value) {
+                        return @preg_match($value, '') !== false;
+                    })
                 )
             )
         );
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'required'  => true,
+                'value'     => 'autologin'
+            )
+        );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 603aaeb79..23335f8fa 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -48,37 +48,37 @@ class DbBackendForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'      => true,
-                    'label'         => t('Backend Name'),
-                    'description'   => t('The name of this authentication provider'),
-                )
-            ),
-            $this->createElement(
-                'select',
-                'resource',
-                array(
-                    'required'      => true,
-                    'label'         => t('Database Connection'),
-                    'description'   => t('The database connection to use for authenticating with this provider'),
-                    'multiOptions'  => false === empty($this->resources)
-                        ? array_combine($this->resources, $this->resources)
-                        : array()
-                )
-            ),
-            $this->createElement(
-                'hidden',
-                'backend',
-                array(
-                    'required'  => true,
-                    'value'     => 'db'
-                )
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Backend Name'),
+                'description'   => t('The name of this authentication provider'),
             )
         );
+        $this->addElement(
+            'select',
+            'resource',
+            array(
+                'required'      => true,
+                'label'         => t('Database Connection'),
+                'description'   => t('The database connection to use for authenticating with this provider'),
+                'multiOptions'  => false === empty($this->resources)
+                    ? array_combine($this->resources, $this->resources)
+                    : array()
+            )
+        );
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'required'  => true,
+                'value'     => 'db'
+            )
+        );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 79949e2de..9db773708 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -47,57 +47,57 @@ class LdapBackendForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'      => true,
-                    'label'         => t('Backend Name'),
-                    'description'   => t('The name of this authentication backend')
-                )
-            ),
-            $this->createElement(
-                'select',
-                'resource',
-                array(
-                    'required'      => true,
-                    'label'         => t('LDAP Resource'),
-                    'description'   => t('The resource to use for authenticating with this provider'),
-                    'multiOptions'  => false === empty($this->resources)
-                        ? array_combine($this->resources, $this->resources)
-                        : array()
-                )
-            ),
-            $this->createElement(
-                'text',
-                'user_class',
-                array(
-                    'required'      => true,
-                    'label'         => t('LDAP User Object Class'),
-                    'description'   => t('The object class used for storing users on the ldap server'),
-                    'value'         => 'inetOrgPerson'
-                )
-            ),
-            $this->createElement(
-                'text',
-                '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'),
-                    'value'         => 'uid'
-                )
-            ),
-            $this->createElement(
-                'hidden',
-                'backend',
-                array(
-                    'required'  => true,
-                    'value'     => 'ldap'
-                )
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Backend Name'),
+                'description'   => t('The name of this authentication backend')
             )
         );
+        $this->addElement(
+            'select',
+            'resource',
+            array(
+                'required'      => true,
+                'label'         => t('LDAP Resource'),
+                'description'   => t('The resource to use for authenticating with this provider'),
+                'multiOptions'  => false === empty($this->resources)
+                    ? array_combine($this->resources, $this->resources)
+                    : array()
+            )
+        );
+        $this->addElement(
+            'text',
+            'user_class',
+            array(
+                'required'      => true,
+                'label'         => t('LDAP User Object Class'),
+                'description'   => t('The object class used for storing users on the ldap server'),
+                'value'         => 'inetOrgPerson'
+            )
+        );
+        $this->addElement(
+            'text',
+            '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'),
+                'value'         => 'uid'
+            )
+        );
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'required'  => true,
+                'value'     => 'ldap'
+            )
+        );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index f91044446..9068ed25a 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -299,8 +299,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
             $backendTypes['autologin'] = t('Autologin');
         }
 
-        $elements = array();
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'type',
             array(
@@ -315,9 +314,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
 
         if (isset($formData['force_creation']) && $formData['force_creation']) {
             // In case another error occured and the checkbox was displayed before
-            $elements[] = $this->getForceCreationCheckbox();
+            $this->addElement($this->getForceCreationCheckbox());
         }
 
-        return array_merge($elements, $this->getBackendForm($backendType)->createElements($formData));
+        $this->addElements($this->getBackendForm($backendType)->createElements($formData)->getElements());
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 7f3b746e4..fda695886 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -27,14 +27,12 @@ class ApplicationConfigForm extends Form
      */
     public function createElements(array $formData)
     {
-        $elements = array();
-
         $languages = array();
         foreach (Translator::getAvailableLocaleCodes() as $language) {
             $languages[$language] = $language;
         }
 
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'global_language',
             array(
@@ -52,7 +50,7 @@ class ApplicationConfigForm extends Form
             $tzList[$tz] = $tz;
         }
 
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'global_timezone',
             array(
@@ -67,7 +65,7 @@ class ApplicationConfigForm extends Form
             )
         );
 
-        $elements[] = $this->createElement(
+        $this->addElement(
             'text',
             'global_modulePath',
             array(
@@ -82,7 +80,7 @@ class ApplicationConfigForm extends Form
             )
         );
 
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'preferences_type',
             array(
@@ -104,7 +102,7 @@ class ApplicationConfigForm extends Form
                 }
             }
 
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'select',
                 'preferences_resource',
                 array(
@@ -115,6 +113,6 @@ class ApplicationConfigForm extends Form
             );
         }
 
-        return $elements;
+        return $this;
     }
 }
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 07f2e4d78..135dd9e28 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -23,9 +23,7 @@ class LoggingConfigForm extends Form
      */
     public function createElements(array $formData)
     {
-        $elements = array();
-
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'logging_level',
             array(
@@ -41,7 +39,7 @@ class LoggingConfigForm extends Form
                 )
             )
         );
-        $elements[] = $this->createElement(
+        $this->addElement(
             'select',
             'logging_type',
             array(
@@ -57,7 +55,7 @@ class LoggingConfigForm extends Form
         );
 
         if (false === isset($formData['logging_type']) || $formData['logging_type'] === 'syslog') {
-            $elements[] = $this->createElement(
+           $this->addElement(
                 'text',
                 'logging_application',
                 array(
@@ -79,7 +77,7 @@ class LoggingConfigForm extends Form
                     )
                 )
             );
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'select',
                 'logging_facility',
                 array(
@@ -92,7 +90,7 @@ class LoggingConfigForm extends Form
                 )
             );
         } elseif ($formData['logging_type'] === 'file') {
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'text',
                 'logging_target',
                 array(
@@ -105,7 +103,7 @@ class LoggingConfigForm extends Form
             );
         }
 
-        return $elements;
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index ea89e1b76..ffb0a7d1c 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -31,11 +31,10 @@ class GeneralConfigForm extends ConfigForm
     {
         $appConfigForm = new ApplicationConfigForm();
         $loggingConfigForm = new LoggingConfigForm();
+        $this->addElements($appConfigForm->createElements($formData)->getElements());
+        $this->addElements($loggingConfigForm->createElements($formData)->getElements());
 
-        return array_merge(
-            $appConfigForm->createElements($formData),
-            $loggingConfigForm->createElements($formData)
-        );
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index e5ae4b9a7..4fd7297d9 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -29,31 +29,31 @@ class DbResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'select',
-                'db',
-                array(
-                    'required'      => true,
-                    'label'         => t('Database Type'),
-                    'description'   => t('The type of SQL database'),
-                    'multiOptions'  => array(
-                        'mysql'     => 'MySQL',
-                        'pgsql'     => 'PostgreSQL'
-                        //'oracle'    => 'Oracle'
-                    )
+        $this->addElement(
+            'select',
+            'db',
+            array(
+                'required'      => true,
+                'label'         => t('Database Type'),
+                'description'   => t('The type of SQL database'),
+                'multiOptions'  => array(
+                    'mysql'     => 'MySQL',
+                    'pgsql'     => 'PostgreSQL'
+                    //'oracle'    => 'Oracle'
                 )
-            ),
-            $this->createElement(
-                'text',
-                'host',
-                array (
-                    'required'      => true,
-                    'label'         => t('Host'),
-                    'description'   => t('The hostname of the database'),
-                    'value'         => 'localhost'
-                )
-            ),
+            )
+        );
+        $this->addElement(
+            'text',
+            'host',
+            array (
+                'required'      => true,
+                'label'         => t('Host'),
+                'description'   => t('The hostname of the database'),
+                'value'         => 'localhost'
+            )
+        );
+        $this->addElement(
             new Number(
                 array(
                     'required'      => true,
@@ -62,36 +62,38 @@ class DbResourceForm extends Form
                     'description'   => t('The port to use'),
                     'value'         => 3306
                 )
-            ),
-            $this->createElement(
-                'text',
-                'dbname',
-                array(
-                    'required'      => true,
-                    'label'         => t('Database Name'),
-                    'description'   => t('The name of the database to use')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'username',
-                array (
-                    'required'      => true,
-                    'label'         => t('Username'),
-                    'description'   => t('The user name to use for authentication')
-                )
-            ),
-            $this->createElement(
-                'password',
-                'password',
-                array(
-                    'required'          => true,
-                    'renderPassword'    => true,
-                    'label'             => t('Password'),
-                    'description'       => t('The password to use for authentication')
-                )
             )
         );
+        $this->addElement(
+            'text',
+            'dbname',
+            array(
+                'required'      => true,
+                'label'         => t('Database Name'),
+                'description'   => t('The name of the database to use')
+            )
+        );
+        $this->addElement(
+            'text',
+            'username',
+            array (
+                'required'      => true,
+                'label'         => t('Username'),
+                'description'   => t('The user name to use for authentication')
+            )
+        );
+        $this->addElement(
+            'password',
+            'password',
+            array(
+                'required'          => true,
+                'renderPassword'    => true,
+                'label'             => t('Password'),
+                'description'       => t('The password to use for authentication')
+            )
+        );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 422979585..d1d33a749 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -25,26 +25,26 @@ class FileResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'filename',
-                array(
-                    'required'      => true,
-                    'label'         => t('Filepath'),
-                    'description'   => t('The filename to fetch information from'),
-                    'validators'    => array(new ReadablePathValidator())
-                )
-            ),
-            $this->createElement(
-                'text',
-                'fields',
-                array(
-                    'required'      => true,
-                    'label'         => t('Pattern'),
-                    'description'   => t('The regular expression by which to identify columns')
-                )
+        $this->addElement(
+            'text',
+            'filename',
+            array(
+                'required'      => true,
+                'label'         => t('Filepath'),
+                'description'   => t('The filename to fetch information from'),
+                'validators'    => array(new ReadablePathValidator())
             )
         );
+        $this->addElement(
+            'text',
+            'fields',
+            array(
+                'required'      => true,
+                'label'         => t('Pattern'),
+                'description'   => t('The regular expression by which to identify columns')
+            )
+        );
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 3b3075dc7..6196f3a17 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -29,17 +29,17 @@ class LdapResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'hostname',
-                array(
-                    'required'      => true,
-                    'label'         => t('Host'),
-                    'description'   => t('The hostname or address of the LDAP server to use for authentication'),
-                    'value'         => 'localhost'
-                )
-            ),
+        $this->addElement(
+            'text',
+            'hostname',
+            array(
+                'required'      => true,
+                'label'         => t('Host'),
+                'description'   => t('The hostname or address of the LDAP server to use for authentication'),
+                'value'         => 'localhost'
+            )
+        );
+        $this->addElement(
             new Number(
                 array(
                     'required'      => true,
@@ -48,36 +48,38 @@ class LdapResourceForm extends Form
                     'description'   => t('The port of the LDAP server to use for authentication'),
                     'value'         => 389
                 )
-            ),
-            $this->createElement(
-                'text',
-                'root_dn',
-                array(
-                    'required'      => true,
-                    'label'         => t('Root DN'),
-                    'description'   => t('The path where users can be found on the ldap server')
-                )
-            ),
-            $this->createElement(
-                'text',
-                'bind_dn',
-                array(
-                    'required'      => true,
-                    'label'         => t('Bind DN'),
-                    'description'   => t('The user dn to use for querying the ldap server')
-                )
-            ),
-            $this->createElement(
-                'password',
-                'bind_pw',
-                array(
-                    'required'          => true,
-                    'renderPassword'    => true,
-                    'label'             => t('Bind Password'),
-                    'description'       => t('The password to use for querying the ldap server')
-                )
             )
         );
+        $this->addElement(
+            'text',
+            'root_dn',
+            array(
+                'required'      => true,
+                'label'         => t('Root DN'),
+                'description'   => t('The path where users can be found on the ldap server')
+            )
+        );
+        $this->addElement(
+            'text',
+            'bind_dn',
+            array(
+                'required'      => true,
+                'label'         => t('Bind DN'),
+                'description'   => t('The user dn to use for querying the ldap server')
+            )
+        );
+        $this->addElement(
+            'password',
+            'bind_pw',
+            array(
+                'required'          => true,
+                'renderPassword'    => true,
+                'label'             => t('Bind Password'),
+                'description'       => t('The password to use for querying the ldap server')
+            )
+        );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index e7e49a375..92534f220 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -29,18 +29,18 @@ class LivestatusResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'socket',
-                array(
-                    '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')
-                )
+        $this->addElement(
+            'text',
+            'socket',
+            array(
+                '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')
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
index 69c3d9040..f150056d1 100644
--- a/application/forms/Config/Resource/StatusdatResourceForm.php
+++ b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -26,29 +26,29 @@ class StatusdatResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        return array(
-            $this->createElement(
-                'text',
-                'status_file',
-                array(
-                    'required'      => true,
-                    'label'         => t('Filepath'),
-                    'description'   => t('Location of your icinga status.dat file'),
-                    'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'),
-                    'validators'    => array(new ReadablePathValidator())
-                )
-            ),
-            $this->createElement(
-                'text',
-                'object_file',
-                array(
-                    'required'      => true,
-                    'label'         => t('Filepath'),
-                    'description'   => t('Location of your icinga objects.cache file'),
-                    'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'),
-                    'validators'    => array(new ReadablePathValidator())
-                )
+        $this->addElement(
+            'text',
+            'status_file',
+            array(
+                'required'      => true,
+                'label'         => t('Filepath'),
+                'description'   => t('Location of your icinga status.dat file'),
+                'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'),
+                'validators'    => array(new ReadablePathValidator())
             )
         );
+        $this->addElement(
+            'text',
+            'object_file',
+            array(
+                'required'      => true,
+                'label'         => t('Filepath'),
+                'description'   => t('Location of your icinga objects.cache file'),
+                'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'),
+                'validators'    => array(new ReadablePathValidator())
+            )
+        );
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 9a3ae7793..d9ec4dad3 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -224,35 +224,35 @@ class ResourceConfigForm extends ConfigForm
             $resourceTypes['db'] = t('SQL Database');
         }
 
-        $elements = array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'      => true,
-                    'label'         => t('Resource Name'),
-                    'description'   => t('The unique name of this resource')
-                )
-            ),
-            $this->createElement(
-                'select',
-                'type',
-                array(
-                    'required'          => true,
-                    'autosubmit'        => true,
-                    'label'             => t('Resource Type'),
-                    'description'       => t('The type of resource'),
-                    'multiOptions'      => $resourceTypes,
-                    'value'             => $resourceType
-                )
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
+        $this->addElement(
+            'select',
+            'type',
+            array(
+                'required'          => true,
+                'autosubmit'        => true,
+                'label'             => t('Resource Type'),
+                'description'       => t('The type of resource'),
+                'multiOptions'      => $resourceTypes,
+                'value'             => $resourceType
             )
         );
 
         if (isset($formData['force_creation']) && $formData['force_creation']) {
             // In case another error occured and the checkbox was displayed before
-            $elements[] = $this->getForceCreationCheckbox();
+            $this->addElement($this->getForceCreationCheckbox());
         }
 
-        return array_merge($elements, $this->getResourceForm($resourceType)->createElements($formData));
+        $this->addElements($this->getResourceForm($resourceType)->createElements($formData)->getElements());
+
+        return $this;
     }
 }
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 2c0fb2a89..13ed535e3 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -269,8 +269,8 @@ class Form extends Zend_Form
     public function create(array $formData = array())
     {
         if (false === $this->created) {
-            $this->addElements($this->createElements($formData));
-            $this->addFormIdentification()
+            $this->createElements($formData)
+                ->addFormIdentification()
                 ->addCsrfCounterMeasure()
                 ->addSubmitButton();
 
@@ -287,17 +287,17 @@ class Form extends Zend_Form
     }
 
     /**
-     * Create and return the elements to add to this form
+     * Create and add elements to this form
      *
      * Intended to be implemented by concrete form classes.
      *
      * @param   array   $formData   The data sent by the user
      *
-     * @return  array
+     * @return  self
      */
     public function createElements(array $formData)
     {
-        return array();
+        return $this;
     }
 
     /**

From 1a4e908461ecbfb646b6f4af75f753dd83557b8a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:36:18 +0200
Subject: [PATCH 149/277] lib: Let `DateTimeValidator' validate values as
 defined in HTML5

See http://www.w3.org/TR/html-markup/datatypes.html#common.data.datetime for the specification.

refs #6593
---
 .../Web/Form/Validator/DateTimeValidator.php  | 117 ++++--------------
 1 file changed, 21 insertions(+), 96 deletions(-)

diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index f1952f7d4..6b59d5263 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -4,127 +4,52 @@
 
 namespace Icinga\Web\Form\Validator;
 
-use Icinga\Util\DateTimeFactory;
+use DateTime;
 use Zend_Validate_Abstract;
-use Icinga\Exception\ProgrammingError;
 
 /**
- * Validator that checks if a textfield contains a correct date format
+ * Validator for date-and-time input controls
+ *
+ * @see \Icinga\Web\Form\Element\DateTimePicker For the date-and-time input control.
  */
 class DateTimeValidator extends Zend_Validate_Abstract
 {
-    /**
-     * Array of allowed patterns for datetime input
-     *
-     * @var array
-     */
-    private $patterns     = array();
+    protected $local;
 
     /**
-     * If the input is not a timestamp this contains the pattern that
-     * matched the input
+     * Create a new date-and-time input control validator
      *
-     * @var string|bool
+     * @param bool $local
      */
-    private $validPattern = false;
-
-    /**
-     * Error templates
-     *
-     * @var array
-     *
-     * @see Zend_Validate_Abstract::$_messageTemplates
-     */
-    protected $_messageTemplates = array();
-
-    /**
-     * Create this validator
-     *
-     * @param array $patterns   Array containing all allowed patterns as strings
-     */
-    public function __construct(array $patterns)
+    public function __construct($local)
     {
-        $this->patterns = $patterns;
-        $this->_messageTemplates = array(
-            'INVALID_TYPE'          => 'Invalid type given. Date/time string or Unix timestamp expected',
-            'NO_MATCHING_PATTERN'   => 'Invalid format given, valid formats are ' . $this->getAllowedPatternList()
-        );
+        $this->local = (bool) $local;
     }
 
     /**
-     * Check whether a variable is a Unix timestamp
+     * Is the date and time valid?
+     *
+     * @param   string|DateTime $value
+     * @param   mixed           $context
      *
-     * @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);
-    }
-
-    /**
-     * Returns a printable string containing all configured patterns
      *
-     * @return string
-     */
-    private function getAllowedPatternList()
-    {
-        return '"' . join('","', $this->patterns) . '"';
-    }
-
-    /**
-     * Validate the input value and set the value of @see validPattern if the input machtes a pattern
-     *
-     * @param   string  $value      The format string to validate
-     * @param   null    $context    The form context (ignored)
-     *
-     * @return  bool True when the input is valid, otherwise false
-     *
-     * @see     Zend_Validate_Abstract::isValid()
+     * @see     \Zend_Validate_Interface::isValid()
      */
     public function isValid($value, $context = null)
     {
-        $this->validPattern = false;
-        if (!is_string($value) && !is_int($value)) {
-            $this->error('INVALID_TYPE');
+        if (! $value instanceof DateTime && ! is_string($value)) {
+            $this->_error(t('Invalid type given. Instance of DateTime or date/time string expected'));
             return false;
         }
-
-        if ($this->isUnixTimestamp($value)) {
-            $dt = DateTimeFactory::create();
-            $dt->setTimestamp($value);
-        } else {
-            if (!isset($this->patterns)) {
-                throw new ProgrammingError('There are no allowed timeformats configured');
-            }
-
-            $match_found = false;
-            foreach ($this->patterns as $pattern) {
-                $dt = DateTimeFactory::parse($value, $pattern);
-                if ($dt !== false && $dt->format($pattern) === $value) {
-                    $match_found = true;
-                    $this->validPattern = $pattern;
-                    break;
-                }
-            }
-            if (!$match_found) {
-                $this->_error('NO_MATCHING_PATTERN');
+        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));
                 return false;
             }
         }
-
         return true;
     }
-
-    /**
-     * Return the matched pattern if any or false if input is a timestamp
-     *
-     * @return bool|string      False if input was a timestamp otherwise string with the dateformat pattern
-     */
-    public function getValidPattern()
-    {
-        return $this->validPattern;
-    }
 }

From 774db9a7c82230a88ff323dc099c16b4b654994b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:37:33 +0200
Subject: [PATCH 150/277] lib: Add function `isUnixTimestamp' to the
 `DateTimeFactory'

Before, the `DateTimeValidator' defined this function.

refs #6593
---
 library/Icinga/Util/DateTimeFactory.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 724b54770..4a482dc0a 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -76,4 +76,18 @@ class DateTimeFactory implements ConfigAwareFactory
     {
         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 de111318227a9cbb1d4c569965b20a7bb4e1704d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:38:32 +0200
Subject: [PATCH 151/277] lib: Fix `DateFormat's `isUnixTimestamp' usage

refs #6593
---
 application/views/helpers/DateFormat.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index a03316f25..76b56be65 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -5,7 +5,6 @@
 use Icinga\Application\Icinga;
 use Icinga\Application\Config;
 use Icinga\Util\DateTimeFactory;
-use Icinga\Web\Form\Validator\DateTimeValidator;
 
 /**
  * Helper to format date and time. Utilizes DateTimeFactory to ensure time zone awareness
@@ -58,7 +57,7 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
     public function format($timestamp, $format)
     {
         $dt = DateTimeFactory::create();
-        if (DateTimeValidator::isUnixTimestamp($timestamp)) {
+        if (DateTimeFactory::isUnixTimestamp($timestamp)) {
             $dt->setTimestamp($timestamp);
         } else {
             return $timestamp;

From 906de4e6792c1be2c364e6ca1df5e6329da091ba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:39:42 +0200
Subject: [PATCH 152/277] lib: Add the HTML5 attributes 'min', 'max' and 'step'
 to the number input control

refs #6593
---
 application/views/helpers/FormNumber.php   |  42 ++++++++-
 library/Icinga/Web/Form/Element/Number.php | 103 ++++++++++++++++++++-
 2 files changed, 142 insertions(+), 3 deletions(-)

diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 98cb8d06f..c3ccdcfd6 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -9,6 +9,26 @@ use \Zend_View_Helper_FormElement;
  */
 class Zend_View_Helper_FormNumber extends Zend_View_Helper_FormElement
 {
+    /**
+     * Format a number
+     *
+     * @param   $number
+     *
+     * @return  string
+     */
+    public function formatNumber($number)
+    {
+        if (empty($number)) {
+            return $number;
+        }
+        return $this->view->escape(
+            sprintf(
+                ctype_digit((string) $number) ? '%d' : '%F',
+                $number
+            )
+        );
+    }
+
     /**
      * Render the number input control
      *
@@ -28,11 +48,29 @@ class Zend_View_Helper_FormNumber extends Zend_View_Helper_FormElement
         if ($disable) {
             $disabled = ' disabled="disabled"';
         }
+        $min = '';
+        if (isset($attribs['min'])) {
+            $min = sprintf(' min="%s"', $this->formatNumber($attribs['min']));
+        }
+        unset($attribs['min']);  // Unset min to not render it again in $this->_htmlAttribs($attribs)
+        $max = '';
+        if (isset($attribs['max'])) {
+            $max = sprintf(' max="%s"', $this->formatNumber($attribs['max']));
+        }
+        unset($attribs['max']);  // Unset max to not render it again in $this->_htmlAttribs($attribs)
+        $step = '';
+        if (isset($attribs['step'])) {
+            $step = sprintf(' step="%s"', $attribs['step'] === 'any' ? 'any' : $this->formatNumber($attribs['step']));
+        }
+        unset($attribs['step']);  // Unset step to not render it again in $this->_htmlAttribs($attribs)
         $html5 = sprintf(
-            '<input type="number" name="%s" id="%s" value="%s"%s%s%s',
+            '<input type="number" name="%s" id="%s" value="%s"%s%s%s%s%s%s',
             $this->view->escape($name),
             $this->view->escape($id),
-            $this->view->escape($value),
+            $this->view->escape($this->formatNumber($value)),
+            $min,
+            $max,
+            $step,
             $disabled,
             $this->_htmlAttribs($attribs),
             $this->getClosingBracket()
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 3bfbc6406..75c08165c 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -29,12 +29,113 @@ class Number extends Zend_Form_Element
      */
     public $helper = 'formNumber';
 
+    /**
+     * The expected lower bound for the element’s value
+     *
+     * @var float|null
+     */
+    protected $min;
+
+    /**
+     * The expected upper bound for the element’s
+     *
+     * @var float|null
+     */
+    protected $max;
+
+    /**
+     * The value granularity of the element’s value
+     *
+     * Normally, number input controls are limited to an accuracy of integer values.
+     *
+     * @var float|string|null
+     */
+    protected $step;
+
     /**
      * (non-PHPDoc)
      * @see \Zend_Form_Element::init() For the method documentation.
      */
     public function init()
     {
-        $this->addValidator('Int');
+        $this->addValidator('Float', true);  // true for breaking the validator chain on failure
+        if ($this->min !== null) {
+            $this->addValidator('GreaterThan', true, array('min' => $this->min));
+        }
+        if ($this->max !== null) {
+            $this->addValidator('LessThan', true, array('max' => $this->max));
+        }
+    }
+
+    /**
+     * Set the expected lower bound for the element’s value
+     *
+     * @param   float $min
+     *
+     * @return  $this
+     */
+    public function setMin($min)
+    {
+        $this->min = (float) $min;
+        return $this;
+    }
+
+    /**
+     * Get the expected lower bound for the element’s value
+     *
+     * @return float|null
+     */
+    public function getMin()
+    {
+        return $this->min;
+    }
+
+    /**
+     * Set the expected upper bound for the element’s value
+     *
+     * @param   float $max
+     *
+     * @return  $this
+     */
+    public function setMax($max)
+    {
+        $this->max = (int) $max;
+        return $this;
+    }
+
+    /**
+     * Get the expected upper bound for the element’s value
+     *
+     * @return float|null
+     */
+    public function getMax()
+    {
+        return $this->max;
+    }
+
+    /**
+     * Set the value granularity of the element’s value
+     *
+     * @param   float|string $step
+     *
+     * @return  $this
+     */
+    public function setStep($step)
+    {
+        if ($step !== 'any') {
+            $step = (float) $step;
+        }
+        $this->step = $step;
+        return $this;
+    }
+
+    /**
+     * Get the value granularity of the element’s value
+     *
+     * @return float|string|null
+     */
+    public function getStep()
+    {
+        return $this->step;
     }
 }

From 2025fb3a2fdcb3e0eec7bc78bfbaea7f1460a7bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:40:58 +0200
Subject: [PATCH 153/277] lib: Let the date-and-time input control behave as
 defined in HTML5

refs #6593
---
 application/views/helpers/FormDateTime.php    |  91 +++++-----
 .../Web/Form/Element/DateTimePicker.php       | 159 +++++++++++-------
 2 files changed, 149 insertions(+), 101 deletions(-)

diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index 19a9cc3c5..cb760a620 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -2,18 +2,30 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Zend_View_Helper_FormElement;
-
 /**
- * Helper to generate a "datetime" element
+ * Render date-and-time input controls
  */
 class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
 {
     /**
-     * Generate a 'datetime' element
+     * Format date and time
+     *
+     * @param   DateTime  $dateTime
+     * @param   bool      $local
+     *
+     * @return  string
+     */
+    public function formatDate(DateTime $dateTime, $local)
+    {
+        $format = (bool) $local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
+        return $dateTime->format($format);
+    }
+
+    /**
+     * Render the date-and-time input control
      *
      * @param   string  $name       The element name
-     * @param   int     $value      The default timestamp
+     * @param   DateTime $value      The default timestamp
      * @param   array   $attribs    Attributes for the element tag
      *
      * @return  string  The element XHTML
@@ -21,50 +33,41 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
     public function formDateTime($name, $value = null, $attribs = null)
     {
         $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-        // Is it disabled?
+        extract($info);  // name, id, value, attribs, options, listsep, disable
+        /** @var string $id  */
+        /** @var bool $disable  */
         $disabled = '';
-        if ($disabled) {
+        if ($disable) {
             $disabled = ' disabled="disabled"';
         }
-
-        $jspicker = (isset($attribs['jspicker']) && $attribs['jspicker'] === true) ? true : false;
-
-        if (isset($value) && !empty($value)) {
-            if ($jspicker) {
-                $value = ' value="' . $this->view->dateFormat()->format($value, $attribs['defaultFormat']) . '"';
-            } else {
-                $value = ' value="' . $this->view->dateFormat()->formatDateTime($value) . '"';
-            }
-        } else {
-            $value = '';
+        if ($value instanceof DateTime) {
+            // If value was valid, it's a DateTime object
+            $value = $this->formatDate($value, $attribs['local']);
         }
-
-        // Build the element
-        $xhtml = '<div class="datetime' . (($jspicker === true) ? ' input-group' : ''). '">';
-
-        $xhtml .= '<input type="text" name="' . $name . '"'
-            . ' id="' . $name . '"'
-            . $value
-            . $disabled
-            . $this->_htmlAttribs($attribs);
-
-        if ($jspicker === true) {
-            $xhtml .= 'data-icinga-component="app/datetime"';
+        $min = '';
+        if (! empty($attribs['min'])) {
+            $min = sprintf(' min="%s"', $this->formatDate($attribs['min'], $attribs['local']));
         }
-
-        $xhtml .= $this->getClosingBracket();
-
-        if ($jspicker === true) {
-            $xhtml .= '<span class="input-group-addon">'
-                . '<a href="#">'
-                . '<i class="icinga-icon-reschedule"></i>'
-                . '</a>'
-                . '</span>';
+        unset($attribs['min']);  // Unset min to not render it again in $this->_htmlAttribs($attribs)
+        $max = '';
+        if (! empty($attribs['max'])) {
+            $max = sprintf(' max="%s"', $this->formatDate($attribs['max'], $attribs['local']));
         }
-
-        $xhtml .= '</div>';
-
-        return $xhtml;
+        unset($attribs['max']);  // Unset max to not render it again in $this->_htmlAttribs($attribs)
+        $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',
+            $type,
+            $this->view->escape($name),
+            $this->view->escape($id),
+            $this->view->escape($value),
+            $min,
+            $max,
+            $disabled,
+            $this->_htmlAttribs($attribs),
+            $this->getClosingBracket()
+        );
+        return $html5;
     }
 }
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index dd48bd7f2..47f9b26e9 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -4,100 +4,145 @@
 
 namespace Icinga\Web\Form\Element;
 
-use Icinga\Web\Form\Validator\DateTimeValidator;
-use Zend_Form_Element_Text;
+use DateTime;
 use Zend_Form_Element;
-use Icinga\Util\DateTimeFactory;
+use Icinga\Web\Form\Validator\DateTimeValidator;
 
 /**
- * Datetime form element which returns the input as Unix timestamp after the input has been proven valid. Utilizes
- * DateTimeFactory to ensure time zone awareness
+ * A date-and-time input control
  *
- * @see isValid()
+ * @method DateTime getValue()
  */
-class DateTimePicker extends Zend_Form_Element_Text
+class DateTimePicker extends Zend_Form_Element
 {
     /**
-     * Default format used my js picker
+     * Disable default decorators
+     *
+     * \Icinga\Web\Form sets default decorators for elements.
      *
-     * @var string
-     */
-    public $defaultFormat = 'Y-m-d H:i:s';
-
-    /**
-     * JS picker support on or off
      * @var bool
+     *
+     * @see \Icinga\Web\Form::__construct() For default element decorators.
      */
-    public $jspicker = true;
+    protected $_disableLoadDefaultDecorators = true;
 
     /**
-     * View helper to use
+     * Form view helper to use for rendering
+     *
      * @var string
      */
     public $helper = 'formDateTime';
 
     /**
-     * The validator used for datetime validation
-     * @var DateTimeValidator
+     * @var bool
      */
-    private $dateValidator;
+    protected $local = true;
 
     /**
-     * Valid formats to check user input against
-     * @var array
-     */
-    public $patterns = array();
-
-    /**
-     * Create a new DateTimePicker
+     * The expected lower bound for the element’s value
      *
-     * @param array|string|\Zend_Config $spec
-     * @param null $options
-     * @see Zend_Form_Element::__construct()
+     * @var DateTime|null
      */
-    public function __construct($spec, $options = null)
+    protected $min;
+
+    /**
+     * The expected upper bound for the element’s
+     *
+     * @var DateTime|null
+     */
+    protected $max;
+
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form_Element::init() For the method documentation.
+     */
+    public function init()
     {
-        parent::__construct($spec, $options);
+        $this->addValidator(
+            new DateTimeValidator($this->local), true  // true for breaking the validator chain on failure
+        );
+        if ($this->min !== null) {
+            $this->addValidator('GreaterThan', true, array('min' => $this->min));
+        }
+        if ($this->max !== null) {
+            $this->addValidator('LessThan', true, array('max' => $this->max));
+        }
+    }
 
-        $this->patterns[] = $this->defaultFormat;
+    public function setLocal($local)
+    {
+        $this->local = (bool) $local;
+        return $this;
+    }
 
-        $this->dateValidator = new DateTimeValidator($this->patterns);
-        $this->addValidator($this->dateValidator);
+    public function getLocal()
+    {
+        return $this->local;
     }
 
     /**
-     * Validate filtered date/time strings
+     * Set the expected lower bound for the element’s value
      *
-     * Expects one or more valid formats being set in $this->patterns. Sets element value as Unix timestamp
-     * if the input is considered valid. Utilizes DateTimeFactory to ensure time zone awareness.
+     * @param   DateTime $min
+     *
+     * @return  $this
+     */
+    public function setMin(DateTime $min)
+    {
+        $this->min = $min;
+        return $this;
+    }
+
+    /**
+     * Get the expected lower bound for the element’s value
+     *
+     * @return DateTime|null
+     */
+    public function getMin()
+    {
+        return $this->min;
+    }
+
+    /**
+     * Set the expected upper bound for the element’s value
+     *
+     * @param   DateTime $max
+     *
+     * @return  $this
+     */
+    public function setMax(DateTime $max)
+    {
+        $this->max = $max;
+        return $this;
+    }
+
+    /**
+     * Get the expected upper bound for the element’s value
+     *
+     * @return DateTime|null
+     */
+    public function getMax()
+    {
+        return $this->max;
+    }
+
+    /**
+     * Is the date and time valid?
+     *
+     * @param   string|DateTime     $value
+     * @param   mixed               $context
      *
-     * @param   string  $value
-     * @param   mixed   $context
      * @return  bool
      */
     public function isValid($value, $context = null)
     {
-        // Overwrite the internal validator to use
-
-        if (!parent::isValid($value, $context)) {
+        if (! parent::isValid($value, $context)) {
             return false;
         }
-        $pattern = $this->dateValidator->getValidPattern();
-        if (!$pattern) {
-            $this->setValue($value);
-            return true;
+        if (! $value instanceof DateTime) {
+            $format = $this->local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
+            $this->setValue(DateTime::createFromFormat($format, $value));
         }
-        $this->setValue(DateTimeFactory::parse($value, $pattern)->getTimestamp());
         return true;
     }
-
-    public function enableJsPicker()
-    {
-        $this->jspicker = true;
-    }
-
-    public function disableJsPicker()
-    {
-        $this->jspicker = false;
-    }
 }

From 5d1f2ada973cc85e45b17de42bd49f25288e0f00 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Sep 2014 14:42:49 +0200
Subject: [PATCH 154/277] monitoring/commands: Fix
 `ToggleFeatureCommandForm::onSucces()'s PHPDoc

refs #6593
---
 .../forms/Command/Instance/ToggleFeatureCommandForm.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
index 40413cced..04ed706a0 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
@@ -78,7 +78,7 @@ abstract class ToggleFeatureCommandForm extends CommandForm
 
     /**
      * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
      */
     public function onSuccess(Request $request)
     {

From 49562e75d7ed96574385a180caee282710950044 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Sep 2014 15:08:37 +0200
Subject: [PATCH 155/277] Adjust ..\Monitoring\Form\Config\SecurityForm to use
 handleRequest()

refs #5525
---
 .../controllers/ConfigController.php          | 25 ++-----
 .../forms/Config/SecurityConfigForm.php       | 68 +++++++++++++++++++
 .../application/forms/Config/SecurityForm.php | 42 ------------
 3 files changed, 73 insertions(+), 62 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Config/SecurityConfigForm.php
 delete mode 100644 modules/monitoring/application/forms/Config/SecurityForm.php

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index ce22d73df..a1bed1a4e 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -8,7 +8,7 @@ use Icinga\Web\Notification;
 use Icinga\Form\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\BackendForm;
 use Icinga\Module\Monitoring\Form\Config\InstanceForm;
-use Icinga\Module\Monitoring\Form\Config\SecurityForm;
+use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm;
 use Icinga\Exception\NotReadableError;
 
 /**
@@ -254,26 +254,11 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function securityAction()
     {
-        $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
-
-        $form = new SecurityForm();
-        $request = $this->getRequest();
-        $config = $this->Config()->toArray();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                $config['security'] = $form->getValues();
-                if ($this->writeConfiguration(new Zend_Config($config))) {
-                    Notification::success('Configuration modified successfully');
-                    $this->redirectNow('monitoring/config/security');
-                } else {
-                    $this->render('show-configuration');
-                    return;
-                }
-            }
-        } elseif (isset($config['security'])) {
-            $form->populate($config['security']);
-        }
+        $form = new SecurityConfigForm();
+        $form->setConfig($this->Config());
+        $form->handleRequest();
 
         $this->view->form = $form;
+        $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
     }
 }
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
new file mode 100644
index 000000000..33a03328e
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -0,0 +1,68 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config;
+
+use Icinga\Web\Request;
+use Icinga\Web\Notification;
+use Icinga\Form\ConfigForm;
+
+/**
+ * Form for modifying security relevant settings
+ */
+class SecurityConfigForm extends ConfigForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_security');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        $this->config->security = $this->getValues();
+
+        if ($this->save()) {
+            Notification::success(t('New security configuration has successfully been stored'));
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @see Form::onRequest()
+     */
+    public function onRequest(Request $request)
+    {
+        if (isset($this->config->security)) {
+            $this->populate($this->config->security->toArray());
+        }
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'protected_customvars',
+            array(
+                'required'      => true,
+                'label'         => 'Protected Custom Variables',
+                'description'   => '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.'
+            )
+        );
+
+        return $this;
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
deleted file mode 100644
index 48368d0f1..000000000
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config;
-
-use Icinga\Web\Form;
-
-/**
- * Form for modifying security relevant settings
- */
-class SecurityForm extends Form
-{
-    /**
-     * Initialize this form
-     */
-    public function init()
-    {
-        $this->setName('form_config_monitoring_security');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'protected_customvars',
-                array(
-                    'label'     =>  'Protected Custom Variables',
-                    'required'  =>  true,
-                    'helptext'  =>  '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.'
-                )
-            )
-        );
-    }
-}

From 9d66cc90232f664bc6b534acf3eeefbec3343821 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 4 Sep 2014 08:47:16 +0200
Subject: [PATCH 156/277] Adjust Monitoring\InstanceForm to use handleRequest()
 & Co.

refs #5525
---
 .../controllers/ConfigController.php          |  94 +++-----
 .../Config/Instance/LocalInstanceForm.php     |  37 +++
 .../Config/Instance/RemoteInstanceForm.php    |  68 ++++++
 .../forms/Config/InstanceConfigForm.php       | 211 ++++++++++++++++++
 .../application/forms/Config/InstanceForm.php | 156 -------------
 .../views/scripts/config/removeinstance.phtml |   4 +-
 6 files changed, 348 insertions(+), 222 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
 create mode 100644 modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
 create mode 100644 modules/monitoring/application/forms/Config/InstanceConfigForm.php
 delete mode 100644 modules/monitoring/application/forms/Config/InstanceForm.php

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index a1bed1a4e..5636b5b17 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -7,7 +7,7 @@ use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
 use Icinga\Form\ConfirmRemovalForm;
 use Icinga\Module\Monitoring\Form\Config\BackendForm;
-use Icinga\Module\Monitoring\Form\Config\InstanceForm;
+use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm;
 use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm;
 use Icinga\Exception\NotReadableError;
 
@@ -134,29 +134,31 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function removeinstanceAction()
     {
-        $instance = $this->getParam('instance');
-        $instancesConfig = $this->Config('instances')->toArray();
-        if (false === array_key_exists($instance, $instancesConfig)) {
-            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
-            Notification::error(sprintf($this->translate('Cannot remove "%s". Instance not found.'), $instance));
-            $this->redirectNow('monitoring/config');
-        }
+        $config = $this->Config('instances');
+        $form = new ConfirmRemovalForm(array(
+            'onSuccess' => function ($request) use ($config) {
+                $instanceName = $request->getQuery('instance');
+                $configForm = new InstanceConfigForm();
+                $configForm->setConfig($config);
 
-        $form = new ConfirmRemovalForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            unset($instancesConfig[$instance]);
-            if ($this->writeConfiguration($instancesConfig, 'instances')) {
-                Notification::success(sprintf($this->translate('Instance "%s" successfully removed.'), $instance));
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
+                try {
+                    $configForm->remove($instanceName);
+                } catch (InvalidArgumentException $e) {
+                    Notification::error($e->getMessage());
+                    return;
+                }
+
+                if ($configForm->save()) {
+                    Notification::success(sprintf(t('Instance "%s" successfully removed.'), $instanceName));
+                } else {
+                    return false;
+                }
             }
-        }
+        ));
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->name = $instance;
     }
 
     /**
@@ -164,36 +166,10 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function editinstanceAction()
     {
-        $instance = $this->getParam('instance');
-        $instancesConfig = $this->Config('instances')->toArray();
-        if (false === array_key_exists($instance, $instancesConfig)) {
-            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
-            Notification::error(sprintf($this->translate('Cannot edit "%s". Instance not found.'), $instance));
-            $this->redirectNow('monitoring/config');
-        }
-
-        $form = new InstanceForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                list($newName, $config) = $form->getInstanceConfig();
-
-                if ($newName !== $instance) {
-                    unset($instancesConfig[$instance]); // We can safely use unset as all values are part of the form
-                }
-
-                $instancesConfig[$newName] = $config;
-                if ($this->writeConfiguration($instancesConfig, 'instances')) {
-                    Notification::success(sprintf($this->translate('Instance "%s" successfully modified.'), $instance));
-                    $this->redirectNow('monitoring/config');
-                } else {
-                    $this->render('show-configuration');
-                    return;
-                }
-            }
-        } else {
-            $form->setInstanceConfig($instance, $instancesConfig[$instance]);
-        }
+        $form = new InstanceConfigForm();
+        $form->setConfig($this->Config('instances'));
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
     }
@@ -203,20 +179,10 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function createinstanceAction()
     {
-        $form = new InstanceForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            list($name, $config) = $form->getInstanceConfig();
-            $instancesConfig = $this->Config('instances')->toArray();
-            $instancesConfig[$name] = $config;
-            if ($this->writeConfiguration($instancesConfig, 'instances')) {
-                Notification::success(sprintf($this->translate('Instance "%s" created successfully.'), $name));
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
-            }
-        }
+        $form = new InstanceConfigForm();
+        $form->setConfig($this->Config('instances'));
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
     }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
new file mode 100644
index 000000000..513ba2433
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -0,0 +1,37 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config\Instance;
+
+use Icinga\Web\Form;
+
+class LocalInstanceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_instance_local');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'path',
+            array(
+                'required'      => true,
+                'label'         => t('Local Filepath'),
+                'value'         => '/usr/local/icinga/var/rw/icinga.cmd',
+                'description'   => t('The file path where the icinga commandpipe can be found')
+            )
+        );
+
+        return $this;
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
new file mode 100644
index 000000000..0e78a0aec
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -0,0 +1,68 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config\Instance;
+
+use Icinga\Web\Form;
+use Icinga\Web\Form\Element\Number;
+
+class RemoteInstanceForm extends Form
+{
+    public function init()
+    {
+        $this->setName('form_config_monitoring_instance_remote');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'host',
+            array(
+                'required'      => true,
+                'label'         => t('Remote Host'),
+                'description'   => t(
+                    'Enter the hostname or address of the machine on which the icinga instance is running'
+                )
+            )
+        );
+        $this->addElement(
+            new Number(
+                array(
+                    'required'      => true,
+                    'name'          => 'port',
+                    'label'         => t('Remote SSH Port'),
+                    'description'   => t('Enter the ssh port to use for connecting to the remote icinga instance'),
+                    'value'         => 22
+                )
+            )
+        );
+        $this->addElement(
+            'text',
+            'user',
+            array(
+                'required'      => true,
+                'label'         => t('Remote SSH User'),
+                'description'   => t(
+                    'Enter the username to use for connecting to the remote machine or leave blank for default'
+                )
+            )
+        );
+        $this->addElement(
+            'text',
+            'path',
+            array(
+                'required'      => true,
+                'label'         => t('Remote Filepath'),
+                'value'         => '/usr/local/icinga/var/rw/icinga.cmd',
+                'description'   => t('The file path where the icinga commandpipe can be found')
+            )
+        );
+
+        return $this;
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
new file mode 100644
index 000000000..011284a9a
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -0,0 +1,211 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config;
+
+use InvalidArgumentException;
+use Icinga\Web\Request;
+use Icinga\Form\ConfigForm;
+use Icinga\Web\Notification;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm;
+use Icinga\Module\Monitoring\Form\Config\Instance\RemoteInstanceForm;
+
+/**
+ * Form for modifying/creating monitoring instances
+ */
+class InstanceConfigForm extends ConfigForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_instance');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * Return a form object for the given instance type
+     *
+     * @param   string  $type               The instance type for which to return a form
+     *
+     * @return  Form
+     *
+     * @throws  InvalidArgumentException    In case the given instance type is invalid
+     */
+    public function getInstanceForm($type)
+    {
+        if ($type === 'local') {
+            return new LocalInstanceForm();
+        } elseif ($type === 'remote') {
+            return new RemoteInstanceForm();
+        } else {
+            throw new InvalidArgumentException(sprintf(t('Invalid instance type "%s" provided'), $type));
+        }
+    }
+
+    /**
+     * Add a new instance
+     *
+     * The resource to add is identified by the array-key `name'.
+     *
+     * @param   array   $values             The values to extend the configuration with
+     *
+     * @return  self
+     *
+     * @throws  InvalidArgumentException    In case the resource already exists
+     */
+    public function add(array $values)
+    {
+        $name = isset($values['name']) ? $values['name'] : '';
+        if (! $name) {
+            throw new InvalidArgumentException(t('Instance name missing'));
+        } elseif ($this->config->get($name) !== null) {
+            throw new InvalidArgumentException(t('Instance already exists'));
+        }
+
+        unset($values['name']);
+        $this->config->{$name} = $values;
+        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
+     *
+     * @return  array                       The edited resource configuration
+     *
+     * @throws  InvalidArgumentException    In case the resource name is missing or invalid
+     */
+    public function edit($name, array $values)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Old instance name missing'));
+        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
+            throw new InvalidArgumentException(t('New instance name missing'));
+        } elseif (! ($instanceConfig = $this->config->get($name))) {
+            throw new InvalidArgumentException(t('Unknown instance name provided'));
+        }
+
+        unset($values['name']);
+        unset($this->config->{$name});
+        $this->config->{$newName} = array_merge($instanceConfig->toArray(), $values);
+        return $this->config->{$newName};
+    }
+
+    /**
+     * Remove a instance
+     *
+     * @param   string      $name           The name of the resource to remove
+     *
+     * @return  array                       The removed resource confguration
+     *
+     * @throws  InvalidArgumentException    In case the resource name is missing or invalid
+     */
+    public function remove($name)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Instance name missing'));
+        } elseif (! ($instanceConfig = $this->config->get($name))) {
+            throw new InvalidArgumentException(t('Unknown instance name provided'));
+        }
+
+        unset($this->config->{$name});
+        return $instanceConfig;
+    }
+
+    /**
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        $instanceName = $request->getQuery('instance');
+
+        try {
+            if ($instanceName === null) { // create new instance
+                $this->add($this->getValues());
+                $message = t('Instance "%s" created successfully.');
+            } else { // edit existing instance
+                $this->edit($instanceName, $this->getValues());
+                $message = t('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;
+        }
+    }
+
+    /**
+     * @see Form::onRequest()
+     *
+     * @throws  ConfigurationError      In case the instance name is missing or invalid
+     */
+    public function onRequest(Request $request)
+    {
+        $instanceName = $request->getQuery('instance');
+        if ($instanceName !== null) {
+            if (! $instanceName) {
+                throw new ConfigurationError(t('Instance name missing'));
+            } elseif (false === isset($this->config->{$instanceName})) {
+                throw new ConfigurationError(t('Unknown instance name provided'));
+            }
+
+            $instanceConfig = $this->config->{$instanceName}->toArray();
+            $instanceConfig['name'] = $instanceName;
+            if (isset($instanceConfig['host'])) {
+                // Necessary as we have no config directive for setting the instance's type
+                $instanceConfig['type'] = 'remote';
+            }
+            $this->populate($instanceConfig);
+        }
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $instanceType = isset($formData['type']) ? $formData['type'] : 'local';
+
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'  => true,
+                'label'     => t('Instance Name')
+            )
+        );
+        $this->addElement(
+            'select',
+            'type',
+            array(
+                'required'      => true,
+                'ignore'        => true,
+                'autosubmit'    => true,
+                'label'         => t('Instance Type'),
+                'description'   => t(
+                    'When configuring a remote host, you need to setup passwordless key authentication'
+                ),
+                'multiOptions'  => array(
+                    'local'     => t('Local Command Pipe'),
+                    'remote'    => t('Remote Command Pipe')
+                ),
+                'value'         => $instanceType
+            )
+        );
+
+        $this->addElements($this->getInstanceForm($instanceType)->createElements($formData)->getElements());
+
+        return $this;
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
deleted file mode 100644
index 3794e3c54..000000000
--- a/modules/monitoring/application/forms/Config/InstanceForm.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config;
-
-use Icinga\Web\Form;
-use Icinga\Web\Form\Element\Number;
-use Icinga\Web\Form\Decorator\HelpText;
-use Icinga\Web\Form\Decorator\ElementWrapper;
-
-/**
- * Form for modifying/creating monitoring instances
- */
-class InstanceForm extends Form
-{
-    /**
-     * Initialize this form
-     */
-    public function init()
-    {
-        $this->setName('form_config_monitoring_instances');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $elements = array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'  => true,
-                    'label'     => t('Instance Name')
-                )
-            ),
-            $this->createElement(
-                'select',
-                'type',
-                array(
-                    'required'      => true,
-                    'ignore'        => true,
-                    'label'         => t('Instance Type'),
-                    'class'         => 'autosubmit',
-                    'helptext'      => t(
-                        'When configuring a remote host, you need to setup passwordless key authentication'
-                    ),
-                    'multiOptions'  => array(
-                        'local'     => t('Local Command Pipe'),
-                        'remote'    => t('Remote Command Pipe')
-                    )
-                )
-            )
-        );
-
-        if (isset($formData['type']) && $formData['type'] === 'remote') {
-            $elements[] = $this->createElement(
-                'text',
-                'host',
-                array(
-                    'required'  => true,
-                    'label'     => t('Remote Host'),
-                    'helptext'  => t(
-                        'Enter the hostname or address of the machine on which the icinga instance is running'
-                    )
-                )
-            );
-            $elements[] = new Number(
-                array(
-                    'required'      => true,
-                    'name'          => 'port',
-                    'label'         => t('Remote SSH Port'),
-                    'helptext'      => t('Enter the ssh port to use for connecting to the remote icinga instance'),
-                    'value'         => 22,
-                    'decorators'    => array( // The order is important!
-                        'ViewHelper',
-                        'Errors',
-                        new ElementWrapper(),
-                        new HelpText()
-                    )
-                )
-            );
-            $elements[] = $this->createElement(
-                'text',
-                'user',
-                array(
-                    'required'      => true,
-                    'label'         => t('Remote SSH User'),
-                    'helptext'      => t(
-                        'Enter the username to use for connecting to the remote machine or leave blank for default'
-                    )
-                )
-            );
-        } else {
-            // TODO(5967,5525): Without this element, switching the type to "local" causes
-            //                  the form to be processed as it's complete in that case.
-            $elements[] = $this->createElement(
-                'hidden',
-                'hitchhiker',
-                array(
-                    'required'  => true,
-                    'ignore'    => true,
-                    'value'     => 'Arthur'
-                )
-            );
-        }
-
-        $elements[] = $this->createElement(
-            'text',
-            'path',
-            array(
-                'required'  => true,
-                'label'     => t('Pipe Filepath'),
-                'value'     => '/usr/local/icinga/var/rw/icinga.cmd',
-                'helptext'  => t('The file path where the icinga commandpipe can be found')
-            )
-        );
-        return $elements;
-    }
-
-    /**
-     * Return the instance configuration values and its name
-     *
-     * The first value is the name and the second one the values as array.
-     *
-     * @return  array
-     */
-    public function getInstanceConfig()
-    {
-        $values = $this->getValues();
-        $name = $values['name'];
-        unset($values['name']);
-        return array($name, $values);
-    }
-
-    /**
-     * Populate the form with the given configuration values
-     *
-     * @param   string  $name       The name of the instance
-     * @param   array   $config     The configuration values
-     */
-    public function setInstanceConfig($name, array $config)
-    {
-        $config['name'] = $name;
-
-        if (isset($config['host'])) {
-            // Necessary as we have no config directive for setting the instance's type
-            $config['type'] = 'remote';
-        }
-
-        $this->populate($config);
-    }
-}
diff --git a/modules/monitoring/application/views/scripts/config/removeinstance.phtml b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
index 586452173..306d41815 100644
--- a/modules/monitoring/application/views/scripts/config/removeinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
@@ -1,4 +1,4 @@
 <h4><?= $this->translate('Remove Existing Instance'); ?></h4>
-<p>Are you sure you want to remove the instance <?= $this->escape($name); ?>?</p>
-<p><i class="icinga-icon-warning"></i> If you have still any environments or views referring to this instance, you won't be able to send commands anymore after deletion.</p>
+<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

From 439d1895a7c16dd5bbb35699858a14706ac38231 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 4 Sep 2014 11:25:47 +0200
Subject: [PATCH 157/277] Adjust Monitoring\BackendForm to use handleRequest()
 & Co.

refs #5525
---
 .../controllers/ConfigController.php          | 144 +++--------
 .../forms/Config/BackendConfigForm.php        | 244 ++++++++++++++++++
 .../application/forms/Config/BackendForm.php  | 125 ---------
 .../views/scripts/config/index.phtml          | 161 +++++-------
 4 files changed, 346 insertions(+), 328 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Config/BackendConfigForm.php
 delete mode 100644 modules/monitoring/application/forms/Config/BackendForm.php

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 5636b5b17..c2de49be1 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -2,14 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Config\PreservingIniWriter;
-use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Notification;
+use Icinga\Data\ResourceFactory;
 use Icinga\Form\ConfirmRemovalForm;
-use Icinga\Module\Monitoring\Form\Config\BackendForm;
+use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Module\Monitoring\Form\Config\BackendConfigForm;
 use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm;
 use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm;
-use Icinga\Exception\NotReadableError;
 
 /**
  * Configuration controller for editing monitoring resources
@@ -21,19 +20,9 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function indexAction()
     {
+        $this->view->backendsConfig = $this->Config('backends');
+        $this->view->instancesConfig = $this->Config('instances');
         $this->view->tabs = $this->Module()->getConfigTabs()->activate('backends');
-        foreach (array('backends', 'instances') as $element) {
-            try {
-                $elementConfig = $this->Config($element);
-                if ($elementConfig === null) {
-                    $this->view->{$element} = array();
-                } else {
-                    $this->view->{$element} = $elementConfig->toArray();
-                }
-            } catch (NotReadableError $e) {
-                $this->view->{$element} = $e;
-            }
-        }
     }
 
     /**
@@ -41,38 +30,11 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function editbackendAction()
     {
-        // Fetch the backend to be edited
-        $backend = $this->getParam('backend');
-        $backendsConfig = $this->Config('backends')->toArray();
-        if (false === array_key_exists($backend, $backendsConfig)) {
-            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
-            Notification::error(sprintf($this->translate('Cannot edit "%s". Backend not found.'), $backend));
-            $this->redirectNow('monitoring/config');
-        }
-
-        $form = new BackendForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                list($newName, $config) = $form->getBackendConfig();
-
-                if ($newName !== $backend) {
-                    // Backend name has changed
-                    unset($backendsConfig[$backend]); // We can safely use unset as all values are part of the form
-                }
-
-                $backendsConfig[$newName] = $config;
-                if ($this->writeConfiguration($backendsConfig, 'backends')) {
-                    Notification::success(sprintf($this->translate('Backend "%s" successfully modified.'), $backend));
-                    $this->redirectNow('monitoring/config');
-                } else {
-                    $this->render('show-configuration');
-                    return;
-                }
-            }
-        } else {
-            $form->setBackendConfig($backend, $backendsConfig[$backend]);
-        }
+        $form = new BackendConfigForm();
+        $form->setConfig($this->Config('backends'));
+        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
     }
@@ -82,20 +44,11 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function createbackendAction()
     {
-        $form = new BackendForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            list($name, $config) = $form->getBackendConfig();
-            $backendsConfig = $this->Config('backends')->toArray();
-            $backendsConfig[$name] = $config;
-            if ($this->writeConfiguration($backendsConfig, 'backends')) {
-                Notification::success(sprintf($this->translate('Backend "%s" created successfully.'), $name));
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
-            }
-        }
+        $form = new BackendConfigForm();
+        $form->setConfig($this->Config('backends'));
+        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
     }
@@ -105,26 +58,29 @@ class Monitoring_ConfigController extends ModuleActionController
      */
     public function removebackendAction()
     {
-        $backend = $this->getParam('backend');
-        $backendsConfig = $this->Config('backends')->toArray();
-        if (false === array_key_exists($backend, $backendsConfig)) {
-            // TODO: Should behave as in the app's config controller (Specific redirect to an error action)
-            Notification::error(sprintf($this->translate('Cannot remove "%s". Backend not found.'), $backend));
-            $this->redirectNow('monitoring/config');
-        }
+        $config = $this->Config('backends');
+        $form = new ConfirmRemovalForm(array(
+            'onSuccess' => function ($request) use ($config) {
+                $backendName = $request->getQuery('backend');
+                $configForm = new BackendConfigForm();
+                $configForm->setConfig($config);
 
-        $form = new ConfirmRemovalForm();
-        $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            unset($backendsConfig[$backend]);
-            if ($this->writeConfiguration($backendsConfig, 'backends')) {
-                Notification::success(sprintf($this->translate('Backend "%s" successfully removed.'), $backend));
-                $this->redirectNow('monitoring/config');
-            } else {
-                $this->render('show-configuration');
-                return;
+                try {
+                    $configForm->remove($backendName);
+                } catch (InvalidArgumentException $e) {
+                    Notification::error($e->getMessage());
+                    return;
+                }
+
+                if ($configForm->save()) {
+                    Notification::success(sprintf(t('Backend "%s" successfully removed.'), $backendName));
+                } else {
+                    return false;
+                }
             }
-        }
+        ));
+        $form->setRedirectUrl('monitoring/config');
+        $form->handleRequest();
 
         $this->view->form = $form;
     }
@@ -187,34 +143,6 @@ class Monitoring_ConfigController extends ModuleActionController
         $this->view->form = $form;
     }
 
-    /**
-     * Write configuration to an ini file
-     *
-     * @param   Zend_Config     $config     The configuration to write
-     * @param   string          $file       The config file to write to
-     *
-     * @return  bool                        Whether the configuration was written or not
-     */
-    protected function writeConfiguration($config, $file = null)
-    {
-        if (is_array($config)) {
-            $config = new Zend_Config($config);
-        }
-        $target = $this->Config($file)->getConfigFile();
-        $writer = new PreservingIniWriter(array('filename' => $target, 'config' => $config));
-
-        try {
-            $writer->write();
-        } catch (Exception $exc) {
-            $this->view->exceptionMessage = $exc->getMessage();
-            $this->view->iniConfigurationString = $writer->render();
-            $this->view->file = $target;
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Display a form to adjust security relevant settings
      */
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
new file mode 100644
index 000000000..84f68b57e
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -0,0 +1,244 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Config;
+
+use InvalidArgumentException;
+use Icinga\Web\Request;
+use Icinga\Web\Notification;
+use Icinga\Form\ConfigForm;
+use Icinga\Application\Config;
+use Icinga\Exception\ConfigurationError;
+
+/**
+ * Form class for creating/modifying monitoring backends
+ */
+class BackendConfigForm extends ConfigForm
+{
+    /**
+     * The available monitoring backend resources split by type
+     *
+     * @var array
+     */
+    protected $resources;
+
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_monitoring_backends');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * Set the resource configuration to use
+     *
+     * @param   Config      $resources      The resource configuration
+     *
+     * @return  self
+     *
+     * @throws  ConfigurationError          In case there are no valid monitoring backend resources
+     */
+    public function setResourceConfig(Config $resourceConfig)
+    {
+        $resources = array();
+        foreach ($resourceConfig as $name => $resource) {
+            if ($resource->type === 'db' || $resource->type === 'statusdat' || $resource->type === 'livestatus') {
+                $resources[$resource->type === 'db' ? 'ido' : strtolower($resource->type)][] = $name;
+            }
+        }
+
+        if (empty($resources)) {
+            throw new ConfigurationError(t('Could not find any valid monitoring backend resources'));
+        }
+
+        $this->resources = $resources;
+        return $this;
+    }
+
+    /**
+     * Add a particular monitoring backend
+     *
+     * The backend to add is identified by the array-key `name'.
+     *
+     * @param   array   $values             The values to extend the configuration with
+     *
+     * @return  self
+     *
+     * @throws  InvalidArgumentException    In case the backend does already exist
+     */
+    public function add(array $values)
+    {
+        $name = isset($values['name']) ? $values['name'] : '';
+        if (! $name) {
+            throw new InvalidArgumentException(t('Monitoring backend name missing'));
+        } elseif ($this->config->get($name) !== null) {
+            throw new InvalidArgumentException(t('Monitoring backend already exists'));
+        }
+
+        unset($values['name']);
+        $this->config->{$name} = $values;
+        return $this;
+    }
+
+    /**
+     * Edit a particular monitoring backend
+     *
+     * @param   string  $name               The name of the backend to edit
+     * @param   array   $values             The values to edit the configuration with
+     *
+     * @return  array                       The edited backend configuration
+     *
+     * @throws  InvalidArgumentException    In case the backend does not exist
+     */
+    public function edit($name, array $values)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Old monitoring backend name missing'));
+        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
+            throw new InvalidArgumentException(t('New monitoring backend name missing'));
+        } elseif (($backendConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown monitoring backend provided'));
+        }
+
+        unset($values['name']);
+        unset($this->config->{$name});
+        $this->config->{$newName} = $values;
+        return $this->config->{$newName};
+    }
+
+    /**
+     * Remove the given monitoring backend
+     *
+     * @param   string      $name           The name of the backend to remove
+     *
+     * @return  array                       The removed backend configuration
+     *
+     * @throws  InvalidArgumentException    In case the backend does not exist
+     */
+    public function remove($name)
+    {
+        if (! $name) {
+            throw new InvalidArgumentException(t('Monitoring backend name missing'));
+        } elseif (($backendConfig = $this->config->get($name)) === null) {
+            throw new InvalidArgumentException(t('Unknown monitoring backend provided'));
+        }
+
+        unset($this->config->{$name});
+        return $backendConfig;
+    }
+
+    /**
+     * Add or edit a monitoring backend and save the configuration
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        $monitoringBackend = $request->getQuery('backend');
+        try {
+            if ($monitoringBackend === null) { // create new backend
+                $this->add($this->getValues());
+                $message = t('Monitoring backend "%s" has been successfully created');
+            } else { // edit existing backend
+                $this->edit($monitoringBackend, $this->getValues());
+                $message = t('Monitoring 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 a monitoring 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(Request $request)
+    {
+        $monitoringBackend = $request->getQuery('backend');
+        if ($monitoringBackend !== null) {
+            if ($monitoringBackend === '') {
+                throw new ConfigurationError(t('Monitoring backend name missing'));
+            } elseif (false === isset($this->config->{$monitoringBackend})) {
+                throw new ConfigurationError(t('Unknown monitoring backend provided'));
+            }
+
+            $backendConfig = $this->config->{$monitoringBackend}->toArray();
+            $backendConfig['name'] = $monitoringBackend;
+            $this->populate($backendConfig);
+        }
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources);
+
+        $resourceTypes = array();
+        if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
+            $resourceTypes['ido'] = 'IDO Backend';
+        }
+        if ($resourceType === 'statusdat' || array_key_exists('statusdat', $this->resources)) {
+            $resourceTypes['statusdat'] = 'Status.dat';
+        }
+        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
+            $resourceTypes['livestatus'] = 'Livestatus';
+        }
+
+        $this->addElement(
+            'checkbox',
+            'disabled',
+            array(
+                'required'  => true,
+                'label'     => t('Disable This Backend')
+            )
+        );
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Backend Name'),
+                'description'   => t('The identifier of this backend')
+            )
+        );
+        $this->addElement(
+            'select',
+            'type',
+            array(
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => t('Backend Type'),
+                'description'   => t('The data source used for retrieving monitoring information'),
+                'multiOptions'  => $resourceTypes,
+                'value'         => $resourceType
+            )
+        );
+        $this->addElement(
+            'select',
+            'resource',
+            array(
+                'required'      => true,
+                'label'         => t('Resource'),
+                'description'   => t('The resource to use'),
+                'multiOptions'  => $this->resources[$resourceType]
+            )
+        );
+
+        return $this;
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
deleted file mode 100644
index f74c9bbaf..000000000
--- a/modules/monitoring/application/forms/Config/BackendForm.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Config;
-
-use Icinga\Web\Form;
-use Icinga\Data\ResourceFactory;
-
-/**
- * Form for modifying a monitoring backend
- */
-class BackendForm extends Form
-{
-    /**
-     * Initialize this form
-     */
-    public function init()
-    {
-        $this->setName('form_config_monitoring_backends');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        return array(
-            $this->createElement(
-                'text',
-                'name',
-                array(
-                    'required'  => true,
-                    'label'     => t('Backend Name'),
-                    'helptext'  => t('The identifier of this backend')
-                )
-            ),
-            $this->createElement(
-                'select',
-                'type',
-                array(
-                    'required'      => true,
-                    'class'         => 'autosubmit',
-                    'label'         => t('Backend Type'),
-                    'helptext'      => t('The data source used for retrieving monitoring information'),
-                    'multiOptions'  => array(
-                        'ido'           => 'IDO Backend',
-                        'statusdat'     => 'Status.dat',
-                        'livestatus'    => 'Livestatus'
-                    )
-                )
-            ),
-            $this->createElement(
-                'select',
-                'resource',
-                array(
-                    'required'      => true,
-                    'label'         => t('Resource'),
-                    'helptext'      => t('The resource to use'),
-                    'multiOptions'  => $this->getResourcesByType(
-                        false === isset($formData['type']) || $formData['type'] === 'ido' ? 'db' : $formData['type']
-                    )
-                )
-            ),
-            $this->createElement(
-                'checkbox',
-                'disabled',
-                array(
-                    'required'  => true,
-                    'label'     => t('Disable This Backend')
-                )
-            )
-        );
-    }
-
-    /**
-     * Return the backend configuration values and its name
-     *
-     * The first value is the name and the second one the values as array.
-     *
-     * @return  array
-     */
-    public function getBackendConfig()
-    {
-        $values = $this->getValues();
-        $name = $values['name'];
-
-        if ($values['disabled'] == '0') {
-            unset($values['disabled']);
-        }
-
-        unset($values['name']);
-        return array($name, $values);
-    }
-
-    /**
-     * Populate the form with the given configuration values
-     *
-     * @param   string  $name       The name of the backend
-     * @param   array   $config     The configuration values
-     */
-    public function setBackendConfig($name, array $config)
-    {
-        $config['name'] = $name;
-        $this->populate($config);
-    }
-
-    /**
-     * Return a list of all resources of the given type ready to be used as content for a select input
-     *
-     * @param   string  $type   The type of resources to return
-     *
-     * @return  array
-     */
-    protected function getResourcesByType($type)
-    {
-        $backends = array();
-        foreach (array_keys(ResourceFactory::getResourceConfigs($type)->toArray()) as $name) {
-            $backends[$name] = $name;
-        }
-
-        return $backends;
-    }
-}
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 41d2748d5..34f47a0b4 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -1,99 +1,70 @@
-<?php
-use Icinga\Web\Url;
-
-$fileNotReadable = array();
-foreach (array('backends', 'instances') as $element) {
-    if (is_object($this->{$element}) &&
-        get_class($this->{$element}) === 'Icinga\Exception\NotReadableError') {
-        $fileNotReadable[$element] = $this->{$element}->getMessage();
-    } else {
-        $fileNotReadable[$element] = false;
-    }
-}
-?>
-
 <div class="controls">
-    <?= $this->tabs->render($this); ?>
+  <?= $tabs; ?>
 </div>
 
 <div class="content" data-base-target="_next">
-    <?php if ($fileNotReadable['backends'] === false): ?>
-        <h1>Monitoring Backends</h1>
-
-        <?php if (isset($this->messageBox)): ?>
-            <?= $this->messageBox->render() ?>
-        <?php endif ?>
-
-        <p>
-            <a href="<?= Url::fromPath('/monitoring/config/createbackend')->getAbsoluteUrl();?>">
-                <?= $this->icon('create.png'); ?> Create New Monitoring Backend
-            </a>
-        </p>
-
-        <table class="action">
-            <thead>
-            <th>Monitoring Backend</th>
-            <th style="width: 5em">Remove</th>
-            </thead>
-            <tbody>
-            <?php foreach ($this->backends as $backendName => $config): ?>
-                <?php
-                $removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName));
-                $editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName));
-                ?>
-                <tr>
-                    <td>
-                        <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> <?= $this->escape($backendName); ?></a>
-                        <small>(Type: <?= $this->escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)</small>
-                    </td>
-                    <td>
-                        <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?></a>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
-    <?php else: ?>
-        <p class="fileNotReadable">
-            <?= $this->escape($fileNotReadable['backends']) ?>
-        </p>
-    <?php endif ?>
-
-    <?php if ($fileNotReadable['instances'] === false): ?>
-        <h1>Monitoring Instances</h1>
-
-        <p>
-            <a href="<?= Url::fromPath('/monitoring/config/createinstance')->getAbsoluteUrl();?>">
-                <?= $this->icon('create.png'); ?> Create New Instance
-            </a>
-        </p>
-
-        <table class="action">
-            <thead>
-                <th>Instance</th>
-                <th style="width: 5em">Remove</th>
-            </thead>
-            <tbody>
-                <?php foreach ($this->instances as $instanceName => $config): ?>
-                    <?php
-                    $removeUrl = Url::fromPath('/monitoring/config/removeinstance', array('instance' => $instanceName));
-                    $editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName));
-                    ?>
-                    <tr>
-                        <td>
-                            <a href="<?= $editUrl; ?>"><?= $this->icon('edit.png'); ?> <?= $this->escape($instanceName); ?></a>
-                            <small>(Type: <?= isset($config['host']) ? 'Remote' : 'Local'; ?>)</small>
-                        </td>
-                        <td>
-                            <a href="<?= $removeUrl; ?>"><?= $this->icon('remove.png'); ?></a>
-                        </td>
-                    </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    <?php else: ?>
-        <p class="fileNotReadable">
-            <?= $this->escape($fileNotReadable['instances']) ?>
-        </p>
-    <?php endif ?>
-</div>
+  <h1>Monitoring Backends</h1>
+  <p>
+    <a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
+      <?= $this->icon('create.png'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
+    </a>
+  </p>
+  <table class="action">
+    <thead>
+      <th><?= $this->translate('Monitoring Backend'); ?></th>
+      <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+    </thead>
+    <tbody>
+<?php foreach ($this->backendsConfig as $backendName => $config): ?>
+      <tr>
+        <td>
+          <a href="<?= $this->href('/monitoring/config/editbackend', array('backend' => $backendName)); ?>">
+            <?= $this->icon('edit.png'); ?> <?= $this->escape($backendName); ?>
+          </a>
+          <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('remove.png'); ?>
+          </a>
+        </td>
+      </tr>
+<?php endforeach; ?>
+    </tbody>
+  </table>
+  <h1>Monitoring Instances</h1>
+  <p>
+    <a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
+      <?= $this->icon('create.png'); ?> <?= $this->translate('Create New Instance'); ?>
+    </a>
+  </p>
+  <table class="action">
+    <thead>
+      <th><?= $this->translate('Instance'); ?></th>
+      <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+    </thead>
+    <tbody>
+<?php foreach ($this->instancesConfig as $instanceName => $config): ?>
+      <tr>
+        <td>
+          <a href="<?= $this->href('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>">
+            <?= $this->icon('edit.png'); ?> <?= $this->escape($instanceName); ?>
+          </a>
+          <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('remove.png'); ?>
+          </a>
+        </td>
+      </tr>
+<?php endforeach; ?>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file

From a45b17fcd0e3ed2023e39df2a1de8a91d06851ee Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 12:54:52 +0200
Subject: [PATCH 158/277] monitoring/lib: Add methods `Service::getHostName()'
 and `Service::getName()'

The upcoming service command objects will require a service object.
In order to build the command string, the service command objects require
retrieval of the service's host name and the service's name.

The actual implementation of the methods is subject to change

refs #6593
---
 .../library/Monitoring/Object/Service.php     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 598bb384d..bfc8325db 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -119,4 +119,24 @@ class Service extends AbstractObject
 
         return $this->view->getQuery()->fetchRow();
     }
+
+    /**
+     * Get the host name the service is running on
+     *
+     * @return string
+     */
+    public function getHostName()
+    {
+        return $this->params->get('host');
+    }
+
+    /**
+     * Get the service name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->params->get('service');
+    }
 }

From 8d109132b0cfca086a5fb0b1f4871e3446500a6c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 13:01:42 +0200
Subject: [PATCH 159/277] monitoring/commands: Add common
 `ScheduleDowntimeCommandForm'

`ScheduleDowntimeCommandForm' should be the base class for forms scheduling downtimes.

refs #6593
---
 .../Common/ScheduleDowntimeCommandForm.php    | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php
new file mode 100644
index 000000000..d48b814e7
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php
@@ -0,0 +1,153 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Common;
+
+use DateTime;
+use DateInterval;
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Number;
+
+/**
+ * Base class for downtime command forms on an Icinga instance
+ */
+abstract class ScheduleDowntimeCommandForm extends CommandForm
+{
+    /**
+     * Fixed downtime
+     */
+    const FIXED = 'fixed';
+
+    /**
+     * Flexible downtime
+     */
+    const FLEXIBLE = 'flexible';
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $start = new DateTime;
+        $end = clone $start;
+        $end->add(new DateInterval('PT1H'));
+        $this->addElements(array(
+            array(
+                'textarea',
+                'comment',
+                array(
+                    'required'      => true,
+                    '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.'
+                    )
+                )
+            ),
+            new DateTimePicker(
+                'start',
+                array(
+                    'required'      => true,
+                    'label'         => t('Start Time'),
+                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
+                    'value'         => $start
+                )
+            ),
+            new DateTimePicker(
+                'end',
+                array(
+                    'required'      => true,
+                    'label'         => t('End Time'),
+                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
+                    'value'         => $end
+                )
+            ),
+            array(
+                'select',
+                'type',
+                array(
+                    'required'      => true,
+                    'autosubmit'    => true,
+                    '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     => mt('monitoring', 'Fixed'),
+                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
+                    ),
+                    'validators' => array(
+                        array(
+                            'InArray',
+                            true,
+                            array(array(self::FIXED, self::FLEXIBLE))
+                        )
+                    )
+                )
+            )
+        ));
+        $this->addDisplayGroup(
+            array('start', 'end'),
+            'start-end',
+            array(
+                'decorators' => array(
+                    'FormElements',
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                )
+            )
+        );
+        if (isset($formData['type']) && $formData['type'] === self::FLEXIBLE) {
+            $this->addElements(array(
+                new Number(
+                    'hours',
+                    array(
+                        'required'  => true,
+                        'label'     => mt('monitoring', 'Hours'),
+                        'value'     => 2,
+                        'min'       => -1
+                    )
+                ),
+                new Number(
+                    'minutes',
+                    array(
+                        'required'  => true,
+                        'label'     => mt('monitoring', 'Minutes'),
+                        'value'     => 0,
+                        'min'       => -1
+                    )
+                )
+            ));
+            $this->addDisplayGroup(
+                array('hours', 'minutes'),
+                'duration',
+                array(
+                    '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.'
+                    ),
+                    'decorators' => array(
+                        'FormElements',
+                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group')),
+                        array(
+                            'Description',
+                            array('tag' => 'span', 'class' => 'description', 'placement' => 'prepend')
+                        ),
+                        'Fieldset'
+                    )
+                )
+            );
+        }
+        return $this;
+    }
+}

From bc1d00f146cae0e29a9e3656d39e48a47ad949b0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 13:02:38 +0200
Subject: [PATCH 160/277] monitoring/commands: Fix
 `ToggleFeatureCommandForm::createElements()'

`Icinga\Web\Form::createElements()' no longer requires to return an array of elements
because elements should be created directly.

refs #6593
---
 .../Instance/ToggleFeatureCommandForm.php       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
index 04ed706a0..ed48069e8 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
@@ -63,17 +63,16 @@ abstract class ToggleFeatureCommandForm extends CommandForm
                 ->getQuery()
                 ->fetchRow();
         }
-        return array(
-            $this->createElement(
-                'checkbox',
-                $this->feature,
-                array(
-                    'label'         => $this->label,
-                    'autosubmit'    => $this->inline,
-                    'value'         => $enabled
-                )
+        $this->addElement(
+            'checkbox',
+            $this->feature,
+            array(
+                'label'         => $this->label,
+                'autosubmit'    => $this->inline,
+                'value'         => $enabled
             )
         );
+        return $this;
     }
 
     /**

From 3d0a74bfdbe80e375d84578a4485a2f347020c8a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 13:04:54 +0200
Subject: [PATCH 161/277] monitoring/commands: Add
 `ToggleNotificationsCommandForm'

`ToggleNotificationsCommandForm' is the form for enabling/disabling host and service notifications on an Icinga instance.

refs #6593
---
 .../ToggleNotificationsCommandForm.php        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php
new file mode 100644
index 000000000..661d57dc5
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleNotifications;
+
+/**
+ * Form for enabling/disabling host and service notifications on an Icinga instance
+ */
+class ToggleNotificationsCommandForm extends ToggleFeatureCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Toggle Notifications'));
+        $this->setFeature('notifications_enabled', mt('monitoring', 'Notifications Enabled'));
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleNotifications
+     */
+    public function getCommand()
+    {
+        return new ToggleNotifications();
+    }
+}

From cb23ef3c4e0a3d282108bd337e985b2c4470c92d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 13:06:47 +0200
Subject: [PATCH 162/277] monitoring/commands: Add
 `DisableNotificationsCommandForm'

`DisableNotificationsCommandForm' is the form for disabling host and service notifications w/ an optional expire date and time on an Icinga instance.

refs #6593
---
 .../DisableNotificationsCommandForm.php       | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
new file mode 100644
index 000000000..8bf918631
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
@@ -0,0 +1,76 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use DateTime;
+use DateInterval;
+use Icinga\Module\Monitoring\Command\Instance\ToggleNotifications;
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for disabling host and service notifications w/ an optional expire date and time on an Icinga instance
+ */
+class DisableNotificationsCommandForm extends CommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Disable Notifications'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $expire = new DateTime();
+        $expire->add(new DateInterval('PT1H'));
+        $this->addElement(
+            new DateTimePicker(
+                'expire',
+                array(
+                    'required'      => true,
+                    'label'         => t('Expire Time'),
+                    'description'   => mt('monitoring', 'Set the start date and time for the service downtime.'),
+                    'value'         => $expire
+                )
+            )
+        );
+        return $this;
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ToggleNotifications
+     */
+    public function getCommand()
+    {
+        return new ToggleNotifications();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        $toggleNotifications = $this->getCommand();
+        $toggleNotifications
+            ->disable()
+            ->setExpire($this->getElement('expire')->getValue());
+        $this->getTransport($request)->send($toggleNotifications);
+        Notification::success(mt('monitoring', 'Command sent'));
+        return true;
+    }
+
+}

From ed645b1eeba0e2d5a0634dd984bc19db78a88ddc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 13:29:12 +0200
Subject: [PATCH 163/277] monitoring/commands: Fix
 `CommandForm::getTransport()'s PHPDoc

refs #6593
---
 modules/monitoring/application/forms/Command/CommandForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 4a0be0e32..ee74b1fb0 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -77,7 +77,7 @@ abstract class CommandForm extends Form
      *
      * @param   Request $request
      *
-     * @return  \Icinga\Module\Monitoring\Command\CommandTransportInterface
+     * @return  \Icinga\Module\Monitoring\Command\Transport\CommandTransportInterface
      */
     public function getTransport(Request $request)
     {

From 6f8fc3eb6d896cdf92ff09c3a195dace578e1e85 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:30:54 +0200
Subject: [PATCH 164/277] modules/command: Add command description to
 `DisableNotificationsCommandForm'

refs #6593
---
 .../Instance/DisableNotificationsCommandForm.php     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
index 8bf918631..43263cb84 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
@@ -32,6 +32,16 @@ class DisableNotificationsCommandForm extends CommandForm
      */
     public function createElements(array $formData = array())
     {
+        $this->addElement(
+            'note',
+            'command-info',
+            array(
+                'value' => mt(
+                    'monitoring',
+                    'This command is used to disable host and service notifications for a specific time.'
+                )
+            )
+        );
         $expire = new DateTime();
         $expire->add(new DateInterval('PT1H'));
         $this->addElement(
@@ -69,7 +79,7 @@ class DisableNotificationsCommandForm extends CommandForm
             ->disable()
             ->setExpire($this->getElement('expire')->getValue());
         $this->getTransport($request)->send($toggleNotifications);
-        Notification::success(mt('monitoring', 'Command sent'));
+        Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
         return true;
     }
 

From f57bb0f6a11ad3e6ca423d60c315de6d00fd093f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:37:30 +0200
Subject: [PATCH 165/277] modules/commands: Add common
 `ScheduleDowntimeCommand'

`ScheduleDowntimeCommand' is the base class for commands scheduling downtimes.

refs #6593
---
 .../Common/ScheduleDowntimeCommand.php        | 193 ++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
new file mode 100644
index 000000000..67713c425
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
@@ -0,0 +1,193 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Common;
+
+use DateTime;
+
+/**
+ * Base class for commands scheduling downtimes
+ */
+abstract class ScheduleDowntimeCommand extends Comment
+{
+    /**
+     * Downtime starts at the exact time specified
+     *
+     * If `Downtime::$flexible' is set to true, the time between `Downtime::$start' and `Downtime::$end' at which a
+     * host or service transitions to a problem state determines the time at which the downtime actually starts.
+     * The downtime will then last for `Downtime::$duration' seconds.
+     *
+     * @var DateTime
+     */
+    protected $start;
+
+    /**
+     * Downtime ends at the exact time specified
+     *
+     * If `Downtime::$flexible' is set to true, the time between `Downtime::$start' and `Downtime::$end' at which a
+     * host or service transitions to a problem state determines the time at which the downtime actually starts.
+     * The downtime will then last for `Downtime::$duration' seconds.
+     *
+     * @var DateTime
+     */
+    protected $end;
+
+    /**
+     * Whether it's a flexible downtime
+     *
+     * @var bool
+     */
+    protected $flexible = false;
+
+    /**
+     * ID of the downtime which triggers this downtime
+     *
+     * The start of this downtime is triggered by the start of the other scheduled host or service downtime.
+     *
+     * @var int|null
+     */
+    protected $triggerId;
+
+    /**
+     * The duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * If `Downtime::$flexible' is set to true, the downtime will last for the duration in seconds specified, even
+     * if the host or service recovers before the downtime expires.
+     *
+     * @var int|null
+     */
+    protected $duration;
+
+    /**
+     * Set the date and time when the downtime should start
+     *
+     * @param   DateTime $start
+     *
+     * @return  $this
+     */
+    public function setStart(DateTime $start)
+    {
+        $this->start = $start;
+        return $this;
+    }
+
+    /**
+     * Get the date and time when the downtime should start
+     *
+     * @return DateTime
+     */
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    /**
+     * Set the date and time when the downtime should end
+     *
+     * @param   DateTime $end
+     *
+     * @return  $this
+     */
+    public function setEnd(DateTime $end)
+    {
+        $this->end = $end;
+        return $this;
+    }
+
+    /**
+     * Get the date and time when the downtime should end
+     *
+     * @return DateTime
+     */
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    /**
+     * Set whether is flexible or fixed
+     *
+     * @param   boolean $flexible
+     *
+     * @return  $this
+     */
+    public function setFlexible($flexible = true)
+    {
+        $this->flexible = (bool) $flexible;
+        return $this;
+    }
+
+    /**
+     * Is the downtime flexible?
+     *
+     * @return boolean
+     */
+    public function getFlexible()
+    {
+        return $this->flexible;
+    }
+
+    /**
+     * Set the ID of the downtime which triggers this downtime
+     *
+     * @param   int $triggerId
+     *
+     * @return  $this
+     */
+    public function setTriggerId($triggerId)
+    {
+        $this->triggerId = (int) $triggerId;
+        return $this;
+    }
+
+    /**
+     * Get the ID of the downtime which triggers this downtime
+     *
+     * @return int|null
+     */
+    public function getTriggerId()
+    {
+        return $this->triggerId;
+    }
+
+    /**
+     * Set the duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * @param   int $duration
+     *
+     * @return  $this
+     */
+    public function setDuration($duration)
+    {
+        $this->duration = (int) $duration;
+        return $this;
+    }
+
+    /**
+     * Get the duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * @return int|null
+     */
+    public function getDuration()
+    {
+        return $this->duration;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return sprintf(
+            '%u;%u;%u;%u;%u;%s',
+            $this->start->getTimestamp(),
+            $this->end->getTimestamp(),
+            ! $this->flexible,
+            $this->triggerId,
+            $this->duration,
+            parent::getCommandString()
+        );
+    }
+}

From 1c8f880d182047b4163ffd49106070144cee8c74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:38:48 +0200
Subject: [PATCH 166/277] modules/command: Remove old `ScheduleDowntimeCommand'

refs #6593
---
 .../Command/ScheduleDowntimeCommand.php       | 257 ------------------
 1 file changed, 257 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php
deleted file mode 100644
index e1d79ddce..000000000
--- a/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Command for scheduling a new downtime
- */
-class ScheduleDowntimeCommand extends Command
-{
-    /**
-     * When this downtime should start
-     *
-     * @var int     The time as UNIX timestamp
-     */
-    private $startTime;
-
-    /**
-     * When this downtime should end
-     *
-     * @var int     The time as UNIX timestamp
-     */
-    private $endTime;
-
-    /**
-     * The comment associated with this downtime
-     *
-     * @var Comment
-     */
-    private $comment;
-
-    /**
-     * Whether this is a fixed or flexible downtime
-     *
-     * @var bool
-     */
-    private $fixed;
-
-    /**
-     * The duration to use when this downtime is a flexible one
-     *
-     * @var int     In seconds
-     */
-    private $duration;
-
-    /**
-     * The ID of the downtime which triggers this one
-     *
-     * @var int
-     */
-    private $triggerId;
-
-    /**
-     * Whether this downtime should trigger children hosts
-     *
-     * @var bool
-     */
-    private $triggerChildren;
-
-    /**
-     * Set when to start this downtime
-     *
-     * @param   int     $startTime
-     *
-     * @return  self
-     */
-    public function setStart($startTime)
-    {
-        $this->startTime = (int) $startTime;
-        return $this;
-    }
-
-    /**
-     * Set when to end this downtime
-     *
-     * @param   int     $endTime
-     *
-     * @return  self
-     */
-    public function setEnd($endTime)
-    {
-        $this->endTime = (int) $endTime;
-        return $this;
-    }
-
-    /**
-     * Set the comment for this downtime
-     *
-     * @param   Comment     $comment
-     *
-     * @return  self
-     */
-    public function setComment(Comment $comment)
-    {
-        $this->comment = $comment;
-        return $this;
-    }
-
-    /**
-     * Set whether this downtime is fixed or flexible
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setFixed($state)
-    {
-        $this->fixed = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set the duration of this downtime
-     *
-     * @param   int     $duration
-     *
-     * @return  self
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = (int) $duration;
-        return $this;
-    }
-
-    /**
-     * Set the triggering id for this downtime
-     *
-     * @param   int     $triggerId
-     *
-     * @return  self
-     */
-    public function setTriggerId($triggerId)
-    {
-        $this->triggerId = (int) $triggerId;
-        return $this;
-    }
-
-    /**
-     * Initialise a new command object to schedule a downtime
-     *
-     * @param   int         $startTime      When to start this downtime as UNIX timestamp
-     * @param   int         $endTime        When to end this downtime as UNIX timestamp
-     * @param   Comment     $comment        The comment to use for this downtime
-     * @param   bool        $fixed          Whether this downtime is fixed or flexible
-     * @param   int         $duration       How long in seconds this downtime should apply if flexible
-     * @param   int         $triggerId      The ID of the triggering downtime
-     */
-    public function __construct($startTime, $endTime, Comment $comment, $fixed = true, $duration = 0, $triggerId = 0)
-    {
-        $this->startTime = $startTime;
-        $this->endTime = $endTime;
-        $this->comment = $comment;
-        $this->fixed = $fixed;
-        $this->duration = $duration;
-        $this->triggerId = $triggerId;
-    }
-
-    /**
-     * Include all children hosts with this command
-     *
-     * @param   bool    $state
-     * @param   bool    $trigger    Whether children are triggered by this downtime
-     *
-     * @return  self
-     */
-    public function includeChildren($state = true, $trigger = false) {
-        $this->triggerChildren = (bool) $trigger;
-        return parent::includeChildren($state);
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        return array_merge(
-            array(
-                $this->startTime,
-                $this->endTime,
-                $this->fixed ? '1' : '0',
-                $this->triggerId,
-                $this->duration
-            ),
-            $this->comment->getArguments(true)
-        );
-    }
-
-    /**
-     * Return the command as a string for the given host
-     *
-     * @param   type    $hostname       The name of the host to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getHostCommand($hostname)
-    {
-        if ($this->withChildren) {
-            return sprintf('SCHEDULE_AND_PROPAGATE%s_HOST_DOWNTIME;', $this->triggerChildren ? '_TRIGGERED' : '')
-            . implode(';', array_merge(array($hostname), $this->getArguments()));
-        } else {
-            return sprintf('SCHEDULE_HOST%s_DOWNTIME;', $this->onlyServices ? '_SVC' : '')
-                . implode(';', array_merge(array($hostname), $this->getArguments()));
-        }
-    }
-
-    /**
-     * Return the command as a string for the given service
-     *
-     * @param   type    $hostname       The name of the host to insert
-     * @param   type    $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return 'SCHEDULE_SVC_DOWNTIME;' . implode(
-            ';',
-            array_merge(
-                array($hostname, $servicename),
-                $this->getArguments()
-            )
-        );
-    }
-
-    /**
-     * Return the command as a string for the given hostgroup
-     *
-     * @param   type    $hostgroup      The name of the hostgroup to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getHostgroupCommand($hostgroup)
-    {
-        return sprintf('SCHEDULE_HOSTGROUP_%s_DOWNTIME;', $this->withoutHosts ? 'SVC' : 'HOST')
-            . implode(';', array_merge(array($hostgroup), $this->getArguments()));
-    }
-
-    /**
-     * Return the command as a string for the given servicegroup
-     *
-     * @param   type    $servicegroup   The name of the servicegroup to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getServicegroupCommand($servicegroup)
-    {
-        return sprintf('SCHEDULE_SERVICEGROUP_%s_DOWNTIME;', $this->withoutServices ? 'HOST' : 'SVC')
-            . implode(';', array_merge(array($servicegroup), $this->getArguments()));
-    }
-}

From fe47441efcb6f6ed99e009e00fef860e4bcadb10 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:42:11 +0200
Subject: [PATCH 167/277] monitoring/commands: Add command to schedule a
 service downtime

refs #6593
---
 .../Command/Service/AddServiceComment.php     | 34 +++++++++++
 .../ScheduleServiceDowntimeCommand.php        | 59 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php b/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
new file mode 100644
index 000000000..926084bbf
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
@@ -0,0 +1,34 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Service;
+
+use Icinga\Module\Monitoring\Command\Common\Comment;
+
+class AddServiceComment extends Comment
+{
+    protected $service;
+
+    /**
+     * Whether the comment is persistent
+     *
+     * Persistent comments are not lost the next time the monitoring host restarts.
+     */
+    protected $persistent;
+
+    public function __construct($service)
+    {
+        $this->serivce = (string) $service;
+    }
+
+    public function getCommand()
+    {
+        return sprintf(
+            'ADD_SVC_COMMENT;%s;%u;%s',
+            $this->host,
+            $this->persistent,
+            parent::getCommand()
+        );
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php
new file mode 100644
index 000000000..4697be36b
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php
@@ -0,0 +1,59 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Service;
+
+use Icinga\Module\Monitoring\Command\Common\ScheduleDowntimeCommand;
+use Icinga\Module\Monitoring\Object\Service;
+
+/**
+ * Schedule a service downtime on an Icinga instance
+ */
+class ScheduleServiceDowntimeCommand extends ScheduleDowntimeCommand
+{
+    /**
+     * Service to set in downtime
+     *
+     * @var Service
+     */
+    protected $service;
+
+    /**
+     * Set the service to set in downtime
+     *
+     * @param   Service $service
+     *
+     * @return  $this
+     */
+    public function setService(Service $service)
+    {
+        $this->service = $service;
+        return $this;
+    }
+
+    /**
+     * Get the service to set in downtime
+     *
+     * @return Service
+     */
+    public function getService()
+    {
+        return $this->service;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return sprintf(
+            '%s;%s;%s;%s',
+            'SCHEDULE_SVC_DOWNTIME',
+            $this->service->getHostName(),
+            $this->service->getName(),
+            parent::getCommandString()
+        );
+    }
+}

From 1358a5d49f3a615361009ff42648a6d38aa9cc39 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:42:46 +0200
Subject: [PATCH 168/277] monitoring/commands: Add command form for scheduling
 a service downtime

refs #6593
---
 .../ScheduleServiceDowntimeCommandForm.php    | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php
new file mode 100644
index 000000000..7f13034a0
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php
@@ -0,0 +1,113 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Service;
+
+use Icinga\Module\Monitoring\Command\Service\ScheduleServiceDowntimeCommand;
+use Icinga\Module\Monitoring\Form\Command\Common\ScheduleDowntimeCommandForm;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for scheduling a service downtime on an Icinga instance
+ */
+class ScheduleServiceDowntimeCommandForm extends ScheduleDowntimeCommandForm
+{
+    /**
+     * Service to set in downtime
+     *
+     * @var Service
+     */
+    protected $service;
+
+    /**
+     * Set the service to set in downtime
+     *
+     * @param   Service $service
+     *
+     * @return  $this
+     */
+    public function setService(Service $service)
+    {
+        $this->service = $service;
+        return $this;
+    }
+
+    /**
+     * Get the service to set in downtime
+     *
+     * @return Service
+     */
+    public function getService()
+    {
+        return $this->service;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Schedule Service Downtime'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElement(
+            'note',
+            'command-info',
+            array(
+                'value' => mt(
+                    'monitoring',
+                    'This command is used to schedule a service downtime. During the specified downtime,'
+                    . ' Icinga will not send notifications out about the service. When the scheduled downtime'
+                    . ' expires, Icinga will send out notifications for the service as it normally would.'
+                    . ' Scheduled downtimes are preserved across program shutdowns and restarts.'
+                )
+            )
+        );
+        parent::createElements($formData);
+        return $this;
+    }
+
+    /**
+     * Get the command which is to be sent to an Icinga instance
+     *
+     * @return ScheduleServiceDowntimeCommand
+     */
+    public function getCommand()
+    {
+        return new ScheduleServiceDowntimeCommand();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        $scheduleDowntime = $this->getCommand();
+        $scheduleDowntime->setService($this->service);
+        $scheduleDowntime->setComment($this->getElement('comment')->getValue());
+        $scheduleDowntime->setAuthor($request->getUser());
+        $scheduleDowntime->setStart($this->getElement('start')->getValue());
+        $scheduleDowntime->setEnd($this->getElement('end')->getValue());
+        if ($this->getElement('type')->getValue() === self::FLEXIBLE) {
+            $scheduleDowntime->setFlexible();
+            $scheduleDowntime->setDuration(
+                (float) $this->getElement('hours')->getValue() * 3600
+                + (float) $this->getElement('minutes')->getValue() * 60
+            );
+        }
+        $this->getTransport($request)->send($scheduleDowntime);
+        Notification::success(mt('monitoring', 'Scheduling service downtime..'));
+        return true;
+    }
+}

From 9cfd74d618b5b5a6ec8e21b747743a5316f8d8eb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:43:37 +0200
Subject: [PATCH 169/277] monitoring: Introduce `ServiceController'

In the long term, `ServiceController' and the upcmoing `HostController' should replace `ShowController'.

refs #6593
---
 .../controllers/ServiceController.php         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 modules/monitoring/application/controllers/ServiceController.php

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
new file mode 100644
index 000000000..7f643e657
--- /dev/null
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -0,0 +1,41 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Module\Monitoring\Form\Command\Service\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Object\Service;
+
+class Monitoring_ServiceController extends Controller
+{
+    /**
+     * @var Service
+     */
+    protected $service;
+
+    public function init()
+    {
+        $this->service = new Service($this->params);  // Use $this->_request->getParams() instead of $this->params
+                                                      // once #7049 has been fixed
+    }
+
+    protected function handleCommandForm(CommandForm $form)
+    {
+        $form
+            ->setService($this->service)
+            ->handleRequest();
+        $this->view->form = $form;
+        $this->_helper->viewRenderer('command');
+        return $form;
+    }
+
+    /**
+     * Schedule a service downtime
+     */
+    public function scheduleDowntimeAction()
+    {
+        $this->view->title = $this->translate('Schedule Service Downtime');
+        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+    }
+}

From a94e84f3b0245043e343eef667afa0fde2d4e981 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:51:41 +0200
Subject: [PATCH 170/277] monitoring/commands: Add common `AddCommentCommand'

refs #6593
---
 .../Command/Common/AddCommentCommand.php      | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
new file mode 100644
index 000000000..67c6cc330
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
@@ -0,0 +1,83 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Common;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\User;
+
+/**
+ * Base class for commands adding comments
+ */
+abstract class AddCommentCommand extends IcingaCommand
+{
+    /**
+     * Author of the comment
+     *
+     * @var User
+     */
+    protected $author;
+
+    /**
+     * Comment
+     *
+     * @var string
+     */
+    protected $comment;
+
+    /**
+     * Set the author
+     *
+     * @param   User $author
+     *
+     * @return  $this
+     */
+    public function setAuthor(User $author)
+    {
+        $this->author = $author;
+        return $this;
+    }
+
+    /**
+     * Get the author
+     *
+     * @return User
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Set the comment
+     *
+     * @param   string $comment
+     *
+     * @return  $this
+     */
+    public function setComment($comment)
+    {
+        $this->comment = (string) $comment;
+        return $this;
+    }
+
+    /**
+     * Get the comment
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     */
+    public function getCommandString()
+    {
+        return sprintf('%s;%s', $this->author->getUsername(), $this->comment);
+    }
+}

From a83ddb9d8e8699e63f692ab357bb4e969b806e3e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 4 Sep 2014 15:52:20 +0200
Subject: [PATCH 171/277] monitoring/commands: Let `ScheduleDowntimeCommand'
 extend `AddCommentCommand'

refs #6593
---
 .../Monitoring/Command/Common/ScheduleDowntimeCommand.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
index 67713c425..0afb4087a 100644
--- a/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
@@ -9,7 +9,7 @@ use DateTime;
 /**
  * Base class for commands scheduling downtimes
  */
-abstract class ScheduleDowntimeCommand extends Comment
+abstract class ScheduleDowntimeCommand extends AddCommentCommand
 {
     /**
      * Downtime starts at the exact time specified

From 8846f17ae133b5d53d58dcb686d3f88cba7dbfde Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Sep 2014 09:16:09 +0200
Subject: [PATCH 172/277] Make it possible to disable form identification

refs #5525
---
 library/Icinga/Web/Form.php | 53 +++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 13ed535e3..4d294dd85 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -67,6 +67,13 @@ class Form extends Zend_Form
      */
     protected $tokenElementName = 'CSRFToken';
 
+    /**
+     * Whether this form should add a UID element being used to distinct different forms posting to the same action
+     *
+     * @var bool
+     */
+    protected $uidDisabled = false;
+
     /**
      * Name of the form identification element
      *
@@ -236,6 +243,34 @@ class Form extends Zend_Form
         return $this->tokenElementName;
     }
 
+    /**
+     * Disable form identification and remove its field if already added
+     *
+     * @param   bool    $disabled   Set true in order to disable identification for this form, otherwise false
+     *
+     * @return  self
+     */
+    public function setUidDisabled($disabled = true)
+    {
+        $this->uidDisabled = (bool) $disabled;
+
+        if ($disabled && $this->getElement($this->uidElementName) !== null) {
+            $this->removeElement($this->uidElementName);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return whether identification is disabled for this form
+     *
+     * @return  bool
+     */
+    public function getUidDisabled()
+    {
+        return $this->uidDisabled;
+    }
+
     /**
      * Set the name to use for the form identification element
      *
@@ -398,14 +433,16 @@ class Form extends Zend_Form
      */
     public function addFormIdentification()
     {
-        $this->addElement(
-            'hidden',
-            $this->uidElementName,
-            array(
-                'ignore'    => true,
-                'value'     => $this->getName()
-            )
-        );
+        if (false === $this->uidDisabled && $this->getElement($this->uidElementName) === null) {
+            $this->addElement(
+                'hidden',
+                $this->uidElementName,
+                array(
+                    'ignore'    => true,
+                    'value'     => $this->getName()
+                )
+            );
+        }
 
         return $this;
     }

From d021747bdea87aa281ecaa595989dafaf2aea257 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Sep 2014 09:17:09 +0200
Subject: [PATCH 173/277] Fix form widgets

refs #5525
---
 library/Icinga/Web/Widget/SortBox.php                       | 6 +++---
 .../library/Monitoring/Web/Widget/TimelineIntervalBox.php   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 557469966..42e7110cc 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -119,15 +119,15 @@ class SortBox extends AbstractWidget
             'label'         => 'Sort By',
             'multiOptions'  => $this->sortFields,
             'style'         => 'width: 12em',
-            'class'         => 'autosubmit',
+            'autosubmit'    => true
         ));
         $form->addElement('select', 'dir', array(
             'multiOptions'  => array(
                 'asc'       => 'Asc',
                 'desc'      => 'Desc',
             ),
-            'style' => 'width: 5em',
-            'class' => 'autosubmit'
+            'style'         => 'width: 5em',
+            'autosubmit'    => true
         ));
         $sort = $form->getElement('sort')->setDecorators(array('ViewHelper'));
         $dir = $form->getElement('dir')->setDecorators(array('ViewHelper'));
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
index 4cab3517d..4d6dbdad5 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
@@ -84,6 +84,7 @@ class TimelineIntervalBox extends AbstractWidget
         $form = new Form();
         $form->setAttrib('class', 'inline');
         $form->setMethod('GET');
+        $form->setUidDisabled();
         $form->setTokenDisabled();
         $form->setName($this->name);
         $form->addElement(
@@ -92,7 +93,7 @@ class TimelineIntervalBox extends AbstractWidget
             array(
                 'label'         => 'Timeline Interval',
                 'multiOptions'  => $this->values,
-                'class'         => 'autosubmit'
+                'autosubmit'    => true
             )
         );
 

From 7d212658bce4f51df8f74002b171af7f7467f824 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Sep 2014 09:17:54 +0200
Subject: [PATCH 174/277] Fix "Use statement with non compound name..." in
 TimelineController

---
 .../application/controllers/TimelineController.php         | 7 +++----
 .../monitoring/library/Monitoring/Timeline/TimeLine.php    | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 2f9b1339d..a950c92f7 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -2,9 +2,9 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use DateTime;
-use DateInterval;
-use Zend_Config;
+use \DateTime;
+use \DateInterval;
+use \Zend_Config;
 use Icinga\Web\Url;
 use Icinga\Util\Format;
 use Icinga\Application\Config;
@@ -13,7 +13,6 @@ use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Timeline\TimeLine;
 use Icinga\Module\Monitoring\Timeline\TimeRange;
 use Icinga\Module\Monitoring\Web\Widget\TimelineIntervalBox;
-use Icinga\Module\Monitoring\DataView\EventHistory as EventHistoryView;
 
 class Monitoring_TimelineController extends Controller
 {
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index be3820e19..3a795df32 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -11,7 +11,6 @@ use Icinga\Exception\IcingaException;
 use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Hook;
-use Icinga\Web\Session;
 use Icinga\Web\Session\SessionNamespace;
 use Icinga\Module\Monitoring\DataView\DataView;
 

From fc72ddfbc8fd3ac5adfa2783847681b8f31b0a3a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Sep 2014 10:21:24 +0200
Subject: [PATCH 175/277] Adjust Preferences/GeneralForm to use handleRequest()
 &. Co.

refs #5525
---
 .../controllers/PreferenceController.php      |  41 ++--
 application/forms/Preference/GeneralForm.php  | 171 --------------
 application/forms/PreferenceForm.php          | 211 ++++++++++++++++++
 .../views/scripts/preference/index.phtml      |   6 +-
 .../Controller/BasePreferenceController.php   |  28 ---
 library/Icinga/Web/Form.php                   |   5 +-
 6 files changed, 233 insertions(+), 229 deletions(-)
 delete mode 100644 application/forms/Preference/GeneralForm.php
 create mode 100644 application/forms/PreferenceForm.php

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 0eb45dca0..bd76b2466 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -3,10 +3,12 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\BasePreferenceController;
-use Icinga\Web\Widget\Tab;
 use Icinga\Web\Url;
-use Icinga\Form\Preference\GeneralForm;
-use Icinga\Web\Notification;
+use Icinga\Web\Widget\Tab;
+use Icinga\Application\Config;
+use Icinga\Form\PreferenceForm;
+use Icinga\Exception\ConfigurationError;
+use Icinga\User\Preferences\PreferencesStore;
 
 /**
  * Application wide preference controller for user preferences
@@ -33,33 +35,22 @@ class PreferenceController extends BasePreferenceController
     }
 
     /**
-     * General settings for date and time
+     * Show form to adjust user preferences
      */
     public function indexAction()
     {
-        $this->getTabs()->activate('general');
-
-        $form = new GeneralForm();
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            if ($form->isValid($request->getPost())) {
-                try {
-                    $this->savePreferences($form->getPreferences()->toArray());
-                    Notification::success($this->translate('Preferences updated successfully'));
-                    $this->redirectNow('preference');
-                } catch (Exception $e) {
-                    Notification::error(
-                        sprintf(
-                            $this->translate('Failed to persist preferences. (%s)'),
-                            $e->getMessage()
-                        )
-                    );
-                }
-            }
-        } else {
-            $form->setPreferences($request->getUser()->getPreferences());
+        $storeConfig = Config::app()->preferences;
+        if ($storeConfig === null) {
+            throw new ConfigurationError(t('You need to configure how to store preferences first.'));
         }
 
+        $user = $this->getRequest()->getUser();
+        $form = new PreferenceForm();
+        $form->setPreferences($user->getPreferences());
+        $form->setStore(PreferencesStore::create($storeConfig, $user));
+        $form->handleRequest();
+
         $this->view->form = $form;
+        $this->getTabs()->activate('general');
     }
 }
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
deleted file mode 100644
index b9ce5e9e2..000000000
--- a/application/forms/Preference/GeneralForm.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Form\Preference;
-
-use DateTimeZone;
-use Icinga\Web\Form;
-use Icinga\Util\Translator;
-use Icinga\User\Preferences;
-
-/**
- * General user preferences
- */
-class GeneralForm extends Form
-{
-    /**
-     * Initialize this preferences config form
-     */
-    public function init()
-    {
-        $this->setName('form_config_preferences');
-        $this->setSubmitLabel(t('Save Changes'));
-    }
-
-    /**
-     * Add a select field for setting the user's language
-     *
-     * Possible values are determined by Translator::getAvailableLocaleCodes.
-     * Also, a 'use browser language' checkbox is added in order to allow a user to discard his setting
-     *
-     * @param   array   $formData   The data sent by the user
-     */
-    protected function getLanguageElements(array $formData)
-    {
-        $languages = array();
-        foreach (Translator::getAvailableLocaleCodes() as $language) {
-            $languages[$language] = $language;
-        }
-
-        $useBrowserLanguage = isset($formData['browser_language']) ? $formData['browser_language'] == 1 : true;
-        $selectOptions = array(
-            'label'         => t('Your Current Language'),
-            'required'      => false === $useBrowserLanguage,
-            'multiOptions'  => $languages,
-            'helptext'      => t('Use the following language to display texts and messages'),
-            'value'         => substr(setlocale(LC_ALL, 0), 0, 5)
-        );
-        if ($useBrowserLanguage) {
-            $selectOptions['disabled'] = 'disabled';
-        }
-
-        return array(
-            $this->createElement(
-                'checkbox',
-                'browser_language',
-                array(
-                    'required'  => true,
-                    'class'     => 'autosubmit',
-                    'label'     => t('Use your browser\'s language suggestions'),
-                    'value'     => $useBrowserLanguage
-                )
-            ),
-            $this->createElement('select', 'language', $selectOptions)
-        );
-    }
-
-    /**
-     * Add a select field for setting the user's timezone
-     *
-     * Possible values are determined by DateTimeZone::listIdentifiers.
-     * Also, a 'use local timezone' checkbox is added in order to allow a user to discard his overwritten setting
-     *
-     * @param   array   $formData   The data sent by the user
-     */
-    protected function getTimezoneElements(array $formData)
-    {
-        $tzList = array();
-        foreach (DateTimeZone::listIdentifiers() as $tz) {
-            $tzList[$tz] = $tz;
-        }
-
-        $useLocalTimezone = isset($formData['local_timezone']) ? $formData['local_timezone'] == 1 : true;
-        $selectOptions = array(
-            'label'         => 'Your Current Timezone',
-            'required'      => false === $useLocalTimezone,
-            'multiOptions'  => $tzList,
-            'helptext'      => t('Use the following timezone for dates and times'),
-            'value'         => date_default_timezone_get()
-        );
-        if ($useLocalTimezone) {
-            $selectOptions['disabled'] = 'disabled';
-        }
-
-        return array(
-            $this->createElement(
-                'checkbox',
-                'local_timezone',
-                array(
-                    'required'  => true,
-                    'class'     => 'autosubmit',
-                    'label'     => t('Use your local timezone'),
-                    'value'     => $useLocalTimezone,
-                )
-            ),
-            $this->createElement('select', 'timezone', $selectOptions)
-        );
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $elements = array_merge($this->getLanguageElements($formData), $this->getTimezoneElements($formData));
-        $elements[] = $this->createElement(
-            'checkbox',
-            'show_benchmark',
-            array(
-                'label' => t('Use benchmark')
-            )
-        );
-
-        return $elements;
-    }
-
-    /**
-     * Populate the form with the given preferences
-     *
-     * @param   Preferences     $preferences    The preferences to populate the form with
-     *
-     * @return  self
-     */
-    public function setPreferences(Preferences $preferences)
-    {
-        $defaults = array(
-            'browser_language'  => $preferences->get('app.language') === null,
-            'local_timezone'    => $preferences->get('app.timezone') === null
-        );
-
-        if ($preferences->get('app.language') !== null) {
-            $defaults['language'] = $preferences->get('app.language');
-        }
-        if ($preferences->get('app.timezone') !== null) {
-            $defaults['timezone'] = $preferences->get('app.timezone');
-        }
-        if ($preferences->get('app.show_benchmark')) {
-            $defaults['show_benchmark'] = $preferences->get('app.show_benchmark');
-        }
-
-        $this->setDefaults($defaults);
-        return $this;
-    }
-
-    /**
-     * Return the configured preferences
-     *
-     * @return  Preferences
-     */
-    public function getPreferences()
-    {
-        $values = $this->getValues();
-        return new Preferences(
-            array(
-                'app.language'          => $values['browser_language'] ? null : $values['language'],
-                'app.timezone'          => $values['local_timezone'] ? null : $values['timezone'],
-                'app.show_benchmark'    => $values['show_benchmark'] ? $values['show_benchmark'] : null
-            )
-        );
-    }
-}
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
new file mode 100644
index 000000000..c156cca12
--- /dev/null
+++ b/application/forms/PreferenceForm.php
@@ -0,0 +1,211 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Form;
+
+use Exception;
+use DateTimeZone;
+use Icinga\Web\Form;
+use Icinga\Web\Request;
+use Icinga\Web\Session;
+use Icinga\Web\Notification;
+use Icinga\Util\Translator;
+use Icinga\User\Preferences;
+use Icinga\User\Preferences\PreferencesStore;
+
+/**
+ * Form class to adjust user preferences
+ */
+class PreferenceForm extends Form
+{
+    /**
+     * The preferences to work with
+     *
+     * @var Preferences
+     */
+    protected $preferences;
+
+    /**
+     * The preference store to use
+     *
+     * @var PreferencesStore
+     */
+    protected $store;
+
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_preferences');
+        $this->setSubmitLabel(t('Save Changes'));
+    }
+
+    /**
+     * Set preferences to work with
+     *
+     * @param   Preferences     $preferences    The preferences to work with
+     *
+     * @return  self
+     */
+    public function setPreferences(Preferences $preferences)
+    {
+        $this->preferences = $preferences;
+        return $this;
+    }
+
+    /**
+     * Set the preference store to use
+     *
+     * @param   PreferencesStore    $store      The preference store to use
+     *
+     * @return  self
+     */
+    public function setStore(PreferencesStore $store)
+    {
+        $this->store = $store;
+    }
+
+    /**
+     * Persist preferences
+     *
+     * @return  self
+     */
+    public function save()
+    {
+        $this->store->load(); // Necessary for patching existing preferences
+        $this->store->save($this->preferences);
+        return $this;
+    }
+
+    /**
+     * Adjust preferences and persist them
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess(Request $request)
+    {
+        $webPreferences = $this->preferences->get('icingaweb', array());
+        foreach ($this->getValues() as $key => $value) {
+            if ($value === null) {
+                if (isset($webPreferences[$key])) {
+                    unset($webPreferences[$key]);
+                }
+            } else {
+                $webPreferences[$key] = $value;
+            }
+        }
+        $this->preferences->icingaweb = $webPreferences;
+
+        // TODO: Is this even necessary in case the session is written on response?
+        $session = Session::getSession();
+        $session->user->setPreferences($this->preferences);
+        $session->write();
+
+        try {
+            $this->save();
+            Notification::success(t('Preferences successfully saved'));
+        } catch (Exception $e) {
+            Notification::error($e->getMessage());
+        }
+    }
+
+    /**
+     * Populate preferences
+     *
+     * @see Form::onRequest()
+     */
+    public function onRequest(Request $request)
+    {
+        $values = $this->preferences->get('icingaweb', array());
+        $values['browser_language'] = false === isset($values['language']);
+        $values['local_timezone'] = false === isset($values['timezone']);
+        $this->populate($values);
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $languages = array();
+        foreach (Translator::getAvailableLocaleCodes() as $language) {
+            $languages[$language] = $language;
+        }
+
+        $tzList = array();
+        foreach (DateTimeZone::listIdentifiers() as $tz) {
+            $tzList[$tz] = $tz;
+        }
+
+        $this->addElement(
+            'checkbox',
+            'browser_language',
+            array(
+                'ignore'        => true,
+                'required'      => true,
+                'autosubmit'    => true,
+                'value'         => true,
+                'label'         => t('Use your browser\'s language suggestions')
+            )
+        );
+
+        $useBrowserLanguage = isset($formData['browser_language']) ? $formData['browser_language'] == 1 : true;
+        $languageSelection = $this->createElement(
+            'select',
+            'language',
+            array(
+                'required'      => false === $useBrowserLanguage,
+                'label'         => t('Your Current Language'),
+                'description'   => t('Use the following language to display texts and messages'),
+                'multiOptions'  => $languages,
+                'value'         => substr(setlocale(LC_ALL, 0), 0, 5)
+            )
+        );
+        if ($useBrowserLanguage) {
+            $languageSelection->setAttrib('disabled', 'disabled');
+        }
+        $this->addElement($languageSelection);
+
+        $this->addElement(
+            'checkbox',
+            'local_timezone',
+            array(
+                'ignore'        => true,
+                'required'      => true,
+                'autosubmit'    => true,
+                'value'         => true,
+                'label'         => t('Use your local timezone')
+            )
+        );
+
+        $useLocalTimezone = isset($formData['local_timezone']) ? $formData['local_timezone'] == 1 : true;
+        $timezoneSelection = $this->createElement(
+            'select',
+            'timezone',
+            array(
+                'required'      => false === $useLocalTimezone,
+                'label'         => t('Your Current Timezone'),
+                'description'   => t('Use the following timezone for dates and times'),
+                'multiOptions'  => $tzList,
+                'value'         => date_default_timezone_get()
+            )
+        );
+        if ($useLocalTimezone) {
+            $timezoneSelection->setAttrib('disabled', 'disabled');
+        }
+        $this->addElement($timezoneSelection);
+
+        $this->addElement(
+            'checkbox',
+            'show_benchmark',
+            array(
+                'required'  => true,
+                'label'     => t('Use benchmark')
+            )
+        );
+
+        return $this;
+    }
+}
diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml
index 256f8623c..163381531 100644
--- a/application/views/scripts/preference/index.phtml
+++ b/application/views/scripts/preference/index.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
-<?= $this->tabs->render($this); ?>
+    <?= $tabs; ?>
 </div>
 
 <div class="content">
-<?= $this->form ?>
-</div>
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index a83b8e6c0..f7d45aa5f 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -4,11 +4,6 @@
 
 namespace Icinga\Web\Controller;
 
-use Icinga\Application\Config as IcingaConfig;
-use Icinga\Exception\ConfigurationError;
-use Icinga\Web\Session;
-use Icinga\User\Preferences\PreferencesStore;
-
 /**
  *  Base class for Preference Controllers
  *
@@ -42,27 +37,4 @@ class BasePreferenceController extends ActionController
         parent::init();
         $this->view->tabs = ControllerTabCollector::collectControllerTabs('PreferenceController');
     }
-
-    protected function savePreferences(array $preferences)
-    {
-        $session = Session::getSession();
-        $currentPreferences = $session->user->getPreferences();
-        foreach ($preferences as $key => $value) {
-            if ($value === null) {
-                $currentPreferences->remove($key);
-            } else {
-                $currentPreferences->{$key} = $value;
-            }
-        }
-        $session->write();
-
-        if (($preferencesConfig = IcingaConfig::app()->preferences) === null) {
-            throw new ConfigurationError(
-                'Cannot save preferences changes since you\'ve not configured a preferences backend'
-            );
-        }
-        $store = PreferencesStore::create($preferencesConfig, $session->user);
-        $store->load(); // Necessary for patching existing preferences
-        $store->save($currentPreferences);
-    }
 }
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 4d294dd85..8f3a47f64 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -438,8 +438,9 @@ class Form extends Zend_Form
                 'hidden',
                 $this->uidElementName,
                 array(
-                    'ignore'    => true,
-                    'value'     => $this->getName()
+                    'ignore'        => true,
+                    'value'         => $this->getName(),
+                    'decorators'    => array('ViewHelper')
                 )
             );
         }

From 7215e273f6ef94015bfcc77fe9c494bde5cca392 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Sep 2014 09:10:59 +0200
Subject: [PATCH 176/277] Fix AddUrlForm::createElements() not returning self

---
 application/forms/Dashboard/AddUrlForm.php | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 67452a84f..51130bb11 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -27,15 +27,13 @@ class AddUrlForm extends Form
      */
     public function createElements(array $formData)
     {
-        $elements = array(
-            $this->createElement(
-                'text',
-                'url',
-                array(
-                    'required'  => true,
-                    'label'     => t('Url'),
-                    'helptext'  => t('The url being loaded in the dashlet')
-                )
+        $this->addElement(
+            'text',
+            'url',
+            array(
+                'required'  => true,
+                'label'     => t('Url'),
+                'helptext'  => t('The url being loaded in the dashlet')
             )
         );
 
@@ -44,7 +42,7 @@ class AddUrlForm extends Form
             ((isset($formData['create_new_pane']) && $formData['create_new_pane'] != false) &&
              (false === isset($formData['use_existing_dashboard']) || $formData['use_existing_dashboard'] != true))
         ) {
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'text',
                 'pane',
                 array(
@@ -53,7 +51,7 @@ class AddUrlForm extends Form
                     'style'     => 'display: inline-block'
                 )
             );
-            $elements[] = $this->createElement( // Prevent the button from being displayed again on validation errors
+            $this->addElement( // Prevent the button from being displayed again on validation errors
                 'hidden',
                 'create_new_pane',
                 array(
@@ -61,7 +59,7 @@ class AddUrlForm extends Form
                 )
             );
             if (false === empty($paneSelectionValues)) {
-                $elements[] = $this->createElement(
+                $this->addElement(
                     'submit',
                     'use_existing_dashboard',
                     array(
@@ -72,7 +70,7 @@ class AddUrlForm extends Form
                 );
             }
         } else {
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'select',
                 'pane',
                 array(
@@ -82,7 +80,7 @@ class AddUrlForm extends Form
                     'multiOptions'  => $paneSelectionValues
                 )
             );
-            $elements[] = $this->createElement(
+            $this->addElement(
                 'submit',
                 'create_new_pane',
                 array(
@@ -93,7 +91,7 @@ class AddUrlForm extends Form
             );
         }
 
-        $elements[] = $this->createElement(
+        $this->addElement(
             'text',
             'component',
             array(
@@ -102,7 +100,8 @@ class AddUrlForm extends Form
                 'helptext'  => t('The title for the dashlet')
             )
         );
-        return $elements;
+
+        return $this;
     }
 
     /**

From 930e6e7d71bda7aa4b32464c307df2594efb0060 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Sep 2014 09:24:53 +0200
Subject: [PATCH 177/277] We shouldn't require Form::createElements() to return
 self

refs #5525
---
 application/forms/Authentication/LoginForm.php            | 2 --
 .../forms/Config/Authentication/AutologinBackendForm.php  | 2 --
 application/forms/Config/Authentication/DbBackendForm.php | 2 --
 .../forms/Config/Authentication/LdapBackendForm.php       | 2 --
 .../forms/Config/AuthenticationBackendConfigForm.php      | 2 --
 .../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 --
 .../forms/Config/Resource/LivestatusResourceForm.php      | 2 --
 .../forms/Config/Resource/StatusdatResourceForm.php       | 2 --
 application/forms/Config/ResourceConfigForm.php           | 2 --
 application/forms/Dashboard/AddUrlForm.php                | 2 --
 application/forms/PreferenceForm.php                      | 2 --
 library/Icinga/Web/Form.php                               | 8 +++-----
 .../application/forms/Config/BackendConfigForm.php        | 2 --
 .../forms/Config/Instance/LocalInstanceForm.php           | 2 --
 .../forms/Config/Instance/RemoteInstanceForm.php          | 2 --
 .../application/forms/Config/InstanceConfigForm.php       | 2 --
 .../application/forms/Config/SecurityConfigForm.php       | 2 --
 22 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 0d9b8dedc..d878475f2 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -53,7 +53,5 @@ class LoginForm extends Form
                 'value' => Url::fromRequest()->getParam('redirect')
             )
         );
-
-        return $this;
     }
 }
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index 4f4df73e3..d4e0547a9 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -69,8 +69,6 @@ class AutologinBackendForm extends Form
                 'value'     => 'autologin'
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 23335f8fa..960a6d07c 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -77,8 +77,6 @@ class DbBackendForm extends Form
                 'value'     => 'db'
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 9db773708..4e3172ad2 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -96,8 +96,6 @@ class LdapBackendForm extends Form
                 'value'     => 'ldap'
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 9068ed25a..e81382cd4 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -318,7 +318,5 @@ class AuthenticationBackendConfigForm extends ConfigForm
         }
 
         $this->addElements($this->getBackendForm($backendType)->createElements($formData)->getElements());
-
-        return $this;
     }
 }
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index fda695886..5f592eefc 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -112,7 +112,5 @@ class ApplicationConfigForm extends Form
                 )
             );
         }
-
-        return $this;
     }
 }
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 135dd9e28..33e182b5d 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -102,8 +102,6 @@ class LoggingConfigForm extends Form
                 )
             );
         }
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index ffb0a7d1c..550fe4cfb 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -33,8 +33,6 @@ class GeneralConfigForm extends ConfigForm
         $loggingConfigForm = new LoggingConfigForm();
         $this->addElements($appConfigForm->createElements($formData)->getElements());
         $this->addElements($loggingConfigForm->createElements($formData)->getElements());
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 4fd7297d9..136e9e645 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -92,8 +92,6 @@ class DbResourceForm extends Form
                 'description'       => t('The password to use for authentication')
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index d1d33a749..2654ad949 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -44,7 +44,5 @@ class FileResourceForm extends Form
                 'description'   => t('The regular expression by which to identify columns')
             )
         );
-
-        return $this;
     }
 }
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6196f3a17..752516956 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -78,8 +78,6 @@ class LdapResourceForm extends Form
                 'description'       => t('The password to use for querying the ldap server')
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index 92534f220..ad0b382c2 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -39,8 +39,6 @@ class LivestatusResourceForm extends Form
                 'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
index f150056d1..15563ff39 100644
--- a/application/forms/Config/Resource/StatusdatResourceForm.php
+++ b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -48,7 +48,5 @@ class StatusdatResourceForm extends Form
                 'validators'    => array(new ReadablePathValidator())
             )
         );
-
-        return $this;
     }
 }
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index d9ec4dad3..8e677cf8b 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -252,7 +252,5 @@ class ResourceConfigForm extends ConfigForm
         }
 
         $this->addElements($this->getResourceForm($resourceType)->createElements($formData)->getElements());
-
-        return $this;
     }
 }
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 51130bb11..88195654d 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -100,8 +100,6 @@ class AddUrlForm extends Form
                 'helptext'  => t('The title for the dashlet')
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index f01f4e337..cdb6ff288 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -206,8 +206,6 @@ class PreferenceForm extends Form
                 'label'     => t('Use benchmark')
             )
         );
-
-        return $this;
     }
 
     /**
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 8f3a47f64..61d75e3af 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -304,8 +304,8 @@ class Form extends Zend_Form
     public function create(array $formData = array())
     {
         if (false === $this->created) {
-            $this->createElements($formData)
-                ->addFormIdentification()
+            $this->createElements($formData);
+            $this->addFormIdentification()
                 ->addCsrfCounterMeasure()
                 ->addSubmitButton();
 
@@ -327,12 +327,10 @@ class Form extends Zend_Form
      * Intended to be implemented by concrete form classes.
      *
      * @param   array   $formData   The data sent by the user
-     *
-     * @return  self
      */
     public function createElements(array $formData)
     {
-        return $this;
+
     }
 
     /**
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 84f68b57e..e2cdf210c 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -238,7 +238,5 @@ class BackendConfigForm extends ConfigForm
                 'multiOptions'  => $this->resources[$resourceType]
             )
         );
-
-        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 513ba2433..6f0d37e25 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -31,7 +31,5 @@ class LocalInstanceForm extends Form
                 'description'   => t('The file path where the icinga commandpipe can be found')
             )
         );
-
-        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 0e78a0aec..36991425b 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -62,7 +62,5 @@ class RemoteInstanceForm extends Form
                 'description'   => t('The file path where the icinga commandpipe can be found')
             )
         );
-
-        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index 011284a9a..6f8d04764 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -205,7 +205,5 @@ class InstanceConfigForm extends ConfigForm
         );
 
         $this->addElements($this->getInstanceForm($instanceType)->createElements($formData)->getElements());
-
-        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index 33a03328e..a164766cc 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -62,7 +62,5 @@ class SecurityConfigForm extends ConfigForm
                     . ' Existance of those custom variables will be shown, but their values will be masked.'
             )
         );
-
-        return $this;
     }
 }

From 12b4865559126ce5015025968767e067d9d0aa85 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Sep 2014 09:42:02 +0200
Subject: [PATCH 178/277] Fix incompatible declaration of Form::setDefaults()

PHP with strict standards: Declaration of Icinga\Web\Form::setDefaults()
should be compatible with that of Zend_Form::setDefaults()

refs #5525
---
 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 61d75e3af..e4b292647 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -467,7 +467,7 @@ class Form extends Zend_Form
      *
      * @param   array   $defaults   The values to populate the elements with
      */
-    public function setDefaults(array $defaults)
+    public function setDefaults($defaults)
     {
         $this->create($defaults);
         return parent::setDefaults($defaults);

From f53519c54d2e3bbf58178f6c52ba500eb8a6b9d9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Sep 2014 13:31:25 +0200
Subject: [PATCH 179/277] Rename ConfigForm::setConfig() to
 ConfigForm::setIniConfig()

We do not want to override Zend_Form::setConfig() so this renaming is
required. set*Ini*Config() because ConfigForm::save() utilizes an ini-writer
to persist the configuration to disk.

refs #5525
---
 application/controllers/ConfigController.php     | 16 ++++++++--------
 .../Config/AuthenticationBackendReorderForm.php  |  2 +-
 application/forms/ConfigForm.php                 |  2 +-
 .../application/controllers/ConfigController.php | 14 +++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 39051011c..559d8f3f9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -46,7 +46,7 @@ class ConfigController extends ActionController
     public function indexAction()
     {
         $form = new GeneralConfigForm();
-        $form->setConfig(IcingaConfig::app());
+        $form->setIniConfig(IcingaConfig::app());
         $form->handleRequest();
 
         $this->view->form = $form;
@@ -131,7 +131,7 @@ class ConfigController extends ActionController
     public function authenticationAction()
     {
         $form = new AuthenticationBackendReorderForm();
-        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->setIniConfig(IcingaConfig::app('authentication'));
         $form->handleRequest();
 
         $this->view->form = $form;
@@ -145,7 +145,7 @@ class ConfigController extends ActionController
     public function createauthenticationbackendAction()
     {
         $form = new AuthenticationBackendConfigForm();
-        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->setIniConfig(IcingaConfig::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('config/authentication');
         $form->handleRequest();
@@ -161,7 +161,7 @@ class ConfigController extends ActionController
     public function editauthenticationbackendAction()
     {
         $form = new AuthenticationBackendConfigForm();
-        $form->setConfig(IcingaConfig::app('authentication'));
+        $form->setIniConfig(IcingaConfig::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('config/authentication');
         $form->handleRequest();
@@ -179,7 +179,7 @@ class ConfigController extends ActionController
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($request) {
                 $configForm = new AuthenticationBackendConfigForm();
-                $configForm->setConfig(IcingaConfig::app('authentication'));
+                $configForm->setIniConfig(IcingaConfig::app('authentication'));
                 $authBackend = $request->getQuery('auth_backend');
 
                 try {
@@ -222,7 +222,7 @@ class ConfigController extends ActionController
     public function createresourceAction()
     {
         $form = new ResourceConfigForm();
-        $form->setConfig(IcingaConfig::app('resources'));
+        $form->setIniConfig(IcingaConfig::app('resources'));
         $form->setRedirectUrl('config/resource');
         $form->handleRequest();
 
@@ -236,7 +236,7 @@ class ConfigController extends ActionController
     public function editresourceAction()
     {
         $form = new ResourceConfigForm();
-        $form->setConfig(IcingaConfig::app('resources'));
+        $form->setIniConfig(IcingaConfig::app('resources'));
         $form->setRedirectUrl('config/resource');
         $form->handleRequest();
 
@@ -252,7 +252,7 @@ class ConfigController extends ActionController
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($request) {
                 $configForm = new ResourceConfigForm();
-                $configForm->setConfig(IcingaConfig::app('resources'));
+                $configForm->setIniConfig(IcingaConfig::app('resources'));
                 $resource = $request->getQuery('resource');
 
                 try {
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index d4be16c30..3b5e70866 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -62,7 +62,7 @@ class AuthenticationBackendReorderForm extends ConfigForm
     protected function getConfigForm()
     {
         $form = new AuthenticationBackendConfigForm();
-        $form->setConfig($this->config);
+        $form->setIniConfig($this->config);
         return $form;
     }
 }
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 1f3692473..a354fa538 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -28,7 +28,7 @@ class ConfigForm extends Form
      *
      * @return  self
      */
-    public function setConfig(Config $config)
+    public function setIniConfig(Config $config)
     {
         $this->config = $config;
         return $this;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index c2de49be1..de9c65b04 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -31,7 +31,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function editbackendAction()
     {
         $form = new BackendConfigForm();
-        $form->setConfig($this->Config('backends'));
+        $form->setIniConfig($this->Config('backends'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
@@ -45,7 +45,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function createbackendAction()
     {
         $form = new BackendConfigForm();
-        $form->setConfig($this->Config('backends'));
+        $form->setIniConfig($this->Config('backends'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
@@ -63,7 +63,7 @@ class Monitoring_ConfigController extends ModuleActionController
             'onSuccess' => function ($request) use ($config) {
                 $backendName = $request->getQuery('backend');
                 $configForm = new BackendConfigForm();
-                $configForm->setConfig($config);
+                $configForm->setIniConfig($config);
 
                 try {
                     $configForm->remove($backendName);
@@ -95,7 +95,7 @@ class Monitoring_ConfigController extends ModuleActionController
             'onSuccess' => function ($request) use ($config) {
                 $instanceName = $request->getQuery('instance');
                 $configForm = new InstanceConfigForm();
-                $configForm->setConfig($config);
+                $configForm->setIniConfig($config);
 
                 try {
                     $configForm->remove($instanceName);
@@ -123,7 +123,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function editinstanceAction()
     {
         $form = new InstanceConfigForm();
-        $form->setConfig($this->Config('instances'));
+        $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
 
@@ -136,7 +136,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function createinstanceAction()
     {
         $form = new InstanceConfigForm();
-        $form->setConfig($this->Config('instances'));
+        $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
 
@@ -149,7 +149,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function securityAction()
     {
         $form = new SecurityConfigForm();
-        $form->setConfig($this->Config());
+        $form->setIniConfig($this->Config());
         $form->handleRequest();
 
         $this->view->form = $form;

From 1137c010a8afac21cee21666e0db8b41f697bc3b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:24:38 +0200
Subject: [PATCH 180/277] Provide global request and response mocks

Prior to this change one had to overwrite setupIcingaMock or setUp to set
a specific mock as request or response. Now it is possible to do this for a
specific test without overwriting any method.
---
 library/Icinga/Test/BaseTestCase.php | 47 ++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 9cc8ba519..1c72b0f47 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -151,30 +151,51 @@ namespace Icinga\Test {
         public function setUp()
         {
             parent::setUp();
-
-            $requestMock = Mockery::mock('Icinga\Web\Request');
-            $requestMock->shouldReceive('getPathInfo')->andReturn('')
-                ->shouldReceive('getBaseUrl')->andReturn('/')
-                ->shouldReceive('getQuery')->andReturn(array());
-            $this->setupIcingaMock($requestMock);
+            $this->setupIcingaMock();
         }
 
         /**
          * Setup mock object for the application's bootstrap
-         *
-         * @param   Zend_Controller_Request_Abstract    $request    The request to be returned by
-         *                                                          Icinga::app()->getFrontController()->getRequest()
          */
-        protected function setupIcingaMock(Zend_Controller_Request_Abstract $request)
+        protected function setupIcingaMock()
         {
+            $requestMock = Mockery::mock('Icinga\Web\Request')->shouldDeferMissing();
+            $requestMock->shouldReceive('getPathInfo')->andReturn('')->byDefault()
+                ->shouldReceive('getBaseUrl')->andReturn('/')->byDefault()
+                ->shouldReceive('getQuery')->andReturn(array())->byDefault();
+
+            $responseMock = Mockery::mock('Icinga\Web\Response')->shouldDeferMissing();
+
+            // Can't express this as demeter chains. See: https://github.com/padraic/mockery/issues/59
             $bootstrapMock = Mockery::mock('Icinga\Application\ApplicationBootstrap')->shouldDeferMissing();
-            $bootstrapMock->shouldReceive('getFrontController->getRequest')->andReturnUsing(
-                function () use ($request) { return $request; }
-            )->shouldReceive('getApplicationDir')->andReturn(self::$appDir);
+            $bootstrapMock->shouldReceive('getFrontController')->andReturn($bootstrapMock)
+                ->shouldReceive('getApplicationDir')->andReturn(self::$appDir)
+                ->shouldReceive('getRequest')->andReturn($requestMock)
+                ->shouldReceive('getResponse')->andReturn($responseMock);
 
             Icinga::setApp($bootstrapMock, true);
         }
 
+        /**
+         * Return the currently active request mock object
+         *
+         * @return  Icinga\Web\Request
+         */
+        public function getRequestMock()
+        {
+            return Icinga::app()->getFrontController()->getRequest();
+        }
+
+        /**
+         * Return the currently active response mock object
+         *
+         * @return  Icinga\Web\Response
+         */
+        public function getResponseMock()
+        {
+            return Icinga::app()->getFrontController()->getResponse();
+        }
+
         /**
          * Create Zend_Config for database configuration
          *

From c8bdb70d06312340c14a95a5bf1c1ba547b1e826 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:27:04 +0200
Subject: [PATCH 181/277] Remove command form tests

refs #5525
---
 .../forms/Command/AcknowledgeFormTest.php     | 111 ------
 .../forms/Command/CommentFormTest.php         |  64 ----
 .../Command/CustomNotificationFormTest.php    |  28 --
 .../Command/DelayNotificationFormTest.php     |  58 ---
 .../Command/RescheduleNextCheckFormTest.php   |  54 ---
 .../Command/ScheduleDowntimeFormTest.php      | 356 ------------------
 .../Command/SubmitPassiveCheckResultTest.php  | 117 ------
 7 files changed, 788 deletions(-)
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
 delete mode 100644 modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php

diff --git a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php b/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
deleted file mode 100644
index 32d8e35d3..000000000
--- a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-
-class AcknowledgeFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\AcknowledgeForm';
-
-    public function testFormValid()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => 'Comment',
-                'persistent'    => '0',
-                'expire'        => '0',
-                'sticky'        => '0',
-                'notify'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Legal request data without expire time must be considered valid'
-        );
-
-        $formWithExpireTime = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => 'Comment',
-                'persistent'    => '0',
-                'expire'        => '1',
-                'expiretime'    => '10/07/2013 5:32 PM',
-                'sticky'        => '0',
-                'notify'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertTrue(
-            $formWithExpireTime->isSubmittedAndValid(),
-            'Legal request data with expire time must be considered valid'
-        );
-    }
-
-    public function testFormInvalidWhenCommentMissing()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => '',
-                'persistent'    => '0',
-                'expire'        => '0',
-                'sticky'        => '0',
-                'notify'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Missing comment must be considered not valid'
-        );
-    }
-
-    public function testFormInvalidWhenExpireTimeMissingAndExpireSet()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => 'Comment',
-                'persistent'    => '0',
-                'expire'        => '1',
-                'sticky'        => '0',
-                'notify'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'If expire is set and expire time is missing, the form must not be valid'
-        );
-    }
-
-    public function testFormInvalidWhenExpireTimeIsIncorrectAndExpireSet()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => 'Comment',
-                'persistent'    => '0',
-                'expire'        => '1',
-                'expiretime'    => 'Not a date',
-                'sticky'        => '0',
-                'notify'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'If expire is set and expire time is incorrect, the form must not be valid'
-        );
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php b/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
deleted file mode 100644
index 3228af399..000000000
--- a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-
-class CommentFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\CommentForm';
-
-    public function testCorrectCommentValidation()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => 'Comment',
-                'sticky'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Legal request data must be considered valid'
-        );
-    }
-
-    public function testFormInvalidWhenCommentMissing()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => '',
-                'sticky'        => '0',
-                'btn_submit'    => 'Submit'
-
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Missing comment must be considered not valid'
-        );
-    }
-
-    public function testFormInvalidWhenAuthorMissing()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => '',
-                'comment'       => 'Comment',
-                'sticky'        => '0',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Missing author must be considered not valid'
-        );
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
deleted file mode 100644
index 9c03ff3ec..000000000
--- a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-
-class CustomNotificationFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\CustomNotificationForm';
-
-    public function testFormInvalidWhenCommentMissing()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'        => 'Author',
-                'comment'       => '',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Missing comment must be considered not valid'
-        );
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
deleted file mode 100644
index 3a955f191..000000000
--- a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-use Icinga\Module\Monitoring\Form\Command\DelayNotificationForm;
-
-class DelayNotificationFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\DelayNotificationForm';
-
-    public function testFormInvalidWhenNotificationDelayMissing()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'minutes'       => '',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Missing notification delay must be considered invalid'
-        );
-    }
-
-    public function testFormInvalidWhenNotificationDelayNaN()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'minutes'       => 'A String',
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Incorrect notification delay, i.e. NaN must be considered invalid'
-        );
-    }
-
-    public function testFormInvalidWhenNotificationDelayOverflows()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'minutes'       => DelayNotificationForm::MAX_DELAY + 1,
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Notification delay bigger than constant "DelayNotificationForm::MAX_DELAY" must be considered invalid'
-        );
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php b/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
deleted file mode 100644
index 72a4914f5..000000000
--- a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-
-class RescheduleNextCheckFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm';
-
-    public function testFormInvalidWhenChecktimeIsIncorrect()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'checktime'     => '2013-24-12 17:30:00',
-                'forcecheck'    => 0,
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Asserting a logically incorrect checktime as invalid'
-        );
-
-        $form2 = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'checktime'     => 'Captain Morgan',
-                'forcecheck'    => 1,
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form2->isSubmittedAndValid(),
-            'Providing arbitrary strings as checktime must be considered invalid'
-        );
-
-        $form3 = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'checktime'     => '',
-                'forcecheck'    => 0,
-                'btn_submit'    => 'Submit'
-            )
-        );
-        $this->assertFalse(
-            $form3->isSubmittedAndValid(),
-            'Missing checktime must be considered invalid'
-        );
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php b/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
deleted file mode 100644
index 5c7138b17..000000000
--- a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-use Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm;
-
-class ScheduleDowntimeFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm';
-
-    public function testCorrectFormElementCreation()
-    {
-        $formFixed = $this->createForm(self::FORM_CLASS);
-        $formFixed->setCurrentDowntimes(array('foo'));
-        $formFixed->buildForm();
-        $formFlexible = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'type' => 'flexible'
-            )
-        );
-        $formFlexible->setCurrentDowntimes(array('foo'));
-        $formFlexible->buildForm();
-
-        $form = $this->createForm(self::FORM_CLASS);
-        $form->setCurrentDowntimes(array('foo'));
-        $form->setWithChildren(true);
-        $form->buildForm();
-    }
-
-    public function testCorrectValidationWithChildrend()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'     => 'TEST_AUTHOR',
-                'comment'    => 'DING DING',
-                'triggered'  => '0',
-                'starttime'  => '17/07/2013 10:30 AM',
-                'endtime'    => '18/07/2013 10:30 AM',
-                'type'       => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'      => '',
-                'minutes'    => '',
-                'btn_submit' => 'foo',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Asserting a correct fixed downtime form to be considered valid'
-        );
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'     => 'TEST_AUTHOR',
-                'comment'    => 'DING DING',
-                'triggered'  => '0',
-                'starttime'  => '17/07/2013 10:30 AM',
-                'endtime'    => '18/07/2013 10:30 AM',
-                'type'       => ScheduleDowntimeForm::TYPE_FLEXIBLE,
-                'hours'      => '10',
-                'minutes'    => '10',
-                'btn_submit' => 'foo'
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Asserting a correct flexible downtime form to be considered valid'
-        );
-    }
-
-    public function testMissingFlexibleDurationRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'TEST_AUTHOR',
-                'comment'   => 'DING DING',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FLEXIBLE,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert missing hours and minutes in downtime form to cause failing validation'
-        );
-    }
-
-    public function testMissingAuthorRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => '',
-                'comment'   => 'DING DING',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert missing author to cause validation errors in fixed downtime'
-        );
-    }
-
-    public function testMissingCommentRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => '',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert missing comment to cause validation errors in fixed downtime'
-        );
-    }
-
-    public function testInvalidTriggeredFieldValueRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => 'OK',
-                'triggered' => 'HAHA',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert invalid trigger field to cause validation to fail'
-        );
-    }
-
-    public function testInvalidStartTimeRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => 'OK',
-                'triggered' => '0',
-                'starttime' => '17/07/2013',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert incorrect start time to cause validation errors in fixed downtime'
-        );
-    }
-
-    public function testInvalidEndTimeRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => 'OK',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => 'DING',
-                'type'      => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'     => '',
-                'minutes'   => '',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert invalid endtime to cause validation errors in fixed downtime'
-        );
-    }
-
-    public function testInvalidHoursValueRecognitionInFlexibleDowntime()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => 'OK',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FLEXIBLE,
-                'hours'     => '-1',
-                'minutes'   => '12',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert negative hours to cause validation errors in flexible downtime'
-        );
-    }
-
-    public function testInvalidMinutesValueRecognitionInFlexibleDowntime()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'    => 'OK',
-                'comment'   => 'OK',
-                'triggered' => '0',
-                'starttime' => '17/07/2013 10:30 AM',
-                'endtime'   => '18/07/2013 10:30 AM',
-                'type'      => ScheduleDowntimeForm::TYPE_FLEXIBLE,
-                'hours'     => '12',
-                'minutes'   => 'DING',
-            )
-        );
-        $form->setWithChildren(true);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert non numeric valud to cause validation errors in flexible downtime '
-        );
-
-    }
-
-    public function testCorrectScheduleDowntimeWithoutChildrenForm()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'       => 'TEST_AUTHOR',
-                'comment'      => 'DING DING',
-                'triggered'    => '0',
-                'starttime'    => '17/07/2013 10:30 AM',
-                'endtime'      => '18/07/2013 10:30 AM',
-                'type'         => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'        => '',
-                'minutes'      => '',
-                'btn_submit'   => 'foo',
-                'childobjects' => '0',
-            )
-        );
-        $form->setWithChildren(false);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Assert a correct schedule downtime without children form to be considered valid'
-        );
-    }
-
-    public function testIncorrectChildObjectsRecognition() {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'       => 'TEST_AUTHOR',
-                'comment'      => 'DING DING',
-                'triggered'    => '0',
-                'starttime'    => '17/07/2013 10:30 AM',
-                'endtime'      => '18/07/2013 10:30 AM',
-                'type'         => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'        => '',
-                'minutes'      => '',
-                'childobjects' => 'AHA',
-            )
-        );
-        $form->setWithChildren(false);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert and incorrect (non-numeric) childobjects value to cause validation errors'
-        );
-
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'author'       => 'TEST_AUTHOR',
-                'comment'      => 'DING DING',
-                'triggered'    => '0',
-                'starttime'    => '17/07/2013 10:30 AM',
-                'endtime'      => '18/07/2013 10:30 AM',
-                'type'         => ScheduleDowntimeForm::TYPE_FIXED,
-                'hours'        => '',
-                'minutes'      => '',
-                'childobjects' => '4',
-            )
-        );
-        $form->setWithChildren(false);
-        $form->setCurrentDowntimes(array('foo'));
-
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert and incorrect (numeric) childobjects value to cause validation errors'
-        );
-    }
-
-    public function testTimeRange()
-    {
-        $form = $this->createForm(self::FORM_CLASS);
-        $form->setCurrentDowntimes(array('foo'));
-        $form->buildForm();
-
-        $time1 = $form->getElement('starttime')->getValue();
-        $time2 = $form->getElement('endtime')->getValue();
-
-        $this->assertEquals(3600, ($time2 - $time1));
-    }
-}
diff --git a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php b/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
deleted file mode 100644
index 4c83294df..000000000
--- a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Module\Monitoring\Application\Forms\Command;
-
-use Icinga\Test\BaseTestCase;
-use Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm;
-
-class SubmitPassiveCheckResultFormTest extends BaseTestCase
-{
-    const FORM_CLASS = 'Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm';
-
-    public function testStateTypes()
-    {
-        $form = $this->createForm(self::FORM_CLASS, array());
-
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_SERVICE);
-        $options = $form->getOptions();
-        $this->assertCount(4, $options, 'Assert correct number of states in service passive checks form');
-        $this->assertEquals('OK', $options[0], 'Assert OK state to be available in service passive check form');
-        $this->assertEquals(
-            'WARNING',
-            $options[1],
-            'Assert WARNING state to be available in service passive check form'
-        );
-        $this->assertEquals(
-            'CRITICAL',
-            $options[2],
-            'Assert CRITICAL state to be available in service passive check form'
-        );
-        $this->assertEquals(
-            'UNKNOWN',
-            $options[3],
-            'Assert UNKNOWN state to be available in service passive check form'
-        );
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_HOST);
-        $options = $form->getOptions();
-        $this->assertCount(3, $options, 'Assert correct number of states in host passive checks form');
-        $this->assertEquals('UP', $options[0], 'Assert UP state to be available in host passive check form');
-        $this->assertEquals('DOWN', $options[1], 'Assert DOWN state to be available in host passive check form');
-        $this->assertEquals(
-            'UNREACHABLE',
-            $options[2],
-            'Assert UNREACHABLE state to be available in host passive check form'
-        );
-    }
-
-    /**
-     * @expectedException           Icinga\Exception\ProgrammingError
-     * @expectedExceptionMessage    Type is not valid
-     */
-    public function testMissingTypeThrowingException()
-    {
-        $form = $this->createForm(self::FORM_CLASS, array());
-        $form->buildForm();
-    }
-
-    public function testCorrectFormCreation()
-    {
-        $form = $this->createForm(self::FORM_CLASS, array());
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_SERVICE);
-        $form->buildForm();
-    }
-
-    public function testCorrectServicePassiveCheckSubmission()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'pluginstate'     => 0,
-                'checkoutput'     => 'DING',
-                'performancedata' => '',
-                'btn_submit'      => 'foo'
-            )
-        );
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_SERVICE);
-        $this->assertTrue(
-            $form->isSubmittedAndValid(),
-            'Assert a correct passive service check form to pass form validation'
-        );
-    }
-
-    public function testIncorrectCheckoutputRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'pluginstate'     => 0,
-                'checkoutput'     => '',
-                'performancedata' => ''
-            )
-        );
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_SERVICE);
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert empty checkoutput to cause validation errors in passive service check '
-        );
-    }
-
-    public function testIncorrectStateRecognition()
-    {
-        $form = $this->createForm(
-            self::FORM_CLASS,
-            array(
-                'pluginstate'     => 'LA',
-                'checkoutput'     => 'DING',
-                'performancedata' => ''
-            )
-        );
-        $form->setType(SubmitPassiveCheckResultForm::TYPE_SERVICE);
-        $this->assertFalse(
-            $form->isSubmittedAndValid(),
-            'Assert invalid (non-numeric) state to cause validation errors in passive service check'
-        );
-    }
-}

From 34bbe6508a0c3e1e983dfd7d62459d1651c16f86 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:29:29 +0200
Subject: [PATCH 182/277] Remove form test functionality from BaseTestCase

BaseTestCase::createForm() is not required as the Form base class does
not have that much bloat anymore to have the need for a form factory.
---
 library/Icinga/Test/BaseTestCase.php | 58 +---------------------------
 library/Icinga/Test/FormTest.php     | 23 -----------
 2 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 library/Icinga/Test/FormTest.php

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 1c72b0f47..f836e2725 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -25,20 +25,16 @@ namespace Icinga\Test {
     use RuntimeException;
     use Mockery;
     use Zend_Config;
-    use Zend_Controller_Request_Abstract;
-    use Zend_Controller_Request_HttpTestCase;
     use PHPUnit_Framework_TestCase;
     use Icinga\Application\Icinga;
     use Icinga\Util\DateTimeFactory;
     use Icinga\Data\ResourceFactory;
     use Icinga\Data\Db\DbConnection;
-    use Icinga\User\Preferences;
-    use Icinga\Web\Form;
 
     /**
      * Class BaseTestCase
      */
-    class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest, FormTest
+    class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest
     {
         /**
          * Path to application/
@@ -82,13 +78,6 @@ namespace Icinga\Test {
          */
         public static $moduleDir;
 
-        /**
-         * Store request for form tests
-         * 
-         * @var Zend_Controller_Request_HttpTestCase
-         */
-        private $request;
-
         /**
          * Resource configuration for different database types
          *
@@ -319,51 +308,6 @@ namespace Icinga\Test {
                 $adapter->exec('DROP TABLE ' . $table . ';');
             }
         }
-
-        /**
-         * Instantiate a form
-         *
-         * If the form has CSRF protection enabled, creates the form's token element and adds the generated token to the
-         * request data
-         *
-         * @param   string  $formClass      Qualified class name of the form to create. Note that the class has to be
-         *                                  defined as no attempt is made to require the class before instantiating.
-         * @param   array   $requestData    Request data for the form
-         *
-         * @return  Form
-         * @throws  RuntimeException
-         */
-        public function createForm($formClass, array $requestData = array())
-        {
-            $form = new $formClass;
-            $form->setTokenDisabled(); // Disable CSRF protection else all calls to isSubmittedAndValid will fail
-            $request = $this->getRequest();
-            $request->setMethod('POST');
-            $request->setPost($requestData);
-            $form->setRequest($request);
-            $form->setUserPreferences(
-                new Preferences(
-                    array()
-                )
-            );
-            return $form;
-        }
-
-        /**
-         * Retrieve test case request object
-         *
-         * This is a mock methods borrowed from Zend Controller Test Case to handle form tests properly (#6106)
-         *
-         * @return Zend_Controller_Request_HttpTestCase
-         */
-        public function getRequest()
-        {
-            if (null === $this->request) {
-                require_once 'Zend/Controller/Request/HttpTestCase.php';
-                $this->request = new Zend_Controller_Request_HttpTestCase;
-            }
-            return $this->request;
-        }
     }
 
     BaseTestCase::setupTimezone();
diff --git a/library/Icinga/Test/FormTest.php b/library/Icinga/Test/FormTest.php
deleted file mode 100644
index e8b070483..000000000
--- a/library/Icinga/Test/FormTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Test;
-
-use Icinga\Web\Form;
-
-/**
- * Interface to test form objects
- */
-interface FormTest
-{
-    /**
-     * Instantiate a new form object
-     *
-     * @param   string    $formClass      Form class to instantiate
-     * @param   array     $requestData    Request data for the form
-     *
-     * @return Form
-     */
-    public function createForm($formClass, array $requestData = array());
-}

From c8ce1088c92dd4071188059c7047d2257953bced Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:30:33 +0200
Subject: [PATCH 183/277] Disable checking whether a form is sent when form
 identification is disabled

refs #5525
---
 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 e4b292647..ba15f8c41 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -490,7 +490,7 @@ class Form extends Zend_Form
         }
 
         $formData = $this->getRequestData($request);
-        if ($this->wasSent($formData)) {
+        if ($this->getUidDisabled() || $this->wasSent($formData)) {
             $this->populate($formData); // Necessary to get isSubmitted() to work
             if (! $this->getSubmitLabel() || $this->isSubmitted()) {
                 if ($this->isValid($formData)

From f7f6bcc4472a7dff25b41179adc192b92f80d755 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:31:15 +0200
Subject: [PATCH 184/277] Make Form base class more test friendly..

refs #5525
---
 library/Icinga/Web/Form.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index ba15f8c41..fd5cbf510 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -162,8 +162,9 @@ class Form extends Zend_Form
     public function getRedirectUrl()
     {
         if ($this->redirectUrl === null) {
+            $url = Url::fromRequest(array(), $this->getRequest());
             // Be sure to remove all form dependent params because we do not want to submit it again
-            $this->redirectUrl = Url::fromRequest()->without(array_keys($this->getElements()));
+            $this->redirectUrl = $url->without(array_keys($this->getElements()));
         }
 
         return $this->redirectUrl;
@@ -312,7 +313,7 @@ class Form extends Zend_Form
             if ($this->getAction() === '') {
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
-                $this->setAction(Url::fromRequest()->getUrlWithout(array_keys($this->getElements())));
+                $this->setAction(Url::fromRequest()->without(array_keys($this->getElements())));
             }
 
             $this->created = true;

From 6525d6933a5a509a20fe22ba6d94008f5bd22f67 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:40:49 +0200
Subject: [PATCH 185/277] Add test for Icinga\Web\Form

refs #5525
---
 test/php/library/Icinga/Web/FormTest.php | 289 ++++++++++++++++++++---
 1 file changed, 258 insertions(+), 31 deletions(-)

diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index 4e6ec5d92..a2fc9c8b1 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -4,58 +4,285 @@
 
 namespace Tests\Icinga\Web;
 
+use Mockery;
 use Icinga\Web\Form;
+use Icinga\Web\Request;
 use Icinga\Test\BaseTestCase;
 
+class SuccessfulForm extends Form
+{
+    public function onSuccess(Request $request)
+    {
+        return true;
+    }
+}
+
 class FormTest extends BaseTestCase
 {
-    public function testWhetherAddElementDoesNotAddSpecificDecorators()
+    public function tearDown()
+    {
+        Mockery::close(); // Necessary as some tests are running isolated
+    }
+
+    public function testWhetherASubmitButtonIsAddedWithASubmitLabelBeingSet()
     {
         $form = new Form();
-        $form->addElement('text', 'someText');
-        $element = $form->getElement('someText');
+        $form->setTokenDisabled();
+        $form->setSubmitLabel('test');
+        $form->create();
 
-        $this->assertFalse(
-            $element->getDecorator('HtmlTag'),
-            'Form::addElement does not remove the HtmlTag-Decorator'
-        );
-        $this->assertFalse(
-            $element->getDecorator('Label'),
-            'Form::addElement does not remove the Label-Decorator'
-        );
-        $this->assertFalse(
-            $element->getDecorator('DtDdWrapper'),
-            'Form::addElement does not remove the DtDdWrapper-Decorator'
+        $this->assertInstanceOf(
+            '\Zend_Form_Element',
+            $form->getElement('btn_submit'),
+            'Form::create() does not add a submit button in case a submit label is set'
         );
     }
 
-    public function testWhetherAddElementDoesNotAddAnyOptionalDecoratorsToHiddenElements()
+    public function testWhetherNoSubmitButtonIsAddedWithoutASubmitLabelBeingSet()
     {
         $form = new Form();
-        $form->addElement('hidden', 'somethingHidden');
-        $element = $form->getElement('somethingHidden');
+        $form->setTokenDisabled();
+        $form->create();
+
+        $this->assertNull(
+            $form->getElement('btn_submit'),
+            'Form::create() adds a submit button in case no submit label is set'
+        );
+    }
+
+    /**
+     * @depends testWhetherASubmitButtonIsAddedWithASubmitLabelBeingSet
+     */
+    public function testWhetherIsSubmittedReturnsTrueWithASubmitLabelBeingSet()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->setSubmitLabel('test');
+        $form->populate(array('btn_submit' => true));
+
+        $this->assertTrue(
+            $form->isSubmitted(),
+            'Form::isSubmitted() does not return true in case a submit label is set'
+        );
+    }
+
+    /**
+     * @depends testWhetherNoSubmitButtonIsAddedWithoutASubmitLabelBeingSet
+     */
+    public function testWhetherIsSubmittedReturnsFalseWithoutASubmitLabelBeingSet()
+    {
+        $form = new Form();
+
+        $this->assertFalse(
+            $form->isSubmitted(),
+            'Form::isSubmitted() does not return false in case no submit label is set'
+        );
+    }
+
+    public function testWhetherTheCurrentLocationIsUsedAsDefaultRedirection()
+    {
+        $this->getRequestMock()->shouldReceive('getPathInfo')->andReturn('default/route');
+        $this->getResponseMock()->shouldReceive('redirectAndExit')->atLeast()->once()
+            ->with(Mockery::on(function ($url) { return $url->getRelativeUrl() === 'default/route'; }));
+
+        $form = new SuccessfulForm();
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->handleRequest();
+    }
+
+    public function testWhetherAnExplicitlySetRedirectUrlIsUsedForRedirection()
+    {
+        $this->getResponseMock()->shouldReceive('redirectAndExit')->atLeast()->once()->with('special/route');
+
+        $form = new SuccessfulForm();
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->setRedirectUrl('special/route');
+        $form->handleRequest();
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testWhetherACsrfCounterMeasureIsBeingAdded()
+    {
+        Mockery::mock('alias:Icinga\Web\Session')->shouldReceive('getSession->getId')->andReturn('1234567890');
+
+        $form = new Form();
+        $form->create();
+
+        $this->assertInstanceOf(
+            '\Zend_Form_Element',
+            $form->getElement($form->getTokenElementName()),
+            'Form::create() does not add a csrf counter measure element'
+        );
+    }
+
+    public function testWhetherACsrfCounterMeasureIsNotBeingAdded()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->create();
+
+        $this->assertNull(
+            $form->getElement($form->getTokenElementName()),
+            'Form::create() adds a csrf counter measure element in case it\'s disabled'
+        );
+    }
+
+    public function testWhetherAUniqueFormIdIsBeingAdded()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->create();
+
+        $this->assertInstanceOf(
+            '\Zend_Form_Element',
+            $form->getElement($form->getUidElementName()),
+            'Form::create() does not add a form identification element'
+        );
+    }
+
+    public function testWhetherAUniqueFormIdIsNotBeingAdded()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->create();
+
+        $this->assertNull(
+            $form->getElement($form->getUidElementName()),
+            'Form::create() adds a form identification element in case it\'s disabled'
+        );
+    }
+
+    /**
+     * @depends testWhetherAUniqueFormIdIsBeingAdded
+     */
+    public function testWhetherAFormIsSentWithAUniqueFormIdBeingAdded()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->create();
+
+        $this->assertTrue(
+            $form->wasSent(
+                array(
+                    $form->getUidElementName() => $form->getElement($form->getUidElementName())->getValue()
+                )
+            ),
+            'Form::wasSent() does not return true in case a the form identification value is being sent'
+        );
+    }
+
+    /**
+     * @depends testWhetherAUniqueFormIdIsNotBeingAdded
+     */
+    public function testWhetherAFormIsNotSentWithoutAUniqueFormIdBeingAdded()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->create();
+
+        $this->assertFalse(
+            $form->wasSent(array()),
+            'Form::wasSent() does not return false in case no form identification element was added'
+        );
+    }
+
+    public function testWhetherADefaultActionIsBeingSetOnFormCreation()
+    {
+        $this->getRequestMock()->shouldReceive('getPathInfo')->andReturn('some/route');
+
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->create();
+
+        $this->assertEquals(
+            '/some/route',
+            $form->getAction(),
+            'Form::create() does not set a default action if none was set explicitly'
+        );
+    }
+
+    /**
+     * @depends testWhetherAUniqueFormIdIsBeingAdded
+     * @depends testWhetherASubmitButtonIsAddedWithASubmitLabelBeingSet
+     */
+    public function testWhetherItIsPossibleToRecreateAForm()
+    {
+        $form = new Form();
+        $form->setTokenDisabled();
+        $form->setSubmitLabel('test');
+        $form->create(); // sets the flag $this->created to true
+        $form->clearElements(); // should reset the flag..
+        $form->create(); // ..so that we can recreate the form
 
         $this->assertCount(
-            1,
-            $element->getDecorators(),
-            'Form::addElement adds more decorators than necessary to hidden elements'
-        );
-        $this->assertInstanceOf(
-            '\Zend_Form_Decorator_ViewHelper',
-            $element->getDecorator('ViewHelper'),
-            'Form::addElement does not add the ViewHelper-Decorator to hidden elements'
+            2,
+            $form->getElements(),
+            'Form::clearElements() does not fully reset the form'
         );
     }
 
-    public function testWhetherLoadDefaultDecoratorsDoesNotAddTheHtmlTagDecorator()
+    public function testWhetherGetNameReturnsTheEscapedClassNameByDefault()
     {
         $form = new Form();
-        $form->loadDefaultDecorators();
 
-        $this->assertArrayNotHasKey(
-            'HtmlTag',
-            $form->getDecorators(),
-            'Form::loadDefaultDecorators adds the HtmlTag-Decorator'
+        $this->assertEquals(
+            $form->filterName(get_class($form)),
+            $form->getName(),
+            'Form::getName() does not return the escaped class name in case no name was explicitly set'
+        );
+    }
+
+    public function testWhetherGetRequestDataOnlyReturnsFormRelevantData()
+    {
+        $form = new Form();
+        $form->setMethod('POST');
+
+        $expectedResult = array('expected_key' => 'expected_value');
+        $request = $this->getRequestMock();
+        $request->shouldReceive('getMethod')->andReturn('POST')
+            ->shouldReceive('isPost')->andReturn(true)
+            ->shouldReceive('getPost')->andReturn($expectedResult);
+
+        $this->assertEquals(
+            $expectedResult,
+            $form->getRequestData($request),
+            'Form::getRequestData() does not (only) return form relevant data'
+        );
+    }
+
+    /**
+     * @expectedException   LogicException
+     */
+    public function testWhetherTheOnSuccessOptionMustBeCallable()
+    {
+        new Form(array('onSuccess' => '_invalid_'));
+    }
+
+    /**
+     * @depends testWhetherACsrfCounterMeasureIsNotBeingAdded
+     * @depends testWhetherAUniqueFormIdIsNotBeingAdded
+     * @depends testWhetherNoSubmitButtonIsAddedWithoutASubmitLabelBeingSet
+     */
+    public function testWhetherAClosureCanBePassedAsOnSuccessCallback()
+    {
+        $request = new Request();
+        $form = new Form(array(
+            'onSuccess' => function ($req) { $req->setParam('test', 'tset'); return false; }
+        ));
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->handleRequest($request);
+
+        $this->assertEquals(
+            'tset',
+            $request->getParam('test'),
+            'Form does not utilize the onSuccess callback set with form options on instantiation'
         );
     }
 }

From c947ba3b18c88a41bd2add8dccb3813cc90ace3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 09:46:57 +0200
Subject: [PATCH 186/277] Use the new view script to show INI configuration in
 case of failures

---
 .../controllers/DashboardController.php       |  8 ++---
 .../scripts/config/show-configuration.phtml   | 31 -------------------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 application/views/scripts/config/show-configuration.phtml

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index e8629f865..4942f5cdb 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -96,7 +96,7 @@ class DashboardController extends ActionController
                 if ($this->writeConfiguration(new Zend_Config($dashboard->toArray()), $configFile)) {
                     $this->redirectNow(Url::fromPath('dashboard', array('pane' => $form->getValue('pane'))));
                 } else {
-                    $this->render('show-configuration');
+                    $this->render('showConfiguration');
                     return;
                 }
             }
@@ -164,9 +164,9 @@ class DashboardController extends ActionController
             $writer->write();
         } catch (Exception $e) {
             Logger::error(new ConfiguationError("Cannot write dashboard to $target", 0, $e));
-            $this->view->iniConfigurationString = $writer->render();
-            $this->view->exceptionMessage = $e->getMessage();
-            $this->view->file = $target;
+            $this->view->configString = $writer->render();
+            $this->view->errorMessage = $e->getMessage();
+            $this->view->filePath = $target;
             return false;
         }
 
diff --git a/application/views/scripts/config/show-configuration.phtml b/application/views/scripts/config/show-configuration.phtml
deleted file mode 100644
index a8eda9d86..000000000
--- a/application/views/scripts/config/show-configuration.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?= $this->tabs->render($this); ?>
-
-
-<br/>
-<div>
-  <h4><i>WARNING ICON</i>Saving "<?= $this->escape($this->file); ?>.ini" 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); ?>.ini 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); ?>.ini) 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 d6377ca00c8620379276f93bd0bc3c08c663d9e4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 10:19:51 +0200
Subject: [PATCH 187/277] Return bootstrap mock when calling
 BaseTestCase::setupIcingaMock()

---
 library/Icinga/Test/BaseTestCase.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index f836e2725..4ff58c521 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -145,6 +145,8 @@ namespace Icinga\Test {
 
         /**
          * Setup mock object for the application's bootstrap
+         *
+         * @return  Mockery\Mock
          */
         protected function setupIcingaMock()
         {
@@ -163,6 +165,7 @@ namespace Icinga\Test {
                 ->shouldReceive('getResponse')->andReturn($responseMock);
 
             Icinga::setApp($bootstrapMock, true);
+            return $bootstrapMock;
         }
 
         /**

From a5c027b77c606c2be94d5d2c40c7d8400fd31eb8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 10:21:09 +0200
Subject: [PATCH 188/277] Fix UrlTest utilizing BaseTestCase::setupIcingaMock()

---
 test/php/library/Icinga/Web/UrlTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
index 5da50c3f8..68206beee 100644
--- a/test/php/library/Icinga/Web/UrlTest.php
+++ b/test/php/library/Icinga/Web/UrlTest.php
@@ -12,11 +12,9 @@ class UrlTest extends BaseTestCase
 {
     public function testWhetherFromRequestWorksWithoutARequest()
     {
-        $request = Mockery::mock('Icinga\Web\Request');
-        $request->shouldReceive('getPathInfo')->andReturn('my/test/url.html')
-            ->shouldReceive('getBaseUrl')->andReturn('/path/to')
+        $this->getRequestMock()->shouldReceive('getBaseUrl')->andReturn('/path/to')
+            ->shouldReceive('getPathInfo')->andReturn('my/test/url.html')
             ->shouldReceive('getQuery')->andReturn(array('param1' => 'value1', 'param2' => 'value2'));
-        $this->setupIcingaMock($request);
 
         $url = Url::fromRequest();
         $this->assertEquals(

From cee3c32fa513273fe291f7d1196d3a94498a2aa9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 10:21:37 +0200
Subject: [PATCH 189/277] Fix dashboard tests utilizing
 BaseTestCase::setupIcingaMock()

---
 .../Icinga/Web/Widget/DashboardTest.php       | 10 ++--------
 .../Icinga/Web/Widget/SearchDashboardTest.php | 19 +++----------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index 9114a8f90..be11c42fe 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -47,7 +47,7 @@ class DashboardTest extends BaseTestCase
         Mockery::close(); // Necessary because some tests run in a separate process
     }
 
-    protected function setupIcingaMock(\Zend_Controller_Request_Abstract $request)
+    public function setUp()
     {
         $moduleMock = Mockery::mock('Icinga\Application\Modules\Module');
         $moduleMock->shouldReceive('getPaneItems')->andReturn(array(
@@ -59,14 +59,8 @@ class DashboardTest extends BaseTestCase
             'test-module' => $moduleMock
         ));
 
-        $bootstrapMock = Mockery::mock('Icinga\Application\ApplicationBootstrap')->shouldDeferMissing();
-        $bootstrapMock->shouldReceive('getFrontController->getRequest')->andReturnUsing(
-            function () use ($request) { return $request; }
-        )->shouldReceive('getApplicationDir')->andReturn(self::$appDir);
-
+        $bootstrapMock = $this->setupIcingaMock();
         $bootstrapMock->shouldReceive('getModuleManager')->andReturn($moduleManagerMock);
-
-        Icinga::setApp($bootstrapMock, true);
     }
 
     public function testWhetherCreatePaneCreatesAPane()
diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index d42862ff6..d9323c00a 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -5,19 +5,12 @@
 namespace Tests\Icinga\Web;
 
 use Mockery;
-use Icinga\Application\Icinga;
-use Icinga\Web\Widget\SearchDashboard;
 use Icinga\Test\BaseTestCase;
+use Icinga\Web\Widget\SearchDashboard;
 
 class SearchDashboardTest extends BaseTestCase
 {
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close();
-    }
-
-    protected function setupIcingaMock(\Zend_Controller_Request_Abstract $request)
+    public function setUp()
     {
         $moduleMock = Mockery::mock('Icinga\Application\Modules\Module');
         $searchUrl = (object) array(
@@ -33,14 +26,8 @@ class SearchDashboardTest extends BaseTestCase
             'test-module' => $moduleMock
         ));
 
-        $bootstrapMock = Mockery::mock('Icinga\Application\ApplicationBootstrap')->shouldDeferMissing();
-        $bootstrapMock->shouldReceive('getFrontController->getRequest')->andReturnUsing(
-            function () use ($request) { return $request; }
-        )->shouldReceive('getApplicationDir')->andReturn(self::$appDir);
-
+        $bootstrapMock = $this->setupIcingaMock();
         $bootstrapMock->shouldReceive('getModuleManager')->andReturn($moduleManagerMock);
-
-        Icinga::setApp($bootstrapMock, true);
     }
 
     /**

From 31978e12360afac8eed56180147f4eb55a5c7f82 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 10:36:42 +0200
Subject: [PATCH 190/277] Fix LdapBackendFormTest

refs #5525
---
 .../Config/Authentication/LdapBackendForm.php |  1 +
 .../Authentication/LdapBackendFormTest.php    | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 4e3172ad2..a0c20b949 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -6,6 +6,7 @@ namespace Icinga\Form\Config\Authentication;
 
 use Exception;
 use Icinga\Web\Form;
+use Icinga\Web\Request;
 use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\Backend\LdapUserBackend;
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 209b7a675..0335d1f82 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -29,16 +29,15 @@ class LdapBackendFormTest extends BaseTestCase
     {
         $this->setUpResourceFactoryMock();
         Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
-            ->shouldReceive('assertAuthenticationPossible')->andReturn(null);
+            ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
 
         $form = new LdapBackendForm();
-        $form->setBackendName('test');
-        $form->setResources(array('test_ldap_backend' => null));
-        $form->create();
-        $form->populate(array('backend_test_resource' => 'test_ldap_backend'));
+        $form->setTokenDisabled();
+        $form->setResources(array('test_ldap_backend'));
+        $form->populate(array('resource' => 'test_ldap_backend'));
 
         $this->assertTrue(
-            $form->isValidAuthenticationBackend(),
+            $form->isValidAuthenticationBackend($form),
             'LdapBackendForm claims that a valid authentication backend with users is not valid'
         );
     }
@@ -54,13 +53,12 @@ class LdapBackendFormTest extends BaseTestCase
             ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
 
         $form = new LdapBackendForm();
-        $form->setBackendName('test');
-        $form->setResources(array('test_ldap_backend' => null));
-        $form->create();
-        $form->populate(array('backend_test_resource' => 'test_ldap_backend'));
+        $form->setTokenDisabled();
+        $form->setResources(array('test_ldap_backend'));
+        $form->populate(array('resource' => 'test_ldap_backend'));
 
         $this->assertFalse(
-            $form->isValidAuthenticationBackend(),
+            $form->isValidAuthenticationBackend($form),
             'LdapBackendForm claims that an invalid authentication backend without users is valid'
         );
     }

From e4fccdd15019676eaaa0bd8a47e2923f27b21562 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 10:39:49 +0200
Subject: [PATCH 191/277] Fix DbBackendFormTest

refs #5525
---
 .../Authentication/DbBackendFormTest.php       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 51bec896f..3364dff60 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -32,13 +32,12 @@ class DbBackendFormTest extends BaseTestCase
             ->andReturn(2);
 
         $form = new DbBackendForm();
-        $form->setBackendName('test');
-        $form->setResources(array('test_db_backend' => null));
-        $form->create();
-        $form->populate(array('backend_test_resource' => 'test_db_backend'));
+        $form->setTokenDisabled();
+        $form->setResources(array('test_db_backend'));
+        $form->populate(array('resource' => 'test_db_backend'));
 
         $this->assertTrue(
-            $form->isValidAuthenticationBackend(),
+            $form->isValidAuthenticationBackend($form),
             'DbBackendForm claims that a valid authentication backend with users is not valid'
         );
     }
@@ -55,13 +54,12 @@ class DbBackendFormTest extends BaseTestCase
             ->andReturn(0);
 
         $form = new DbBackendForm();
-        $form->setBackendName('test');
-        $form->setResources(array('test_db_backend' => null));
-        $form->create();
-        $form->populate(array('backend_test_resource' => 'test_db_backend'));
+        $form->setTokenDisabled();
+        $form->setResources(array('test_db_backend'));
+        $form->populate(array('resource' => 'test_db_backend'));
 
         $this->assertFalse(
-            $form->isValidAuthenticationBackend(),
+            $form->isValidAuthenticationBackend($form),
             'DbBackendForm claims that an invalid authentication backend without users is valid'
         );
     }

From 7dbc83e21feeee17b41a9a78ce5e281ee64d88cc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 11:58:07 +0200
Subject: [PATCH 192/277] Drop obsolete BaseBackendFormTest

refs #5525
---
 .../Authentication/BaseBackendFormTest.php    | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 test/php/application/forms/Config/Authentication/BaseBackendFormTest.php

diff --git a/test/php/application/forms/Config/Authentication/BaseBackendFormTest.php b/test/php/application/forms/Config/Authentication/BaseBackendFormTest.php
deleted file mode 100644
index ca32a1dae..000000000
--- a/test/php/application/forms/Config/Authentication/BaseBackendFormTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Form\Config\Authentication;
-
-use Icinga\Test\BaseTestCase;
-use Icinga\Form\Config\Authentication\BaseBackendForm;
-
-class BackendForm extends BaseBackendForm
-{
-    public $is_valid;
-
-    public function getConfig()
-    {
-        // Need to be declared as being abstract otherwise
-    }
-
-    public function isValidAuthenticationBackend()
-    {
-        return $this->is_valid;
-    }
-}
-
-class BaseBackendFormTest extends BaseTestCase
-{
-    public function testIsForceCreationCheckboxBeingAdded()
-    {
-        $form = new BackendForm();
-        $form->is_valid = false;
-
-        $this->assertFalse($form->isValid(array()));
-        $this->assertNotNull(
-            $form->getElement('backend_force_creation'),
-            'Checkbox to force a backend\'s creation is not being added though the backend is invalid'
-        );
-    }
-
-    public function testIsForceCreationCheckboxNotBeingAdded()
-    {
-        $form = new BackendForm();
-        $form->is_valid = true;
-
-        $this->assertTrue($form->isValid(array()));
-        $this->assertNull(
-            $form->getElement('backend_force_creation'),
-            'Checkbox to force a backend\'s creation is being added though the backend is valid'
-        );
-    }
-
-    public function testIsTheFormValidIfForceCreationTrue()
-    {
-        $form = new BackendForm();
-        $form->is_valid = false;
-
-        $this->assertTrue(
-            $form->isValid(array('backend_force_creation' => 1)),
-            'BaseBackendForm with invalid backend is not valid though force creation is set'
-        );
-    }
-}

From 40947acd163d56658578e75fe076a6d50b96aa13 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 12:02:51 +0200
Subject: [PATCH 193/277] Fix, rename and move ReorderFormTest

refs #5525
---
 .../Config/Authentication/ReorderFormTest.php | 80 -------------------
 .../AuthenticationBackendReorderFormTest.php  | 61 ++++++++++++++
 2 files changed, 61 insertions(+), 80 deletions(-)
 delete mode 100644 test/php/application/forms/Config/Authentication/ReorderFormTest.php
 create mode 100644 test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php

diff --git a/test/php/application/forms/Config/Authentication/ReorderFormTest.php b/test/php/application/forms/Config/Authentication/ReorderFormTest.php
deleted file mode 100644
index 808806f1a..000000000
--- a/test/php/application/forms/Config/Authentication/ReorderFormTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Form\Config\Authentication;
-
-use Mockery;
-use Zend_Config;
-use Icinga\Test\BaseTestCase;
-use Icinga\Form\Config\Authentication\ReorderForm;
-
-class RequestLessReorderForm extends ReorderForm
-{
-    public $order;
-
-    public function getValues($suppressArrayNotation = false)
-    {
-        return array('form_backend_order' => $this->order);
-    }
-}
-
-class ReorderFormTest extends BaseTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        $this->viewMock = Mockery::mock('\Zend_View');
-        $this->viewMock->shouldReceive('icon')->andReturn('');
-    }
-
-    public function testMoveBackendUp()
-    {
-        $config = new Zend_Config(
-            array(
-                'test1' => '',
-                'test2' => '',
-                'test3' => ''
-            )
-        );
-        $oldOrder = array_keys($config->toArray());
-
-        $form = new RequestLessReorderForm();
-        $form->setCurrentOrder($oldOrder);
-        $form->setBackendName('test3');
-        $form->setView($this->viewMock);
-        $form->create();
-
-        $form->order = $form->getSubForm('btn_reorder_up')->getElement('form_backend_order')->getValue();
-        $this->assertSame(
-            $form->getReorderedConfig($config),
-            array('test1' => '', 'test3' => '', 'test2' => ''),
-            'Moving elements up with ReorderForm does not seem to properly work'
-        );
-    }
-
-    public function testMoveBackendDown()
-    {
-        $config = new Zend_Config(
-            array(
-                'test1' => '',
-                'test2' => '',
-                'test3' => ''
-            )
-        );
-        $oldOrder = array_keys($config->toArray());
-
-        $form = new RequestLessReorderForm();
-        $form->setCurrentOrder($oldOrder);
-        $form->setBackendName('test1');
-        $form->setView($this->viewMock);
-        $form->create();
-
-        $form->order = $form->getSubForm('btn_reorder_down')->getElement('form_backend_order')->getValue();
-        $this->assertSame(
-            $form->getReorderedConfig($config),
-            array('test2' => '', 'test1' => '', 'test3' => ''),
-            'Moving elements down with ReorderForm does not seem to properly work'
-        );
-    }
-}
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
new file mode 100644
index 000000000..c79b12fd9
--- /dev/null
+++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
@@ -0,0 +1,61 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Tests\Icinga\Form\Config;
+
+use Icinga\Test\BaseTestCase;
+use Icinga\Application\Config;
+use Icinga\Form\Config\AuthenticationBackendConfigForm;
+use Icinga\Form\Config\AuthenticationBackendReorderForm;
+
+class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendConfigForm
+{
+    public static $newConfig;
+
+    public function save()
+    {
+        self::$newConfig = $this->config;
+        return false;
+    }
+}
+
+class AuthenticationBackendReorderFormProvidingConfigFormWithoutSave extends AuthenticationBackendReorderForm
+{
+    public function getConfigForm()
+    {
+        $form = new AuthenticationBackendConfigFormWithoutSave();
+        $form->setIniConfig($this->config);
+        return $form;
+    }
+}
+
+class AuthenticationBackendReorderFormTest extends BaseTestCase
+{
+    public function testMoveBackend()
+    {
+        $config = new Config(
+            array(
+                'test1' => '',
+                'test2' => '',
+                'test3' => ''
+            )
+        );
+
+        $this->getRequestMock()->shouldReceive('getMethod')->andReturn('POST')
+            ->shouldReceive('isPost')->andReturn(true)
+            ->shouldReceive('getPost')->andReturn(array('backend_newpos' => 'test3|1'));
+
+        $form = new AuthenticationBackendReorderFormProvidingConfigFormWithoutSave();
+        $form->setIniConfig($config);
+        $form->setTokenDisabled();
+        $form->setUidDisabled();
+        $form->handleRequest();
+
+        $this->assertEquals(
+            array('test1', 'test3', 'test2'),
+            AuthenticationBackendConfigFormWithoutSave::$newConfig->keys(),
+            'Moving elements with AuthenticationBackendReorderForm does not seem to properly work'
+        );
+    }
+}

From 9d8f810e1037a9ac1e76cd635c4fba5125041e59 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 13:01:09 +0200
Subject: [PATCH 194/277] Icinga\Web\Request::getParam() should be mocked as
 well by default

---
 library/Icinga/Test/BaseTestCase.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 4ff58c521..a735550cb 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -153,7 +153,9 @@ namespace Icinga\Test {
             $requestMock = Mockery::mock('Icinga\Web\Request')->shouldDeferMissing();
             $requestMock->shouldReceive('getPathInfo')->andReturn('')->byDefault()
                 ->shouldReceive('getBaseUrl')->andReturn('/')->byDefault()
-                ->shouldReceive('getQuery')->andReturn(array())->byDefault();
+                ->shouldReceive('getQuery')->andReturn(array())->byDefault()
+                ->shouldReceive('getParam')->with(Mockery::type('string'), Mockery::type('string'))
+                ->andReturnUsing(function ($name, $default) { return $default; })->byDefault();
 
             $responseMock = Mockery::mock('Icinga\Web\Response')->shouldDeferMissing();
 

From 0693e7cf2db3e49c54e27cab3ddbad060395205e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 13:06:30 +0200
Subject: [PATCH 195/277] Fix ResourceForm tests

refs #5525
---
 .../Config/Resource/DbResourceFormTest.php    |  66 +++++
 .../Config/Resource/LdapResourceFormTest.php  |  66 +++++
 .../Resource/LivestatusResourceFormTest.php   |  67 +++++
 .../Resource/ResourceFormTestBroken.php       | 268 ------------------
 4 files changed, 199 insertions(+), 268 deletions(-)
 create mode 100644 test/php/application/forms/Config/Resource/DbResourceFormTest.php
 create mode 100644 test/php/application/forms/Config/Resource/LdapResourceFormTest.php
 create mode 100644 test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
 delete mode 100644 test/php/application/forms/Config/Resource/ResourceFormTestBroken.php

diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
new file mode 100644
index 000000000..1b624c49f
--- /dev/null
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -0,0 +1,66 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Tests\Icinga\Form\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\Form\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('getConnection')->atMost()->twice()->andReturn(Mockery::self())->getMock()
+        );
+
+        $form = new DbResourceForm();
+
+        $this->assertTrue(
+            $form->isValidResource($form),
+            'ResourceForm claims that a valid db resource is not valid'
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testInvalidDbResourceIsNotValid()
+    {
+        $this->setUpResourceFactoryMock(
+            Mockery::mock()->shouldReceive('getConnection')->once()->andThrow('\Exception')->getMock()
+        );
+
+        $form = new DbResourceForm();
+
+        $this->assertFalse(
+            $form->isValidResource($form),
+            'ResourceForm claims that an invalid db resource is valid'
+        );
+    }
+
+    protected function setUpResourceFactoryMock($resourceMock)
+    {
+        Mockery::mock('alias:Icinga\Data\ResourceFactory')
+            ->shouldReceive('createResource')
+            ->with(Mockery::type('\Zend_Config'))
+            ->andReturn($resourceMock);
+    }
+}
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
new file mode 100644
index 000000000..078a11146
--- /dev/null
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -0,0 +1,66 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Tests\Icinga\Form\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\Form\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('connect')->getMock()
+        );
+
+        $form = new LdapResourceForm();
+
+        $this->assertTrue(
+            $form->isValidResource($form),
+            'ResourceForm claims that a valid ldap resource is not valid'
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testInvalidLdapResourceIsNotValid()
+    {
+        $this->setUpResourceFactoryMock(
+            Mockery::mock()->shouldReceive('connect')->once()->andThrow('\Exception')->getMock()
+        );
+
+        $form = new LdapResourceForm();
+
+        $this->assertFalse(
+            $form->isValidResource($form),
+            'ResourceForm claims that an invalid ldap resource is valid'
+        );
+    }
+
+    protected function setUpResourceFactoryMock($resourceMock)
+    {
+        Mockery::mock('alias:Icinga\Data\ResourceFactory')
+            ->shouldReceive('createResource')
+            ->with(Mockery::type('\Zend_Config'))
+            ->andReturn($resourceMock);
+    }
+}
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
new file mode 100644
index 000000000..300adebed
--- /dev/null
+++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
@@ -0,0 +1,67 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Tests\Icinga\Form\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\Form\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()
+        );
+
+        $form = new LivestatusResourceForm();
+
+        $this->assertTrue(
+            $form->isValidResource($form),
+            '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()
+        );
+
+        $form = new LivestatusResourceForm();
+
+        $this->assertFalse(
+            $form->isValidResource($form),
+            'ResourceForm claims that an invalid livestatus resource is valid'
+        );
+    }
+
+    protected function setUpResourceFactoryMock($resourceMock)
+    {
+        Mockery::mock('alias:Icinga\Data\ResourceFactory')
+            ->shouldReceive('createResource')
+            ->with(Mockery::type('\Zend_Config'))
+            ->andReturn($resourceMock);
+    }
+}
diff --git a/test/php/application/forms/Config/Resource/ResourceFormTestBroken.php b/test/php/application/forms/Config/Resource/ResourceFormTestBroken.php
deleted file mode 100644
index 6dba6ce54..000000000
--- a/test/php/application/forms/Config/Resource/ResourceFormTestBroken.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Form\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 Zend_Config;
-use Icinga\Test\BaseTestCase;
-use Icinga\Form\Config\ResourceForm;
-
-class TestResourceForm extends ResourceForm
-{
-    public $is_valid;
-
-    public function isValidResource()
-    {
-        return $this->is_valid;
-    }
-}
-
-class ResourceFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    public function testIsForceCreationCheckboxBeingAdded()
-    {
-        $form = new TestResourceForm();
-        $form->is_valid = false;
-
-        $this->assertFalse($form->isValid(array()));
-        $this->assertNotNull(
-            $form->getElement('resource_force_creation'),
-            'Checkbox to force the creation of a resource is not being added though the resource is invalid'
-        );
-    }
-
-    public function testIsForceCreationCheckboxNotBeingAdded()
-    {
-        $form = new TestResourceForm();
-        $form->is_valid = true;
-
-        $this->assertTrue($form->isValid(array()));
-        $this->assertNull(
-            $form->getElement('resource_force_creation'),
-            'Checkbox to force the creation of a resource is being added though the resource is valid'
-        );
-    }
-
-    public function testIsTheFormValidIfForceCreationTrue()
-    {
-        $form = new TestResourceForm();
-        $form->is_valid = false;
-
-        $this->assertTrue(
-            $form->isValid(array('resource_force_creation' => 1)),
-            'ResourceForm with invalid resource is not valid though force creation is set'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidDbResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('getConnection')->atMost()->twice()->andReturn(Mockery::self())->getMock()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'db')));
-
-        $this->assertTrue(
-            $form->isValidResource(),
-            'ResourceForm claims that a valid db resource is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidDbResourceIsNotValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('getConnection')->once()->andThrow('\Exception')->getMock()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'db')));
-
-        $this->assertFalse(
-            $form->isValidResource(),
-            'ResourceForm claims that an invalid db resource is valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidLdapResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->getMock()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'ldap')));
-
-        $this->assertTrue(
-            $form->isValidResource(),
-            'ResourceForm claims that a valid ldap resource is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidLdapResourceIsNotValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->once()->andThrow('\Exception')->getMock()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'ldap')));
-
-        $this->assertFalse(
-            $form->isValidResource(),
-            'ResourceForm claims that an invalid ldap resource is valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidLivestatusResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->andReturn(Mockery::self())
-                ->shouldReceive('disconnect')->getMock()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'livestatus')));
-
-        $this->assertTrue(
-            $form->isValidResource(),
-            '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()
-        );
-        $form = $this->buildResourceForm(new Zend_Config(array('type' => 'livestatus')));
-
-        $this->assertFalse(
-            $form->isValidResource(),
-            'ResourceForm claims that an invalid livestatus resource is valid'
-        );
-    }
-
-    public function testValidFileResourceIsValid()
-    {
-        $form = $this->buildResourceForm(
-            new Zend_Config(
-                array(
-                    'type'      => 'file',
-                    'filename'  => BaseTestCase::$testDir . '/res/status/icinga.status.dat'
-                )
-            )
-        );
-
-        $this->assertTrue(
-            $form->isValidResource(),
-            'ResourceForm claims that a valid file resource is not valid'
-        );
-    }
-
-    public function testInvalidFileResourceIsNotValid()
-    {
-        $form = $this->buildResourceForm(
-            new Zend_Config(
-                array(
-                    'type'      => 'file',
-                    'filename'  => 'not_existing'
-                )
-            )
-        );
-
-        $this->assertFalse(
-            $form->isValidResource(),
-            'ResourceForm claims that an invalid file resource is valid'
-        );
-    }
-
-    public function testValidStatusdatResourceIsValid()
-    {
-        $form = $this->buildResourceForm(
-            new Zend_Config(
-                array(
-                    'type'          => 'statusdat',
-                    'status_file'   => BaseTestCase::$testDir . '/res/status/icinga.status.dat',
-                    'object_file'   => BaseTestCase::$testDir . '/res/status/icinga.objects.cache',
-                )
-            )
-        );
-
-        $this->assertTrue(
-            $form->isValidResource(),
-            'ResourceForm claims that a valid statusdat resource is not valid'
-        );
-    }
-
-    public function testInvalidStatusdatResourceIsNotValid()
-    {
-        $form = $this->buildResourceForm(
-            new Zend_Config(
-                array(
-                    'type'          => 'statusdat',
-                    'status_file'   => 'not_existing',
-                    'object_file'   => 'not_existing'
-                )
-            )
-        );
-
-        $this->assertFalse(
-            $form->isValidResource(),
-            'ResourceForm claims that an invalid statusdat resource is valid'
-        );
-    }
-
-    protected function buildResourceForm($resourceConfig)
-    {
-        $form = new ResourceForm();
-        $form->setRequest($this->getRequestMock());
-        $form->setResource($resourceConfig);
-        $form->create();
-
-        return $form;
-    }
-
-    protected function getRequestMock()
-    {
-        return Mockery::mock('\Zend_Controller_Request_Abstract')
-            ->shouldReceive('getParam')
-            ->with(Mockery::type('string'), Mockery::type('string'))
-            ->andReturnUsing(function ($name, $default) { return $default; })
-            ->getMock();
-    }
-
-    protected function setUpResourceFactoryMock($resourceMock)
-    {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->with(Mockery::type('\Zend_Config'))
-            ->andReturn($resourceMock);
-    }
-}

From 6bde740d21b66640161dd32ed6c07f4b965b47ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 13:22:51 +0200
Subject: [PATCH 196/277] Fix Icinga\Form\ConfigForm show config feature not
 available for modules

refs #5525
---
 application/forms/ConfigForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index a354fa538..86790d618 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -54,6 +54,7 @@ class ConfigForm extends Form
             $writer->write();
         } catch (Exception $e) {
             $this->addDecorator('ViewScript', array(
+                'viewModule'    => 'default',
                 'viewScript'    => 'showConfiguration.phtml',
                 'errorMessage'  => $e->getMessage(),
                 'configString'  => $writer->render(),

From ceeb3a9ff8e119370b82bdd1199392c3227c0bcd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 13:24:39 +0200
Subject: [PATCH 197/277] Fix createElements() not returning self where
 applicable

refs #5525
---
 .../forms/Config/Authentication/AutologinBackendForm.php        | 2 ++
 application/forms/Config/Authentication/DbBackendForm.php       | 2 ++
 application/forms/Config/Authentication/LdapBackendForm.php     | 2 ++
 application/forms/Config/General/ApplicationConfigForm.php      | 2 ++
 application/forms/Config/General/LoggingConfigForm.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/Resource/StatusdatResourceForm.php     | 2 ++
 .../application/forms/Config/Instance/LocalInstanceForm.php     | 2 ++
 .../application/forms/Config/Instance/RemoteInstanceForm.php    | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index d4e0547a9..4f4df73e3 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -69,6 +69,8 @@ class AutologinBackendForm extends Form
                 'value'     => 'autologin'
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 960a6d07c..23335f8fa 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -77,6 +77,8 @@ class DbBackendForm extends Form
                 'value'     => 'db'
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index a0c20b949..6056b0911 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -97,6 +97,8 @@ class LdapBackendForm extends Form
                 'value'     => 'ldap'
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 5f592eefc..fda695886 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -112,5 +112,7 @@ class ApplicationConfigForm extends Form
                 )
             );
         }
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 33e182b5d..135dd9e28 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -102,6 +102,8 @@ class LoggingConfigForm extends Form
                 )
             );
         }
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 136e9e645..4fd7297d9 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -92,6 +92,8 @@ class DbResourceForm extends Form
                 'description'       => t('The password to use for authentication')
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 2654ad949..d1d33a749 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -44,5 +44,7 @@ class FileResourceForm extends Form
                 'description'   => t('The regular expression by which to identify columns')
             )
         );
+
+        return $this;
     }
 }
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 752516956..6196f3a17 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -78,6 +78,8 @@ class LdapResourceForm extends Form
                 'description'       => t('The password to use for querying the ldap server')
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index ad0b382c2..92534f220 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -39,6 +39,8 @@ class LivestatusResourceForm extends Form
                 'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
             )
         );
+
+        return $this;
     }
 
     /**
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
index 15563ff39..f150056d1 100644
--- a/application/forms/Config/Resource/StatusdatResourceForm.php
+++ b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -48,5 +48,7 @@ class StatusdatResourceForm extends Form
                 'validators'    => array(new ReadablePathValidator())
             )
         );
+
+        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 6f0d37e25..513ba2433 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -31,5 +31,7 @@ class LocalInstanceForm extends Form
                 'description'   => t('The file path where the icinga commandpipe can be found')
             )
         );
+
+        return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 36991425b..0e78a0aec 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -62,5 +62,7 @@ class RemoteInstanceForm extends Form
                 'description'   => t('The file path where the icinga commandpipe can be found')
             )
         );
+
+        return $this;
     }
 }

From e7c021845d38a4ad616822dbd7af7fe0965785bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Sep 2014 15:00:33 +0200
Subject: [PATCH 198/277] Simplify subform usage

refs #5525
---
 library/Icinga/Web/Form.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index fd5cbf510..f0695242e 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -370,7 +370,7 @@ class Form extends Zend_Form
      */
     public function addSubmitButton()
     {
-        if ($this->submitLabel !== null) {
+        if ($this->submitLabel) {
             $this->addElement(
                 'submit',
                 'btn_submit',
@@ -388,6 +388,31 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Add a subform
+     *
+     * @param   Zend_Form   $form   The subform to add
+     * @param   string      $name   The name of the subform or null to use the name of $form
+     * @param   int         $order  The location where to insert the form
+     *
+     * @return  Zend_Form
+     */
+    public function addSubForm(Zend_Form $form, $name = null, $order = null)
+    {
+        if ($form instanceof self) {
+            $form->removeDecorator('Form');
+            $form->setSubmitLabel('');
+            $form->setTokenDisabled();
+            $form->setUidDisabled();
+        }
+
+        if ($name === null) {
+            $name = $form->getName();
+        }
+
+        return parent::addSubForm($form, $name, $order);
+    }
+
     /**
      * Create a new element
      *

From a841b0956d03c5f032f92b45d8cd51917ab28698 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Sep 2014 16:35:06 +0200
Subject: [PATCH 199/277] monitoring/commands: Do not require command objects
 to return the command string

There will be command renderer instead.

refs #6593
---
 .../Monitoring/Command/IcingaCommand.php      | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
index dd8dd97fe..d88f8dba0 100644
--- a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -10,35 +10,12 @@ namespace Icinga\Module\Monitoring\Command;
 abstract class IcingaCommand
 {
     /**
-     * Get the command string
+     * Get the name of the command
      *
      * @return string
      */
-    abstract public function getCommandString();
-
-    /**
-     * Escape a command string
-     *
-     * @param   string $commandString
-     *
-     * @return  string
-     */
-    public function escape($commandString)
+    public function getName()
     {
-        return str_replace(array("\r", "\n"), array('\r', '\n'), $commandString);
-    }
-
-    /**
-     * Get the command as string with the current timestamp as the command submission time
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf(
-            '[%u] %s',
-            time(),
-            $this->escape($this->getCommandString())
-        );
+        return substr_replace(end(explode('\\', get_called_class())), '', -7);  // Remove 'Command' Suffix
     }
 }

From d9fbbca447c71ef84d2a40933a73dfcbf9a32908 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Sep 2014 16:39:22 +0200
Subject: [PATCH 200/277] monitoring/commands: Move `AddCommentCommand' to
 `WithCommentCommand'

`AddCommentCommand' will be the command for adding both host and service comments.

refs #6593
---
 .../Command/Common/WithCommentCommand.php     | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php
new file mode 100644
index 000000000..c913e5bd3
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php
@@ -0,0 +1,71 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Common;
+
+/**
+ * Base class for commands adding comments
+ */
+abstract class WithCommentCommand extends ObjectCommand
+{
+    /**
+     * Author of the comment
+     *
+     * @var string
+     */
+    protected $author;
+
+    /**
+     * Comment
+     *
+     * @var string
+     */
+    protected $comment;
+
+    /**
+     * Set the author
+     *
+     * @param   string $author
+     *
+     * @return  $this
+     */
+    public function setAuthor($author)
+    {
+        $this->author = (string) $author;
+        return $this;
+    }
+
+    /**
+     * Get the author
+     *
+     * @return string
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Set the comment
+     *
+     * @param   string $comment
+     *
+     * @return  $this
+     */
+    public function setComment($comment)
+    {
+        $this->comment = (string) $comment;
+        return $this;
+    }
+
+    /**
+     * Get the comment
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+}

From 28a66c85412c38a3a83977312a533ca082847e75 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Sep 2014 16:40:09 +0200
Subject: [PATCH 201/277] monitoring/commands: Introduce `ObjectCommand' for
 commands that involve a Icinga object

refs #6593
---
 .../Command/Common/ObjectCommand.php          | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php
new file mode 100644
index 000000000..8727c237b
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php
@@ -0,0 +1,62 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Common;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
+
+/**
+ * Base class for commands that involve a monitored object, i.e. a host or service
+ */
+abstract class ObjectCommand extends IcingaCommand
+{
+    /**
+     * Type host
+     */
+    const TYPE_HOST = MonitoredObject::TYPE_HOST;
+
+    /**
+     * Type service
+     */
+    const TYPE_SERVICE = MonitoredObject::TYPE_SERVICE;
+
+    /**
+     * Allowed Icinga object types for the command
+     *
+     * @var string[]
+     */
+    protected $allowedObjects = array();
+
+    /**
+     * Involved object
+     *
+     * @var MonitoredObject
+     */
+    protected $object;
+
+    /**
+     * Set the involved object
+     *
+     * @param   MonitoredObject $object
+     *
+     * @return  $this
+     */
+    public function setObject(MonitoredObject $object)
+    {
+        $object->assertOneOf($this->allowedObjects);
+        $this->object = $object;
+        return $this;
+    }
+
+    /**
+     * Get the involved object
+     *
+     * @return MonitoredObject
+     */
+    public function getObject()
+    {
+        return $this->object;
+    }
+}

From 171b3667440dc21f68f5e9ee9c12be11805066c5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Sep 2014 16:41:41 +0200
Subject: [PATCH 202/277] monitoring/commands: Let `AddCommentCommand' be the
 command object for adding both host and service commands

refs #6593
---
 .../Command/Common/AddCommentCommand.php      | 103 ++++++------------
 1 file changed, 35 insertions(+), 68 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
index 67c6cc330..5d56011ae 100644
--- a/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
@@ -4,80 +4,47 @@
 
 namespace Icinga\Module\Monitoring\Command\Common;
 
-use Icinga\Module\Monitoring\Command\IcingaCommand;
-use Icinga\User;
-
 /**
- * Base class for commands adding comments
+ * Add a comment to a host or service
  */
-abstract class AddCommentCommand extends IcingaCommand
+class AddCommentCommand extends WithCommentCommand
 {
-    /**
-     * Author of the comment
-     *
-     * @var User
-     */
-    protected $author;
-
-    /**
-     * Comment
-     *
-     * @var string
-     */
-    protected $comment;
-
-    /**
-     * Set the author
-     *
-     * @param   User $author
-     *
-     * @return  $this
-     */
-    public function setAuthor(User $author)
-    {
-        $this->author = $author;
-        return $this;
-    }
-
-    /**
-     * Get the author
-     *
-     * @return User
-     */
-    public function getAuthor()
-    {
-        return $this->author;
-    }
-
-    /**
-     * Set the comment
-     *
-     * @param   string $comment
-     *
-     * @return  $this
-     */
-    public function setComment($comment)
-    {
-        $this->comment = (string) $comment;
-        return $this;
-    }
-
-    /**
-     * Get the comment
-     *
-     * @return string
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
     /**
      * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
+     * @see \Icinga\Module\Monitoring\Command\Common\ObjectCommand::$allowedObjects For the property documentation.
      */
-    public function getCommandString()
+    protected $allowedObjects = array(
+        self::TYPE_HOST,
+        self::TYPE_SERVICE
+    );
+
+    /**
+     * Whether the comment is persistent
+     *
+     * Persistent comments are not lost the next time the monitoring host restarts.
+     */
+    protected $persistent;
+
+    /**
+     * Set whether the comment is persistent
+     *
+     * @param   bool $persistent
+     *
+     * @return  $this
+     */
+    public function setPersistent($persistent = true)
     {
-        return sprintf('%s;%s', $this->author->getUsername(), $this->comment);
+        $this->persistent = $persistent;
+        return $this;
+    }
+
+    /**
+     * Is the comment persistent?
+     *
+     * @return bool
+     */
+    public function getPersistent()
+    {
+        return $this->persistent;
     }
 }

From 5757a6f34b3e295f567add51346c0a822df4c8f4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Sep 2014 09:23:48 +0200
Subject: [PATCH 203/277] monitoring: Fix typo in the `Downtime' data view

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

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 214e1afb5..217fb2cac 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -31,7 +31,7 @@ class Downtime extends DataView
             'downtime_host',
             'downtime_service',
             'downtime_host_state',
-            'downtiem_service_state'
+            'downtime_service_state'
         );
     }
 

From 1247fdcad488f27cb64d024894fccbec54ab1d9e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:10:20 +0200
Subject: [PATCH 204/277] monitoring/commands: Move toggle instance feature
 commands into a single command

refs #6593
---
 .../Instance/ToggleActiveHostChecks.php       |  22 ----
 .../Instance/ToggleActiveServiceChecks.php    |  22 ----
 .../Command/Instance/ToggleEventHandlers.php  |  22 ----
 .../Command/Instance/ToggleFlapDetection.php  |  22 ----
 .../Instance/ToggleInstanceFeatureCommand.php | 123 ++++++++++++++++++
 .../Command/Instance/ToggleNotifications.php  |  54 --------
 .../ToggleObsessingOverHostChecks.php         |  22 ----
 .../ToggleObsessingOverServiceChecks.php      |  22 ----
 .../Instance/TogglePassiveHostChecks.php      |  22 ----
 .../Instance/TogglePassiveServiceChecks.php   |  22 ----
 .../Instance/TogglePerformanceData.php        |  22 ----
 11 files changed, 123 insertions(+), 252 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php
deleted file mode 100644
index 99ea2992f..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveHostChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable active host checks on an Icinga instance
- */
-class ToggleActiveHostChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'START_EXECUTING_HOST_CHECKS' : 'STOP_EXECUTING_HOST_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php
deleted file mode 100644
index 3ad2afe25..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleActiveServiceChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable active service checks on an Icinga instance
- */
-class ToggleActiveServiceChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'START_EXECUTING_SVC_CHECKS' : 'STOP_EXECUTING_SVC_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php
deleted file mode 100644
index e2e6cf3a2..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleEventHandlers.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable host and service event handlers on an Icinga instance
- */
-class ToggleEventHandlers extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'ENABLE_EVENT_HANDLERS' : 'DISABLE_EVENT_HANDLERS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
deleted file mode 100644
index 2951d448d..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleFlapDetection.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable host and service flap detection on an Icinga instance
- */
-class ToggleFlapDetection extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'ENABLE_FLAP_DETECTION' : 'DISABLE_FLAP_DETECTION';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
new file mode 100644
index 000000000..01b26a009
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
@@ -0,0 +1,123 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
+/**
+ * Enable or disable a feature of an Icinga instance
+ */
+class ToggleInstanceFeatureCommand extends IcingaCommand
+{
+    /**
+     * Feature for enabling or disabling active host checks on an Icinga instance
+     */
+    const FEATURE_ACTIVE_HOST_CHECKS = 'active_host_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling active service checks on an Icinga instance
+     */
+    const FEATURE_ACTIVE_SERVICE_CHECKS = 'active_service_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling host and service event handlers on an Icinga instance
+     */
+    const FEATURE_EVENT_HANDLERS = 'event_handlers_enabled';
+
+    /**
+     * Feature for enabling or disabling host and service flap detection on an Icinga instance
+     */
+    const FEATURE_FLAP_DETECTION = 'flap_detection_enabled';
+
+    /**
+     * Feature for enabling or disabling host and service notifications on an Icinga instance
+     */
+    const FEATURE_NOTIFICATIONS = 'notifications_enabled';
+
+    /**
+     * Feature for enabling or disabling processing of host checks via the OCHP command on an Icinga instance
+     */
+    const FEATURE_HOST_OBSESSING = 'obsess_over_hosts';
+
+    /**
+     * Feature for enabling or disabling processing of service checks via the OCHP command on an Icinga instance
+     */
+    const FEATURE_SERVICE_OBSESSING = 'obsess_over_services';
+
+    /**
+     * Feature for enabling or disabling passive host checks on an Icinga instance
+     */
+    const FEATURE_PASSIVE_HOST_CHECKS = 'passive_host_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling passive service checks on an Icinga instance
+     */
+    const FEATURE_PASSIVE_SERVICE_CHECKS = 'passive_service_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling the processing of host and service performance data on an Icinga instance
+     */
+    const FEATURE_PERFORMANCE_DATA = 'process_performance_data';
+
+    /**
+     * Feature that is to be enabled or disabled
+     *
+     * @var string
+     */
+    protected $feature;
+
+    /**
+     * Whether the feature should be enabled or disabled
+     *
+     * @var bool
+     */
+    protected $enabled;
+
+    /**
+     * Set the feature that is to be enabled or disabled
+     *
+     * @param   string $feature
+     *
+     * @return  $this
+     */
+    public function setFeature($feature)
+    {
+        $this->feature = (string) $feature;
+        return $this;
+    }
+
+    /**
+     * Get the feature that is to be enabled or disabled
+     *
+     * @return string
+     */
+    public function getFeature()
+    {
+        return $this->feature;
+    }
+
+    /**
+     * Set whether the feature should be enabled or disabled
+     *
+     * @param   bool $enabled
+     *
+     * @return  $this
+     */
+    public function setEnabled($enabled = true)
+    {
+        $this->enabled = (bool) $enabled;
+        return $this;
+    }
+
+    /**
+     * Get whether the feature should be enabled or disabled
+     *
+     * @return bool
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php
deleted file mode 100644
index 6b1d5e362..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleNotifications.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable host and service notifications on an Icinga instance
- */
-class ToggleNotifications extends ToggleFeature
-{
-    /**
-     * The time when notifications should be re-enabled after disabling
-     *
-     * @var int|null Unix timestamp
-     */
-    protected $expireTime;
-
-    /**
-     * Disable notifications with optional expire time
-     *
-     * @param   int|null $expireTime The Unix timestamp when notifications should be re-enabled after disabling
-     *
-     * @return  $this
-     */
-    public function disable($expireTime = null)
-    {
-        $this->expireTime = $expireTime !== null ? (int) $expireTime : null;
-        return parent::disable();
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        if ($this->enable === true) {
-            return 'ENABLE_NOTIFICATIONS';
-        }
-        if ($this->expireTime !== null) {
-            return sprintf(
-                '%s;%u;%u',
-                'DISABLE_NOTIFICATIONS_EXPIRE_TIME',
-                time(),  // Schedule time. According to the Icinga documentation schedule time has no effect currently
-                         // and should be set to the current timestamp.
-                $this->expireTime
-            );
-        }
-        return 'DISABLE_NOTIFICATIONS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php
deleted file mode 100644
index 0584c5e9c..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverHostChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable processing of host checks via the OCHP command on an Icinga instance
- */
-class ToggleObsessingOverHostChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'START_OBSESSING_OVER_HOST_CHECKS' : 'STOP_OBSESSING_OVER_HOST_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php
deleted file mode 100644
index 86653a4ba..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleObsessingOverServiceChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable processing of service checks via the OCHP command on an Icinga instance
- */
-class ToggleObsessingOverServiceChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'START_OBSESSING_OVER_SVC_CHECKS' : 'STOP_OBSESSING_OVER_SVC_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php
deleted file mode 100644
index 7ce45d7f0..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveHostChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable passive host checks on an Icinga instance
- */
-class TogglePassiveHostChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'ENABLE_PASSIVE_HOST_CHECKS' : 'DISABLE_PASSIVE_HOST_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php
deleted file mode 100644
index 391b372c6..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/TogglePassiveServiceChecks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable passive service checks on an Icinga instance
- */
-class TogglePassiveServiceChecks extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'ENABLE_PASSIVE_SVC_CHECKS' : 'DISABLE_PASSIVE_SVC_CHECKS';
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php b/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php
deleted file mode 100644
index 16091ca11..000000000
--- a/modules/monitoring/library/Monitoring/Command/Instance/TogglePerformanceData.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Common\ToggleFeature;
-
-/**
- * Enable/disable the processing of host and service performance data on an Icinga instance
- */
-class TogglePerformanceData extends ToggleFeature
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return $this->enable === true ? 'ENABLE_PERFORMANCE_DATA' : 'DISABLE_PERFORMANCE_DATA';
-    }
-}

From c40ac6f9dc9f2223fc6bb4eeab140a1165ed52b7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:11:32 +0200
Subject: [PATCH 205/277] monitoring/commands: Add
 `DisableNotificationsExpireCommand'

refs #6593
---
 .../DisableNotificationsExpireCommand.php     | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
new file mode 100644
index 000000000..309cb9e2f
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
@@ -0,0 +1,43 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
+/**
+ * Disable host and service notifications w/ expire time on an Icinga instance
+ */
+class DisableNotificationsExpireCommand extends IcingaCommand
+{
+    /**
+     * The time when notifications should be re-enabled after disabling
+     *
+     * @var int|null Unix timestamp
+     */
+    protected $expireTime;
+
+    /**
+     * Set time when notifications should be re-enabled after disabling
+     *
+     * @param   $expireTime int Unix timestamp
+     *
+     * @return  $this
+     */
+    public function setExpireTime($expireTime)
+    {
+        $this->expireTime = (int) $expireTime;
+        return $this;
+    }
+
+    /**
+     * Get the date and time when notifications should be re-enabled after disabling
+     *
+     * @return int|null Unix timestamp
+     */
+    public function getExpireTime()
+    {
+        return $this->expireTime;
+    }
+}

From 22771e6f6f5282d906ee41ada23803596323f070 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:13:57 +0200
Subject: [PATCH 206/277] monitoring/commands: Rename
 `DisableNotificationsCommandForm' to `DisableNotificationsExpireCommandForm'

The associated command also has 'Expired' in its name.

refs #6593
---
 ...DisableNotificationsExpireCommandForm.php} | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)
 rename modules/monitoring/application/forms/Command/Instance/{DisableNotificationsCommandForm.php => DisableNotificationsExpireCommandForm.php} (66%)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
similarity index 66%
rename from modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
rename to modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 43263cb84..08b1f1813 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Form\Command\Instance;
 
 use DateTime;
 use DateInterval;
-use Icinga\Module\Monitoring\Command\Instance\ToggleNotifications;
+use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand;
 use Icinga\Module\Monitoring\Form\Command\CommandForm;
 use Icinga\Web\Form\Element\DateTimePicker;
 use Icinga\Web\Notification;
@@ -15,7 +15,7 @@ use Icinga\Web\Request;
 /**
  * Form for disabling host and service notifications w/ an optional expire date and time on an Icinga instance
  */
-class DisableNotificationsCommandForm extends CommandForm
+class DisableNotificationsExpireCommandForm extends CommandForm
 {
     /**
      * (non-PHPDoc)
@@ -42,43 +42,32 @@ class DisableNotificationsCommandForm extends CommandForm
                 )
             )
         );
-        $expire = new DateTime();
-        $expire->add(new DateInterval('PT1H'));
+        $expireTime = new DateTime();
+        $expireTime->add(new DateInterval('PT1H'));
         $this->addElement(
             new DateTimePicker(
-                'expire',
+                'expire_time',
                 array(
                     'required'      => true,
-                    'label'         => t('Expire Time'),
-                    'description'   => mt('monitoring', 'Set the start date and time for the service downtime.'),
-                    'value'         => $expire
+                    'label'         => mt('monitoring', 'Expire Time'),
+                    'description'   => mt('monitoring', 'Set the expire time.'),
+                    'value'         => $expireTime
                 )
             )
         );
         return $this;
     }
 
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleNotifications
-     */
-    public function getCommand()
-    {
-        return new ToggleNotifications();
-    }
-
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
      */
     public function onSuccess(Request $request)
     {
-        $toggleNotifications = $this->getCommand();
-        $toggleNotifications
-            ->disable()
-            ->setExpire($this->getElement('expire')->getValue());
-        $this->getTransport($request)->send($toggleNotifications);
+        $disableNotifications = new DisableNotificationsExpireCommand();
+        $disableNotifications
+            ->setExpireTime($this->getElement('expire_time')->getValue());
+        $this->getTransport($request)->send($disableNotifications);
         Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
         return true;
     }

From 92571599dfc8cc151fabce4e2266182129c946fe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:16:13 +0200
Subject: [PATCH 207/277] monitoring/commands: Move toggle instance feature
 command forms into a single form

refs #6593
---
 .../ToggleActiveHostChecksCommandForm.php     |  33 ----
 .../ToggleActiveServiceChecksCommandForm.php  |  33 ----
 .../ToggleEventHandlersCommandForm.php        |  33 ----
 .../Instance/ToggleFeatureCommandForm.php     |  90 ---------
 .../ToggleFlapDetectionCommandForm.php        |  33 ----
 .../ToggleInstanceFeaturesCommandForm.php     | 179 ++++++++++++++++++
 .../ToggleNotificationsCommandForm.php        |  33 ----
 ...ggleObsessingOverHostChecksCommandForm.php |  33 ----
 ...eObsessingOverServiceChecksCommandForm.php |  33 ----
 .../TogglePassiveHostChecksCommandForm.php    |  33 ----
 .../TogglePassiveServiceChecksCommandForm.php |  33 ----
 .../TogglePerformanceDataCommandForm.php      |  33 ----
 12 files changed, 179 insertions(+), 420 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php
deleted file mode 100644
index 0ee0fe2ee..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleActiveHostChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleActiveHostChecks;
-
-/**
- * Form for enabling/disabling active host checks on an Icinga instance
- */
-class ToggleActiveHostChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Active Host Checks'));
-        $this->setFeature('active_host_checks_enabled', mt('monitoring', 'Active Host Checks Being Executed'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleActiveHostChecks
-     */
-    public function getCommand()
-    {
-        return new ToggleActiveHostChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php
deleted file mode 100644
index 8d412392a..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleActiveServiceChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleActiveServiceChecks;
-
-/**
- * Form for enabling/disabling active service checks on an Icinga instance
- */
-class ToggleActiveServiceChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Active Service Checks'));
-        $this->setFeature('active_service_checks_enabled', mt('monitoring', 'Active Service Checks Being Executed'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleActiveServiceChecks
-     */
-    public function getCommand()
-    {
-        return new ToggleActiveServiceChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php
deleted file mode 100644
index a90fb529a..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleEventHandlersCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleEventHandlers;
-
-/**
- * Form for enabling/disabling host and service event handlers on an Icinga instance
- */
-class ToggleEventHandlersCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Event Handlers'));
-        $this->setFeature('event_handlers_enabled', mt('monitoring', 'Event Handlers Enabled'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleEventHandlers
-     */
-    public function getCommand()
-    {
-        return new ToggleEventHandlers();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
deleted file mode 100644
index ed48069e8..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleFeatureCommandForm.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Form\Command\CommandForm;
-use Icinga\Web\Notification;
-use Icinga\Web\Request;
-
-/**
- * Base class for forms enabling/disabling features of an Icinga instance
- */
-abstract class ToggleFeatureCommandForm extends CommandForm
-{
-    /**
-     * @var string
-     */
-    protected $feature;
-
-    /**
-     * @var string
-     */
-    protected $label;
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return \Icinga\Module\Monitoring\Command\ToggleFeature
-     */
-    abstract public function getCommand();
-
-    /**
-     * Set the feature the form enables or disables
-     *
-     * @param   string $feature
-     * @param   string $label
-     *
-     * @return  $this
-     */
-    public function setFeature($feature, $label)
-    {
-        $this->feature = $feature;
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
-     */
-    public function createElements(array $formData = array())
-    {
-        if (isset($formData[$this->feature])) {
-            $enabled = (bool) $formData[$this->feature];
-        } else {
-            $enabled = (bool) $this->backend
-                ->select()
-                ->from(
-                    'programstatus',
-                    array($this->feature)
-                )
-                ->getQuery()
-                ->fetchRow();
-        }
-        $this->addElement(
-            'checkbox',
-            $this->feature,
-            array(
-                'label'         => $this->label,
-                'autosubmit'    => $this->inline,
-                'value'         => $enabled
-            )
-        );
-        return $this;
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
-     */
-    public function onSuccess(Request $request)
-    {
-        $toggleFeature = $this->getCommand();
-        (bool) $request->getParam($this->feature) === true ? $toggleFeature->enable() : $toggleFeature->disable();
-        $this->getTransport($request)->send($toggleFeature);
-        Notification::success(mt('monitoring', 'Command sent'));
-        return true;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php
deleted file mode 100644
index a436ec2ff..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleFlapDetectionCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleFlapDetection;
-
-/**
- * Form for enabling/disabling host and service flap detection on an Icinga instance
- */
-class ToggleFlapDetectionCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Flap Detection'));
-        $this->setFeature('flap_detection_enabled', mt('monitoring', 'Flap Detection Enabled'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleFlapDetection
-     */
-    public function getCommand()
-    {
-        return new ToggleFlapDetection();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
new file mode 100644
index 000000000..db584bc1a
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -0,0 +1,179 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Instance;
+
+use Icinga\Module\Monitoring\Command\Instance\ToggleInstanceFeatureCommand;
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for enabling or disabling features of Icinga objects, i.e. hosts or services
+ */
+class ToggleInstanceFeaturesCommandForm extends CommandForm
+{
+    /**
+     * Instance status
+     *
+     * @var object
+     */
+    protected $status;
+
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setAttrib('class', 'inline');
+    }
+
+    /**
+     * Set the instance status
+     *
+     * @param   object $status
+     *
+     * @return  $this
+     */
+    public function setStatus($status)
+    {
+        $this->status = (object) $status;
+        return $this;
+    }
+
+    /**
+     * Get the instance status
+     *
+     * @return object
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
+                array(
+                    'label'         =>  mt('monitoring', 'Active Host Checks Being Executed'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
+                array(
+                    'label'         =>  mt('monitoring', 'Active Service Checks Being Executed'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
+                array(
+                    'label'         => mt('monitoring', 'Event Handlers Enabled'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
+                array(
+                    'label'         => mt('monitoring', 'Flap Detection Enabled'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
+                array(
+                    'label'         => mt('monitoring', 'Notifications Enabled'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
+                array(
+                    'label'         => mt('monitoring', 'Obsessing Over Hosts'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
+                array(
+                    'label'         => mt('monitoring', 'Obsessing Over Services'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
+                array(
+                    'label'         =>  mt('monitoring', 'Passive Host Checks Being Accepted'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
+                array(
+                    'label'         =>  mt('monitoring', 'Passive Service Checks Being Accepted'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
+                array(
+                    'label'         =>  mt('monitoring', 'Performance Data Being Processed'),
+                    'autosubmit'    => true
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * Load feature status
+     *
+     * @param   object $instanceStatus
+     *
+     * @return  $this
+     */
+    public function load($instanceStatus)
+    {
+        $this->create();
+        foreach ($this->getValues() as $feature => $enabled) {
+            $this->getElement($feature)->setChecked($instanceStatus->{$feature});
+        }
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->getValues() as $feature => $enabled) {
+            $toggleFeature = new ToggleInstanceFeatureCommand();
+            $toggleFeature
+                ->setFeature($feature)
+                ->setEnabled($enabled);
+            $this->getTransport($request)->send($toggleFeature);
+        }
+        Notification::success(mt('monitoring', 'Toggling feature..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php
deleted file mode 100644
index 661d57dc5..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleNotificationsCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleNotifications;
-
-/**
- * Form for enabling/disabling host and service notifications on an Icinga instance
- */
-class ToggleNotificationsCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Notifications'));
-        $this->setFeature('notifications_enabled', mt('monitoring', 'Notifications Enabled'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleNotifications
-     */
-    public function getCommand()
-    {
-        return new ToggleNotifications();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php
deleted file mode 100644
index 3e230e639..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverHostChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleObsessingOverHostChecks;
-
-/**
- * Form for enabling/disabling processing of host checks via the OCHP command on an Icinga instance
- */
-class ToggleObsessingOverHostChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Obsessing Over Host Checks'));
-        $this->setFeature('obsess_over_hosts', mt('monitoring', 'Obsessing Over Hosts'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleObsessingOverHostChecks
-     */
-    public function getCommand()
-    {
-        return new ToggleObsessingOverHostChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php
deleted file mode 100644
index 012ccb73e..000000000
--- a/modules/monitoring/application/forms/Command/Instance/ToggleObsessingOverServiceChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\ToggleObsessingOverServiceChecks;
-
-/**
- * Form for enabling/disabling processing of service checks via the OCHP command on an Icinga instance
- */
-class ToggleObsessingOverServiceChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Obsessing Over Service Checks'));
-        $this->setFeature('obsess_over_services', mt('monitoring', 'Obsessing Over Services'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ToggleObsessingOverServiceChecks
-     */
-    public function getCommand()
-    {
-        return new ToggleObsessingOverServiceChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php
deleted file mode 100644
index 0c9b657b9..000000000
--- a/modules/monitoring/application/forms/Command/Instance/TogglePassiveHostChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\TogglePassiveHostChecks;
-
-/**
- * Form for enabling/disabling passive host checks on an Icinga instance
- */
-class TogglePassiveHostChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Passive Host Checks'));
-        $this->setFeature('passive_host_checks_enabled', mt('monitoring', 'Passive Host Checks Being Accepted'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return TogglePassiveHostChecks
-     */
-    public function getCommand()
-    {
-        return new TogglePassiveHostChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php
deleted file mode 100644
index 09db8e625..000000000
--- a/modules/monitoring/application/forms/Command/Instance/TogglePassiveServiceChecksCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\TogglePassiveServiceChecks;
-
-/**
- * Form for enabling/disabling passive service checks on an Icinga instance
- */
-class TogglePassiveServiceChecksCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Passive Service Checks'));
-        $this->setFeature('passive_service_checks_enabled', mt('monitoring', 'Passive Service Checks Being Accepted'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return TogglePassiveServiceChecks
-     */
-    public function getCommand()
-    {
-        return new TogglePassiveServiceChecks();
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php b/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php
deleted file mode 100644
index b151cbb1b..000000000
--- a/modules/monitoring/application/forms/Command/Instance/TogglePerformanceDataCommandForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
-
-use Icinga\Module\Monitoring\Command\Instance\TogglePerformanceData;
-
-/**
- * Form for enabling/disabling the processing of host and service performance data on an Icinga instance
- */
-class TogglePerformanceDataCommandForm extends ToggleFeatureCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Toggle Performance Data'));
-        $this->setFeature('process_performance_data', mt('monitoring', 'Performance Data Being Processed'));
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return TogglePerformanceData
-     */
-    public function getCommand()
-    {
-        return new TogglePerformanceData();
-    }
-}

From 3845301dfb70fb738e0a574b11caa4ae7c519fdb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:18:07 +0200
Subject: [PATCH 208/277] monitoring/commands: Add object command classes

refs #6593
---
 .../Object/AcknowledgeProblemCommand.php      | 145 +++++++++++++
 .../Command/Object/AddCommentCommand.php      |  50 +++++
 .../Command/Object/DeleteCommentCommand.php   |  50 +++++
 .../Command/Object/DeleteDowntimeCommand.php  |  50 +++++
 .../Command/Object/ObjectCommand.php          |  62 ++++++
 .../Object/ProcessCheckResultCommand.php      | 177 ++++++++++++++++
 .../Command/Object/PropagateHostDowntime.php  |  49 +++++
 .../Object/RemoveAcknowledgementCommand.php   |  20 ++
 .../Object/ScheduleHostCheckCommand.php       |  49 +++++
 .../Object/ScheduleHostDowntimeCommand.php    |  49 +++++
 .../Object/ScheduleServiceCheckCommand.php    | 102 ++++++++++
 .../Object/ScheduleServiceDowntimeCommand.php | 191 ++++++++++++++++++
 .../Object/ToggleObjectFeatureCommand.php     | 114 +++++++++++
 .../Command/Object/WithCommentCommand.php     |  71 +++++++
 14 files changed, 1179 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php

diff --git a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
new file mode 100644
index 000000000..4dff07c4a
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
@@ -0,0 +1,145 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Acknowledge a host or service problem
+ */
+class AcknowledgeProblemCommand 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 the acknowledgement is sticky
+     *
+     * Sticky acknowledgements remain until the host or service recovers. Non-sticky acknowledgements will be
+     * automatically removed when the host or service state changes.
+     *
+     * @var bool
+     */
+    protected $sticky = false;
+
+    /**
+     * Whether to send a notification about the acknowledgement
+
+     * @var bool
+     */
+    protected $notify = false;
+
+    /**
+     * Whether the comment associated with the acknowledgement is persistent
+     *
+     * Persistent comments are not lost the next time the monitoring host restarts.
+     *
+     * @var bool
+     */
+    protected $persistent = false;
+
+    /**
+     * Optional time when the acknowledgement should expire
+     *
+     * @var int|null
+     */
+    protected $expireTime;
+
+    /**
+     * Set whether the acknowledgement is sticky
+     *
+     * @param   bool $sticky
+     *
+     * @return  $this
+     */
+    public function setSticky($sticky = true)
+    {
+        $this->sticky = (bool) $sticky;
+        return $this;
+    }
+
+    /**
+     * Is the acknowledgement sticky?
+     *
+     * @return bool
+     */
+    public function getSticky()
+    {
+        return $this->sticky;
+    }
+
+    /**
+     * Set whether to send a notification about the acknowledgement
+     *
+     * @param   bool $notify
+     *
+     * @return  $this
+     */
+    public function setNotify($notify = true)
+    {
+        $this->notify = (bool) $notify;
+        return $this;
+    }
+
+    /**
+     * Get whether to send a notification about the acknowledgement
+     *
+     * @return bool
+     */
+    public function getNotify()
+    {
+        return $this->notify;
+    }
+
+    /**
+     * Set whether the comment associated with the acknowledgement is persistent
+     *
+     * @param   bool $persistent
+     *
+     * @return  $this
+     */
+    public function setPersistent($persistent = true)
+    {
+        $this->persistent = (bool) $persistent;
+        return $this;
+    }
+
+    /**
+     * Is the comment associated with the acknowledgement is persistent?
+     *
+     * @return bool
+     */
+    public function getPersistent()
+    {
+        return $this->persistent;
+    }
+
+    /**
+     * Set the time when the acknowledgement should expire
+     *
+     * @param   int $expireTime
+     *
+     * @return  $this
+     */
+    public function setExpireTime($expireTime)
+    {
+        $this->expireTime = (int) $expireTime;
+        return $this;
+    }
+
+    /**
+     * Get the time when the acknowledgement should expire
+     *
+     * @return int|null
+     */
+    public function getExpireTime()
+    {
+        return $this->expireTime;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
new file mode 100644
index 000000000..a7540f4f8
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
@@ -0,0 +1,50 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Add a comment to a host or service
+ */
+class AddCommentCommand 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 the comment is persistent
+     *
+     * Persistent comments are not lost the next time the monitoring host restarts.
+     */
+    protected $persistent;
+
+    /**
+     * Set whether the comment is persistent
+     *
+     * @param   bool $persistent
+     *
+     * @return  $this
+     */
+    public function setPersistent($persistent = true)
+    {
+        $this->persistent = $persistent;
+        return $this;
+    }
+
+    /**
+     * Is the comment persistent?
+     *
+     * @return bool
+     */
+    public function getPersistent()
+    {
+        return $this->persistent;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
new file mode 100644
index 000000000..850566ff9
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -0,0 +1,50 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Delete a host or service comment
+ */
+class DeleteCommentCommand extends ObjectCommand
+{
+    /**
+     * (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
+     *
+     * @var int
+     */
+    protected $commentId;
+
+    /**
+     * Set the ID of the comment that is to be deleted
+     *
+     * @param   int $commentId
+     *
+     * @return  $this
+     */
+    public function setCommentId($commentId)
+    {
+        $this->commentId = (int) $commentId;
+        return $this;
+    }
+
+    /**
+     * Get the ID of the comment that is to be deleted
+     *
+     * @return int
+     */
+    public function getCommentId()
+    {
+        return $this->commentId;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
new file mode 100644
index 000000000..67e271dbb
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -0,0 +1,50 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Delete a host or service downtime
+ */
+class DeleteDowntimeCommand extends ObjectCommand
+{
+    /**
+     * (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 downtime that is to be deleted
+     *
+     * @var int
+     */
+    protected $downtimeId;
+
+    /**
+     * Set the ID of the downtime that is to be deleted
+     *
+     * @param   int $downtimeId
+     *
+     * @return  $this
+     */
+    public function setDowntimeId($downtimeId)
+    {
+        $this->downtimeId = (int) $downtimeId;
+        return $this;
+    }
+
+    /**
+     * Get the ID of the downtime that is to be deleted
+     *
+     * @return int
+     */
+    public function getDowntimeId()
+    {
+        return $this->downtimeId;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
new file mode 100644
index 000000000..1c8910066
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -0,0 +1,62 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
+
+/**
+ * Base class for commands that involve a monitored object, i.e. a host or service
+ */
+abstract class ObjectCommand extends IcingaCommand
+{
+    /**
+     * Type host
+     */
+    const TYPE_HOST = MonitoredObject::TYPE_HOST;
+
+    /**
+     * Type service
+     */
+    const TYPE_SERVICE = MonitoredObject::TYPE_SERVICE;
+
+    /**
+     * Allowed Icinga object types for the command
+     *
+     * @var string[]
+     */
+    protected $allowedObjects = array();
+
+    /**
+     * Involved object
+     *
+     * @var MonitoredObject
+     */
+    protected $object;
+
+    /**
+     * Set the involved object
+     *
+     * @param   MonitoredObject $object
+     *
+     * @return  $this
+     */
+    public function setObject(MonitoredObject $object)
+    {
+        $object->assertOneOf($this->allowedObjects);
+        $this->object = $object;
+        return $this;
+    }
+
+    /**
+     * Get the involved object
+     *
+     * @return MonitoredObject
+     */
+    public function getObject()
+    {
+        return $this->object;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
new file mode 100644
index 000000000..9866aeb52
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
@@ -0,0 +1,177 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+use InvalidArgumentException;
+use LogicException;
+
+/**
+ * Submit a passive check result for a host or service
+ */
+class ProcessCheckResultCommand extends ObjectCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST,
+        self::TYPE_SERVICE
+    );
+
+    /**
+     * Host up
+     */
+    const HOST_UP = 0;
+
+    /**
+     * Host down
+     */
+    const HOST_DOWN = 1;
+
+    /**
+     * Host unreachable
+     */
+    const HOST_UNREACHABLE = 2;
+
+    /**
+     * Service ok
+     */
+    const SERVICE_OK = 0;
+
+    /**
+     * Service warning
+     */
+    const SERVICE_WARNING = 1;
+
+    /**
+     * Service critical
+     */
+    const SERVICE_CRITICAL = 2;
+
+    /**
+     * Service unknown
+     */
+    const SERVICE_UNKNOWN = 3;
+
+    /**
+     * Possible status codes for passive host and service checks
+     *
+     * @var array
+     */
+    public static $statusCodes = array(
+        self::TYPE_HOST => array(
+            self::HOST_UP, self::HOST_DOWN, self::HOST_UNREACHABLE
+        ),
+        self::TYPE_SERVICE => array(
+            self::SERVICE_OK, self::SERVICE_WARNING, self::SERVICE_CRITICAL, self::SERVICE_UNKNOWN
+        )
+    );
+
+    /**
+     * Status code of the host or service check result
+     *
+     * @var int
+     */
+    protected $status;
+
+    /**
+     * Text output of the host or service check result
+     *
+     * @var string
+     */
+    protected $output;
+
+    /**
+     * Optional performance data of the host or service check result
+     *
+     * @var string
+     */
+    protected $performanceData;
+
+
+    /**
+     * Set the status code of the host or service check result
+     *
+     * @param   int $status
+     *
+     * @return  $this
+     *
+     * @throws  LogicException              If the object is null
+     * @throws  InvalidArgumentException    If status is not one of the valid status codes for the object's type
+     */
+    public function setStatus($status)
+    {
+        if ($this->object === null) {
+            throw new LogicException('You\'re required to call setObject() before calling setStatus()');
+        }
+        $status = (int) $status;
+        if (! in_array($status, self::$statusCodes[$this->object->getType()])) {
+            throw new InvalidArgumentException(sprintf(
+                'The status code %u you provided is not one of the valid status codes for type %s',
+                $status,
+                $this->object->getType()
+            ));
+        }
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * Get the status code of the host or service check result
+     *
+     * @return int
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * Set the text output of the host or service check result
+     *
+     * @param   string $output
+     *
+     * @return  $this
+     */
+    public function setOutput($output)
+    {
+        $this->output = (string) $output;
+        return $this;
+    }
+
+    /**
+     * Get the text output of the host or service check result
+     *
+     * @return string
+     */
+    public function getOutput()
+    {
+        return $this->output;
+    }
+
+    /**
+     * Set the performance data of the host or service check result
+     *
+     * @param   string $performanceData
+     *
+     * @return  $this
+     */
+    public function setPerformanceData($performanceData)
+    {
+        $this->performanceData = (string) $performanceData;
+        return $this;
+    }
+
+    /**
+     * Get the performance data of the host or service check result
+     *
+     * @return string
+     */
+    public function getPerformanceData()
+    {
+        return $this->performanceData;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php
new file mode 100644
index 000000000..89591c8fc
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php
@@ -0,0 +1,49 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Schedule and propagate host downtime
+ */
+class PropagateHostDowntimeCommand extends ScheduleServiceDowntimeCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST
+    );
+
+    /**
+     * Whether the downtime for child hosts are all set to be triggered by this' host downtime
+     *
+     * @var bool
+     */
+    protected $triggered = false;
+
+    /**
+     * Set whether the downtime for child hosts are all set to be triggered by this' host downtime
+     *
+     * @param   bool $triggered
+     *
+     * @return  $this
+     */
+    public function setTriggered($triggered = true)
+    {
+        $this->triggered = (bool) $triggered;
+        return $this;
+    }
+
+    /**
+     * Get whether the downtime for child hosts are all set to be triggered by this' host downtime
+     *
+     * @return bool
+     */
+    public function getTriggered()
+    {
+        return $this->triggered;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
new file mode 100644
index 000000000..6f9f99432
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
@@ -0,0 +1,20 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Remove a problem acknowledgement from a host or service
+ */
+class RemoveAcknowledgementCommand extends ObjectCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST,
+        self::TYPE_SERVICE
+    );
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
new file mode 100644
index 000000000..ead8f7a30
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
@@ -0,0 +1,49 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Schedule a host check
+ */
+class ScheduleHostCheckCommand extends ScheduleServiceCheckCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST
+    );
+
+    /**
+     * Whether to schedule a check of all services associated with a particular host
+     *
+     * @var bool
+     */
+    protected $ofAllServices = false;
+
+    /**
+     * Set whether to schedule a check of all services associated with a particular host
+     *
+     * @param   bool $ofAllServices
+     *
+     * @return  $this
+     */
+    public function setOfAllServices($ofAllServices = true)
+    {
+        $this->ofAllServices = (bool) $ofAllServices;
+        return $this;
+    }
+
+    /**
+     * Get whether to schedule a check of all services associated with a particular host
+     *
+     * @return bool
+     */
+    public function getOfAllServices()
+    {
+        return $this->ofAllServices;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
new file mode 100644
index 000000000..ea7e31dc6
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
@@ -0,0 +1,49 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Schedule a host downtime
+ */
+class ScheduleHostDowntimeCommand extends ScheduleServiceDowntimeCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST
+    );
+
+    /**
+     * Whether to schedule a downtime for all services associated with a particular host
+     *
+     * @var bool
+     */
+    protected $forAllServices = false;
+
+    /**
+     * Set whether to schedule a downtime for all services associated with a particular host
+     *
+     * @param   bool $forAllServices
+     *
+     * @return  $this
+     */
+    public function setForAllServices($forAllServices = true)
+    {
+        $this->forAllServices = (bool) $forAllServices;
+        return $this;
+    }
+
+    /**
+     * Get whether to schedule a downtime for all services associated with a particular host
+     *
+     * @return bool
+     */
+    public function getForAllServices()
+    {
+        return $this->forAllServices;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
new file mode 100644
index 000000000..9bf719a25
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -0,0 +1,102 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Schedule a service check
+ */
+class ScheduleServiceCheckCommand extends ObjectCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_SERVICE
+    );
+
+    /**
+     * Time when the next check of a host or service is to be scheduled
+     *
+     * If active checks are disabled on a host- or service-specific or program-wide basis or the host or service is
+     * already scheduled to be checked at an earlier time, etc. The check may not actually be scheduled at the time
+     * specified. This behaviour can be overridden by setting `ScheduledCheck::$forced' to true.
+     *
+     * @var int Unix timestamp
+     */
+    protected $checkTime;
+
+    /**
+     * Whether the check is forced
+     *
+     * Forced checks are performed regardless of what time it is (e.g. time period restrictions are ignored) and whether
+     * or not active checks are enabled on a host- or service-specific or program-wide basis.
+     *
+     * @var bool
+     */
+    protected $forced = false;
+
+    /**
+     * Whether to schedule a check of all services associated with a particular host
+     *
+     * @var bool
+     */
+    protected $ofAllServices = false;
+
+    /**
+     * Set the time when the next check of a host or service is to be scheduled
+     *
+     * @param   int $checkTime Unix timestamp
+     *
+     * @return  $this
+     */
+    public function setCheckTime($checkTime)
+    {
+        $this->checkTime = (int) $checkTime;
+        return $this;
+    }
+
+    /**
+     * Get the time when the next check of a host or service is to be scheduled
+     *
+     * @return int Unix timestamp
+     */
+    public function getCheckTime()
+    {
+        return $this->checkTime;
+    }
+
+    /**
+     * Set whether the check is forced
+     *
+     * @param   bool $forced
+     *
+     * @return  $this
+     */
+    public function setForced($forced = true)
+    {
+        $this->forced = (bool) $forced;
+        return $this;
+    }
+
+    /**
+     * Is the check forced?
+     *
+     * @return bool
+     */
+    public function getForced()
+    {
+        return $this->forced;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\IcingaCommand::getName() For the method documentation.
+     */
+    public function getName()
+    {
+        return 'ScheduleCheck';
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
new file mode 100644
index 000000000..24be3512b
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
@@ -0,0 +1,191 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Schedule a service downtime
+ */
+class ScheduleServiceDowntimeCommand extends AddCommentCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_SERVICE
+    );
+
+    /**
+     * Downtime starts at the exact time specified
+     *
+     * If `Downtime::$fixed' is set to false, the time between `Downtime::$start' and `Downtime::$end' at which a
+     * host or service transitions to a problem state determines the time at which the downtime actually starts.
+     * The downtime will then last for `Downtime::$duration' seconds.
+     *
+     * @var int Unix timestamp
+     */
+    protected $start;
+
+    /**
+     * Downtime ends at the exact time specified
+     *
+     * If `Downtime::$fixed' is set to false, the time between `Downtime::$start' and `Downtime::$end' at which a
+     * host or service transitions to a problem state determines the time at which the downtime actually starts.
+     * The downtime will then last for `Downtime::$duration' seconds.
+     *
+     * @var int Unix timestamp
+     */
+    protected $end;
+
+    /**
+     * Whether it's a fixed or flexible downtime
+     *
+     * @var bool
+     */
+    protected $fixed = true;
+
+    /**
+     * ID of the downtime which triggers this downtime
+     *
+     * The start of this downtime is triggered by the start of the other scheduled host or service downtime.
+     *
+     * @var int|null
+     */
+    protected $triggerId;
+
+    /**
+     * The duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * If `Downtime::$fixed' is set to false, the downtime will last for the duration in seconds specified, even
+     * if the host or service recovers before the downtime expires.
+     *
+     * @var int|null
+     */
+    protected $duration;
+
+    /**
+     * Set the time when the downtime should start
+     *
+     * @param   int $start Unix timestamp
+     *
+     * @return  $this
+     */
+    public function setStart($start)
+    {
+        $this->start = (int) $start;
+        return $this;
+    }
+
+    /**
+     * Get the time when the downtime should start
+     *
+     * @return int Unix timestamp
+     */
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    /**
+     * Set the time when the downtime should end
+     *
+     * @param   int $end Unix timestamp
+     *
+     * @return  $this
+     */
+    public function setEnd($end)
+    {
+        $this->end = (int) $end;
+        return $this;
+    }
+
+    /**
+     * Get the time when the downtime should end
+     *
+     * @return int Unix timestamp
+     */
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    /**
+     * Set whether it's a fixed or flexible downtime
+     *
+     * @param   boolean $fixed
+     *
+     * @return  $this
+     */
+    public function setFixed($fixed = true)
+    {
+        $this->fixed = (bool) $fixed;
+        return $this;
+    }
+
+    /**
+     * Is the downtime fixed?
+     *
+     * @return boolean
+     */
+    public function getFixed()
+    {
+        return $this->fixed;
+    }
+
+    /**
+     * Set the ID of the downtime which triggers this downtime
+     *
+     * @param   int $triggerId
+     *
+     * @return  $this
+     */
+    public function setTriggerId($triggerId)
+    {
+        $this->triggerId = (int) $triggerId;
+        return $this;
+    }
+
+    /**
+     * Get the ID of the downtime which triggers this downtime
+     *
+     * @return int|null
+     */
+    public function getTriggerId()
+    {
+        return $this->triggerId;
+    }
+
+    /**
+     * Set the duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * @param   int $duration
+     *
+     * @return  $this
+     */
+    public function setDuration($duration)
+    {
+        $this->duration = (int) $duration;
+        return $this;
+    }
+
+    /**
+     * Get the duration in seconds the downtime must last if it's a flexible downtime
+     *
+     * @return int|null
+     */
+    public function getDuration()
+    {
+        return $this->duration;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\IcingaCommand::getName() For the method documentation.
+     */
+    public function getName()
+    {
+        return 'ScheduleDowntime';
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
new file mode 100644
index 000000000..c6cbeaa50
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
@@ -0,0 +1,114 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Enable or disable a feature of an Icinga object, i.e. host or service
+ */
+class ToggleObjectFeatureCommand extends ObjectCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST,
+        self::TYPE_SERVICE
+    );
+
+    /**
+     * Feature for enabling or disabling active checks of a host or service
+     */
+    const FEATURE_ACTIVE_CHECKS = 'active_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling passive checks of a host or service
+     */
+    const FEATURE_PASSIVE_CHECKS = 'passive_checks_enabled';
+
+    /**
+     * Feature for enabling or disabling processing of host or service checks via the OCHP command for a host or service
+     */
+    const FEATURE_OBSESSING = 'obsessing';
+
+    /**
+     * Feature for enabling or disabling notifications for a host or service
+     *
+     * Notifications will be sent out only if notifications are enabled on a program-wide basis as well.
+     */
+    const FEATURE_NOTIFICATIONS = 'notifications_enabled';
+
+    /**
+     * Feature for enabling or disabling event handler for a host or service
+     */
+    const FEATURE_EVENT_HANDLER = 'event_handler_enabled';
+
+    /**
+     * Feature for enabling or disabling flap detection for a host or service.
+     *
+     * In order to enable flap detection flap detection must be enabled on a program-wide basis as well.
+     */
+    const FEATURE_FLAP_DETECTION = 'flap_detection_enabled';
+
+    /**
+     * Feature that is to be enabled or disabled
+     *
+     * @var string
+     */
+    protected $feature;
+
+    /**
+     * Whether the feature should be enabled or disabled
+     *
+     * @var bool
+     */
+    protected $enabled;
+
+    /**
+     * Set the feature that is to be enabled or disabled
+     *
+     * @param   string $feature
+     *
+     * @return  $this
+     */
+    public function setFeature($feature)
+    {
+        $this->feature = (string) $feature;
+        return $this;
+    }
+
+    /**
+     * Get the feature that is to be enabled or disabled
+     *
+     * @return string
+     */
+    public function getFeature()
+    {
+        return $this->feature;
+    }
+
+    /**
+     * Set whether the feature should be enabled or disabled
+     *
+     * @param   bool $enabled
+     *
+     * @return  $this
+     */
+    public function setEnabled($enabled = true)
+    {
+        $this->enabled = (bool) $enabled;
+        return $this;
+    }
+
+    /**
+     * Get whether the feature should be enabled or disabled
+     *
+     * @return bool
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
new file mode 100644
index 000000000..695c53cc6
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
@@ -0,0 +1,71 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Base class for commands adding comments
+ */
+abstract class WithCommentCommand extends ObjectCommand
+{
+    /**
+     * Author of the comment
+     *
+     * @var string
+     */
+    protected $author;
+
+    /**
+     * Comment
+     *
+     * @var string
+     */
+    protected $comment;
+
+    /**
+     * Set the author
+     *
+     * @param   string $author
+     *
+     * @return  $this
+     */
+    public function setAuthor($author)
+    {
+        $this->author = (string) $author;
+        return $this;
+    }
+
+    /**
+     * Get the author
+     *
+     * @return string
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Set the comment
+     *
+     * @param   string $comment
+     *
+     * @return  $this
+     */
+    public function setComment($comment)
+    {
+        $this->comment = (string) $comment;
+        return $this;
+    }
+
+    /**
+     * Get the comment
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+}

From 746e75e5ed26c25f5ccb00240f6edc472c1c9a74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:19:00 +0200
Subject: [PATCH 209/277] monitroing/commands: Remove method
 `CommandForm::inline()'

Inline forms will set themselves as inline.

refs #6593
---
 .../application/forms/Command/CommandForm.php | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index ee74b1fb0..0a7cd19f9 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -21,13 +21,6 @@ abstract class CommandForm extends Form
      */
     protected $backend;
 
-    /**
-     * Whether the form's inline
-     *
-     * @var bool
-     */
-    protected $inline = false;
-
     /**
      * Set the monitoring backend
      *
@@ -51,27 +44,6 @@ abstract class CommandForm extends Form
         return $this->backend;
     }
 
-    /**
-     * Set the form as inline
-     *
-     * @return $this
-     */
-    public function inline()
-    {
-        $this->inline = true;
-        $this->submitLabel = null;  // Inline forms must not have a submit button
-        $class = $this->getAttrib('class');
-        if (is_array($class)) {
-            $class[] = 'inline';
-        } elseif ($class === null) {
-            $class = 'inline';
-        } else {
-            $class .= 'inline';
-        }
-        $this->setAttrib('class', $class);
-        return $this;
-    }
-
     /**
      * Get the transport used to send commands
      *

From b4faa0142bbdbf8090e8dd6b877086e4106cf9f9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:20:20 +0200
Subject: [PATCH 210/277] monitoring/commands: Add object command forms

refs #6593
---
 .../Object/AcknowledgeProblemCommandForm.php  | 166 ++++++++++++++
 .../Command/Object/AddCommentCommandForm.php  |  91 ++++++++
 .../Command/Object/CheckNowCommandForm.php    |  51 +++++
 .../Object/DeleteCommentCommandForm.php       |  61 ++++++
 .../Object/DeleteDowntimeCommandForm.php      |  61 ++++++
 .../Command/Object/ObjectsCommandForm.php     |  48 ++++
 .../RemoveAcknowledgementCommandForm.php      |  41 ++++
 .../ScheduleServiceCheckCommandForm.php       |  91 ++++++++
 .../ScheduleServiceDowntimeCommandForm.php    | 206 ++++++++++++++++++
 .../ToggleObjectFeaturesCommandForm.php       | 123 +++++++++++
 10 files changed, 939 insertions(+)
 create mode 100644 modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
new file mode 100644
index 000000000..8da595a0d
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -0,0 +1,166 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use DateTime;
+use DateInterval;
+use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
+use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for acknowledging host or service problems
+ */
+class AcknowledgeProblemCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Acknowledge Problem'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'note',
+                'command-info',
+                array(
+                    'value' => 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.'
+                    )
+                )
+            ),
+            array(
+                'textarea',
+                'comment',
+                array(
+                    'required'      => true,
+                    '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.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'persistent',
+                array(
+                    '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.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'expire',
+                array(
+                    'label'         => mt('monitoring', 'Use Expire Time'),
+                    'description'   => mt('monitoring', 'If the acknowledgement should expire, check this option.'),
+                    'autosubmit'    => true
+                )
+            )
+        ));
+        if (isset($formData['expire']) && (bool) $formData['expire'] === true) {
+            $expireTime = new DateTime();
+            $expireTime->add(new DateInterval('PT1H'));
+            $this->addElement(
+                new DateTimePicker(
+                    'expire_time',
+                    array(
+                        'label'         => mt('monitoring', 'Expire Time'),
+                        'value'         => $expireTime,
+                        'description'   => mt(
+                            'monitoring',
+                            'Enter the expire date and time for this acknowledgement here. Icinga will delete the'
+                                . ' acknowledgement after this time expired.'
+                        )
+                    )
+                )
+            );
+            $this->addDisplayGroup(
+                array('expire', 'expire_time'),
+                'expire-expire_time',
+                array(
+                    'decorators' => array(
+                        'FormElements',
+                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                    )
+                )
+            );
+        }
+        $this->addElements(array(
+            array(
+                'checkbox',
+                'sticky',
+                array(
+                    'label'         => mt('monitoring', 'Sticky Acknowledgement'),
+                    'value'         => true,
+                    'description'   => mt(
+                        'monitoring',
+                        'If you want the acknowledgement to disable notifications until the host or service recovers,'
+                            . 'check this option.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'notify',
+                array(
+                    'label'         => mt('monitoring', 'Send Notification'),
+                    'value'         => true,
+                    'description'   => mt(
+                        'monitoring',
+                        'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
+                            . 'uncheck this option.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $ack = new AcknowledgeProblemCommand();
+            $ack
+                ->setObject($object)
+                ->setComment($this->getElement('comment')->getValue())
+                ->setAuthor($request->getUser()->getUsername())
+                ->setPersistent($this->getElement('persistent')->isChecked())
+                ->setSticky($this->getElement('sticky')->isChecked())
+                ->setNotify($this->getElement('notify')->isChecked());
+            if ($this->getElement('expire')->isChecked()) {
+                $ack->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
+            }
+            $this->getTransport($request)->send($ack);
+        }
+        Notification::success(mt('monitoring', 'Acknowledging problem..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
new file mode 100644
index 000000000..777d96868
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -0,0 +1,91 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for adding host or service comments
+ */
+class AddCommentCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Add Comment'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'note',
+                'command-info',
+                array(
+                    'value' => mt(
+                        'monitoring',
+                        'This command is used to add host or service comments.'
+                    )
+                )
+            ),
+            array(
+                'textarea',
+                'comment',
+                array(
+                    'required'      => true,
+                    '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.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'persistent',
+                array(
+                    'label'         => mt('monitoring', 'Persistent'),
+                    'value'         => true,
+                    'description'   => mt(
+                        'monitoring',
+                        'If you uncheck this option, the comment will automatically be deleted the next time Icinga is'
+                            . ' restarted.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $comment = new AddCommentCommand();
+            $comment->setObject($object);
+            $comment->setComment($this->getElement('comment')->getValue());
+            $comment->setAuthor($request->getUser()->getUsername());
+            $comment->setPersistent((bool) $this->getElement('persistent')->getValue());
+            $this->getTransport($request)->send($comment);
+        }
+        Notification::success(mt('monitoring', 'Adding comment..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
new file mode 100644
index 000000000..ecf933102
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -0,0 +1,51 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand;
+use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
+use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for immediately checking hosts or services
+ */
+class CheckNowCommandForm extends ObjectsCommandForm
+{
+
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Check Now'));
+        $this->setAttrib('class', 'inline link-like');
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            if ($object->getType() === $object::TYPE_HOST) {
+                $check = new ScheduleHostCheckCommand();
+            } else {
+                $check = new ScheduleServiceCheckCommand();
+            }
+            $check
+                ->setObject($object)
+                ->setForced()
+                ->setCheckTime(time());
+            $this->getTransport($request)->send($check);
+        }
+        Notification::success(mt('monitoring', 'Scheduling check..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
new file mode 100644
index 000000000..c1a24ef50
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -0,0 +1,61 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for deleting host or service comments
+ */
+class DeleteCommentCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'X'));
+        $this->setAttrib('class', 'inline link-like');
+    }
+
+    /**
+     * (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
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        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($request)->send($delComment);
+        }
+        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
new file mode 100644
index 000000000..4558b71da
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -0,0 +1,61 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for deleting host or service downtimes
+ */
+class DeleteDowntimeCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'X'));
+        $this->setAttrib('class', 'inline link-like');
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'hidden',
+                'downtime_id',
+                array(
+                    'required' => true
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $delDowntime = new DeleteDowntimeCommand();
+            $delDowntime
+                ->setObject($object)
+                ->setDowntimeId($this->getElement('downtime_id')->getValue());
+            $this->getTransport($request)->send($delDowntime);
+        }
+        Notification::success(mt('monitoring', 'Deleting downtime..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
new file mode 100644
index 000000000..bf603a7b5
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
@@ -0,0 +1,48 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
+
+/**
+ * Base class for Icinga object command forms
+ */
+abstract class ObjectsCommandForm extends CommandForm
+{
+    /**
+     * Involved Icinga objects
+     *
+     * @var array|\Traversable|\ArrayAccess
+     */
+    protected $objects;
+
+    /**
+     * Set the involved Icinga objects
+     *
+     * @param   $objects MonitoredObject|array|\Traversable|\ArrayAccess
+     *
+     * @return  $this
+     */
+    public function setObjects($objects)
+    {
+        if ($objects instanceof MonitoredObject) {
+            $this->objects = array($objects);
+        } else {
+            $this->objects = $objects;
+        }
+        return $this;
+    }
+
+    /**
+     * Get the involved Icinga objects
+     *
+     * @return array|\ArrayAccess|\Traversable
+     */
+    public function getObjects()
+    {
+        return $this->objects;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
new file mode 100644
index 000000000..c76cca19c
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -0,0 +1,41 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for removing host or service problem acknowledgements
+ */
+class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Remove Problem Acknowledgement'));
+        $this->setAttrib('class', 'inline link-like');
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $removeAck = new RemoveAcknowledgementCommand();
+            $removeAck->setObject($object);
+            $this->getTransport($request)->send($removeAck);
+        }
+        Notification::success(mt('monitoring', 'Removing problem acknowledgement..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
new file mode 100644
index 000000000..a93fcf4ae
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -0,0 +1,91 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use DateTime;
+use DateInterval;
+use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
+use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for scheduling service checks
+ */
+class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Schedule Check'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $checkTime = new DateTime();
+        $checkTime->add(new DateInterval('PT1H'));
+        $this->addElements(array(
+            array(
+                'note',
+                'command-info',
+                array(
+                    '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.'
+                    )
+                )
+            ),
+            new DateTimePicker(
+                'check_time',
+                array(
+                    'required'      => true,
+                    'label'         => mt('monitoring', 'Check Time'),
+                    'description'   => mt('monitoring', 'Set the date and time when the check should be scheduled.'),
+                    'value'         => $checkTime
+                )
+            ),
+            array(
+                'checkbox',
+                'force_check',
+                array(
+                    '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.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $check = new ScheduleServiceCheckCommand();
+            $check
+                ->setObject($object)
+                ->setForced((bool) $this->getElement('force_check')->getValue())
+                ->setCheckTime($this->getElement('check_time')->getValue());
+            $this->getTransport($request)->send($check);
+        }
+        Notification::success(mt('monitoring', 'Scheduling service check..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
new file mode 100644
index 000000000..76d36d214
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -0,0 +1,206 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use DateTime;
+use DateInterval;
+use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
+use Icinga\Web\Form\Element\DateTimePicker;
+use Icinga\Web\Form\Element\Number;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for scheduling service downtimes
+ */
+class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
+{
+    /**
+     * Fixed downtime
+     */
+    const FIXED = 'fixed';
+
+    /**
+     * Flexible downtime
+     */
+    const FLEXIBLE = 'flexible';
+
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setSubmitLabel(mt('monitoring', 'Schedule Downtime'));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $start = new DateTime;
+        $end = clone $start;
+        $end->add(new DateInterval('PT1H'));
+        $this->addElements(array(
+            array(
+                'note',
+                'command-info',
+                array(
+                    'value' => 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'
+                            . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
+                            . ' restarts.'
+                    )
+                )
+            ),
+            array(
+                'textarea',
+                'comment',
+                array(
+                    'required'      => true,
+                    '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.'
+                    )
+                )
+            ),
+            new DateTimePicker(
+                'start',
+                array(
+                    'required'      => true,
+                    'label'         => mt('monitoring', 'Start Time'),
+                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
+                    'value'         => $start
+                )
+            ),
+            new DateTimePicker(
+                'end',
+                array(
+                    'required'      => true,
+                    'label'         => mt('monitoring', 'End Time'),
+                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
+                    'value'         => $end
+                )
+            ),
+            array(
+                'select',
+                'type',
+                array(
+                    'required'      => true,
+                    'autosubmit'    => true,
+                    '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     => mt('monitoring', 'Fixed'),
+                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
+                    ),
+                    'validators' => array(
+                        array(
+                            'InArray',
+                            true,
+                            array(array(self::FIXED, self::FLEXIBLE))
+                        )
+                    )
+                )
+            )
+        ));
+        $this->addDisplayGroup(
+            array('start', 'end'),
+            'start-end',
+            array(
+                'decorators' => array(
+                    'FormElements',
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                )
+            )
+        );
+        if (isset($formData['type']) && $formData['type'] === self::FLEXIBLE) {
+            $this->addElements(array(
+                new Number(
+                    'hours',
+                    array(
+                        'required'  => true,
+                        'label'     => mt('monitoring', 'Hours'),
+                        'value'     => 2,
+                        'min'       => -1
+                    )
+                ),
+                new Number(
+                    'minutes',
+                    array(
+                        'required'  => true,
+                        'label'     => mt('monitoring', 'Minutes'),
+                        'value'     => 0,
+                        'min'       => -1
+                    )
+                )
+            ));
+            $this->addDisplayGroup(
+                array('hours', 'minutes'),
+                'duration',
+                array(
+                    '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.'
+                    ),
+                    'decorators' => array(
+                        'FormElements',
+                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group')),
+                        array(
+                            'Description',
+                            array('tag' => 'span', 'class' => 'description', 'placement' => 'prepend')
+                        ),
+                        'Fieldset'
+                    )
+                )
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $downtime = new ScheduleServiceDowntimeCommand();
+            $downtime
+                ->setObject($object)
+                ->setComment($this->getElement('comment')->getValue())
+                ->setAuthor($request->getUser()->getUsername())
+                ->setStart($this->getElement('start')->getValue()->getTimestamp())
+                ->setEnd($this->getElement('end')->getValue()->getTimestamp());
+            if ($this->getElement('type')->getValue() === self::FLEXIBLE) {
+                $downtime->setFixed(false);
+                $downtime->setDuration(
+                    (float) $this->getElement('hours')->getValue() * 3600
+                    + (float) $this->getElement('minutes')->getValue() * 60
+                );
+            }
+            $this->getTransport($request)->send($downtime);
+        }
+        Notification::success(mt('monitoring', 'Scheduling service downtime..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
new file mode 100644
index 000000000..146fd7001
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -0,0 +1,123 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\ToggleObjectFeatureCommand;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for enabling or disabling features of Icinga objects, i.e. hosts or services
+ */
+class ToggleObjectFeaturesCommandForm 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(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
+                array(
+                    'label'         => mt('monitoring', 'Active Checks'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
+                array(
+                    'label'         => mt('monitoring', 'Passive Checks'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_OBSESSING,
+                array(
+                    'label'         => mt('monitoring', 'Obsessing'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
+                array(
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
+                array(
+                    'label'         => mt('monitoring', 'Event Handler'),
+                    'autosubmit'    => true
+                )
+            ),
+            array(
+                'checkbox',
+                ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
+                array(
+                    'label'         => mt('monitoring', 'Flap Detection'),
+                    'autosubmit'    => true
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * Load feature status
+     *
+     * @param   MonitoredObject $object
+     *
+     * @return  $this
+     */
+    public function load(MonitoredObject $object)
+    {
+        $this->create();
+        foreach ($this->getValues() as $feature => $enabled) {
+            $this->getElement($feature)->setChecked($object->{$feature});
+        }
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            foreach ($this->getValues() as $feature => $enabled) {
+                if ((bool) $object->{$feature} !== (bool) $enabled) {
+                    $toggleFeature = new ToggleObjectFeatureCommand();
+                    $toggleFeature
+                        ->setFeature($feature)
+                        ->setObject($object)
+                        ->setEnabled($enabled);
+                    $this->getTransport($request)->send($toggleFeature);
+                }
+            }
+        }
+        Notification::success(mt('monitoring', 'Toggling feature..'));
+        return true;
+    }
+}

From 1df8076234efc1312127a2a319c35d46f33ad84b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:39:13 +0200
Subject: [PATCH 211/277] monitoring/commands: Add command renderer for the
 Icinga command file

refs #6593
---
 .../IcingaCommandFileCommandRenderer.php      | 389 ++++++++++++++++++
 .../IcingaCommandRendererInterface.php        |   8 +
 2 files changed, 397 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php

diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
new file mode 100644
index 000000000..5045a8ade
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -0,0 +1,389 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Command\Renderer;
+
+use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
+use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
+use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
+use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
+use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
+use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand;
+use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
+use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
+use Icinga\Module\Monitoring\Command\Object\SendCustomNotificationCommand;
+use Icinga\Module\Monitoring\Command\Object\ToggleObjectFeatureCommand;
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+use InvalidArgumentException;
+
+/**
+ * Icinga command renderer for the Icinga command file
+ */
+class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
+{
+    /**
+     * Escape a command string
+     *
+     * @param   string $commandString
+     *
+     * @return  string
+     */
+    public function escape($commandString)
+    {
+        return str_replace(array("\r", "\n"), array('\r', '\n'), $commandString);
+    }
+
+    /**
+     * Render a command
+     *
+     * @param   IcingaCommand $command
+     * @param   int|null $now
+     *
+     * @return  string
+     */
+    public function render(IcingaCommand $command, $now = null)
+    {
+        $renderMethod = 'render' . $command->getName();
+        if (! method_exists($this, $renderMethod)) {
+            die($renderMethod);
+        }
+        if ($now === null) {
+            $now = time();
+        }
+        return sprintf('[%u] %s', $now, $this->$renderMethod($command));
+    }
+
+    public function renderAddComment(AddCommentCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                'ADD_HOST_COMMENT;%s',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                'ADD_SVC_COMMENT;%s;%s',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return sprintf(
+            '%s;%u;%s;%s',
+            $commandString,
+            $command->getPersistent(),
+            $command->getAuthor(),
+            $command->getComment()
+        );
+    }
+
+    public function renderSendCustomNotification(SendCustomNotificationCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                'SEND_CUSTOM_HOST_NOTIFICATION;%s',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                'SEND_CUSTOM_SVC_NOTIFICATION;%s;%s',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        $options = 0; // 0 for no options
+        if ($command->getBroadcast() === true) {
+            $options |= 1;
+        }
+        if ($command->getForced() === true) {
+            $options |= 2;
+        }
+        return sprintf(
+            '%s;%u;%s;%s',
+            $commandString,
+            $options,
+            $command->getAuthor(),
+            $command->getComment()
+        );
+    }
+
+    public function renderProcessCheckResult(ProcessCheckResultCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                'PROCESS_HOST_CHECK_RESULT;%s',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                'PROCESS_SVC_CHECK_RESULT;%s;%s',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        $output = $command->getOutput();
+        if ($command->getPerformanceData() !== null) {
+            $output .= '|' . $command->getPerformanceData();
+        }
+        return sprintf(
+            '%s;%u;%s',
+            $commandString,
+            $command->getStatus(),
+            $output
+        );
+    }
+
+    public function renderScheduleCheck(ScheduleServiceCheckCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            /** @var \Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand $command */
+            if ($command->getOfAllServices() === true) {
+                if ($command->getForced() === true) {
+                    $commandName = 'SCHEDULE_FORCED_HOST_SVC_CHECKS';
+                } else {
+                    $commandName = 'SCHEDULE_HOST_SVC_CHECKS';
+                }
+            } else {
+                if ($command->getForced() === true) {
+                    $commandName = 'SCHEDULE_FORCED_HOST_CHECK';
+                } else {
+                    $commandName = 'SCHEDULE_HOST_CHECK';
+                }
+            }
+            $commandString = sprintf(
+                '%s;%s',
+                $commandName,
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                $command->getForced() === true ? 'SCHEDULE_FORCED_SVC_CHECK' : 'SCHEDULE_SVC_CHECK',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return sprintf(
+            '%s;%u',
+            $commandString,
+            $command->getCheckTime()
+        );
+    }
+
+    public function renderScheduleDowntime(ScheduleServiceDowntimeCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            /** @var \Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand $command */
+            if ($command->getForAllServices() === true) {
+                $commandName = 'SCHEDULE_HOST_SVC_DOWNTIME';
+            } else {
+                $commandName = 'SCHEDULE_HOST_DOWNTIME';
+            }
+            $commandString = sprintf(
+                '%s;%s',
+                $commandName,
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                'SCHEDULE_SVC_DOWNTIME',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return sprintf(
+            '%s;%u;%u;%u;%u;%u;%s;%s',
+            $commandString,
+            $command->getStart(),
+            $command->getEnd(),
+            $command->getFixed(),
+            $command->getTriggerId(),
+            $command->getDuration(),
+            $command->getAuthor(),
+            $command->getComment()
+        );
+    }
+
+    public function renderAcknowledgeProblem(AcknowledgeProblemCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                '%s;%s',
+                $command->getExpireTime() !== null ? 'ACKNOWLEDGE_HOST_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_HOST_PROBLEM',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                $command->getExpireTime() !== null ? 'ACKNOWLEDGE_SVC_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_SVC_PROBLEM',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        $commandString = sprintf(
+            '%s;%u;%u;%u',
+            $commandString,
+            $command->getSticky(),
+            $command->getNotify(),
+            $command->getPersistent()
+        );
+        if ($command->getExpireTime() !== null) {
+            $commandString = sprintf(
+                '%s;%u',
+                $commandString,
+                $command->getExpireTime()
+            );
+        }
+        return sprintf(
+            '%s;%s;%s',
+            $commandString,
+            $command->getAuthor(),
+            $command->getComment()
+        );
+    }
+
+    public function renderToggleObjectFeature(ToggleObjectFeatureCommand $command)
+    {
+        if ($command->getEnabled() === true) {
+            $commandPrefix = 'ENABLE';
+        } else {
+            $commandPrefix = 'DISABLE';
+        }
+        switch ($command->getFeature()) {
+            case ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS:
+                $commandFormat = sprintf('%s_%%s_CHECK', $commandPrefix);
+                break;
+            case ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS:
+                $commandFormat = sprintf('%s_PASSIVE_%%s_CHECKS', $commandPrefix);
+                break;
+            case ToggleObjectFeatureCommand::FEATURE_OBSESSING:
+                if ($command->getEnabled() === true) {
+                    $commandPrefix = 'START';
+                } else {
+                    $commandPrefix = 'STOP';
+                }
+                $commandFormat = sprintf('%s_OBSESSING_OVER_%%s', $commandPrefix);
+                break;
+            case ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS:
+                $commandFormat = sprintf('%s_%%s_NOTIFICATIONS', $commandPrefix);
+                break;
+            case ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER:
+                $commandFormat = sprintf('%s_%%s_EVENT_HANDLER', $commandPrefix);
+                break;
+            case ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION:
+                $commandFormat = sprintf('%s_%%s_FLAP_DETECTION', $commandPrefix);
+                break;
+            default:
+                throw new InvalidArgumentException($command->getFeature());
+        }
+        $object = $command->getObject();
+        if ($object->getType() === ToggleObjectFeatureCommand::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                $commandFormat . ';%s',
+                'HOST',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                $commandFormat . ';%s;%s',
+                'SVC',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return $commandString;
+    }
+
+    public function renderDeleteComment(DeleteCommentCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                '%s;%s',
+                'DEL_HOST_DOWNTIME',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                'DEL_SVC_COMMENT',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return sprintf(
+            '%s;%u',
+            $commandString,
+            $command->getCommentId()
+        );
+    }
+
+    public function renderDeleteDowntime(DeleteDowntimeCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                '%s;%s',
+                'DEL_HOST_DOWNTIME',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                'DEL_SVC_DOWNTIME',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return sprintf(
+            '%s;%u',
+            $commandString,
+            $command->getDowntimeId()
+        );
+    }
+
+    public function renderRemoveAcknowledgement(RemoveAcknowledgementCommand $command)
+    {
+        $object = $command->getObject();
+        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $commandString = sprintf(
+                '%s;%s',
+                'REMOVE_HOST_ACKNOWLEDGEMENT',
+                $object->getHost()
+            );
+        } else {
+            /** @var \Icinga\Module\Monitoring\Object\Service $object */
+            $commandString = sprintf(
+                '%s;%s;%s',
+                'REMOVE_SVC_ACKNOWLEDGEMENT',
+                $object->getHost(),
+                $object->getService()
+            );
+        }
+        return $commandString;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
new file mode 100644
index 000000000..dddd16742
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Command\Renderer;
+
+/**
+ * Interface for Icinga command renderer
+ */
+interface IcingaCommandRendererInterface {}

From b6ac31d10f5598771a8c0a32689fe5a1bdf676c7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 11 Sep 2014 17:39:59 +0200
Subject: [PATCH 212/277] monitoring/commands: Let transports use the Icinga
 command file command renderer

refs #6593
---
 .../Command/Transport/CommandTransport.php    |  6 ++--
 .../Transport/CommandTransportInterface.php   | 14 +---------
 .../Command/Transport/LocalCommandFile.php    | 28 +++++++++++++++----
 .../Command/Transport/RemoteCommandFile.php   | 26 ++++++++++++++---
 4 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index 9adbbb062..84845f23f 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -58,13 +58,13 @@ abstract class CommandTransport
                 $transport = new LocalCommandFile();
                 break;
             default:
-                throw new ConfigurationError;
+                throw new ConfigurationError();
         }
         unset($config->transport);
         foreach ($config as $key => $value) {
             $method = 'set' . ucfirst($key);
             if (! method_exists($transport, $method)) {
-                throw new ConfigurationError;
+                throw new ConfigurationError();
             }
             $transport->$method($value);
         }
@@ -83,7 +83,7 @@ abstract class CommandTransport
     {
         $config = self::getConfig()->get($name);
         if ($config === null) {
-            throw new ConfigurationError;
+            throw new ConfigurationError();
         }
         return self::fromConfig($config);
     }
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index bb0da2716..5f0908fa3 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -4,19 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
-use Icinga\Module\Monitoring\Command\IcingaCommand;
-
 /**
  * Interface for Icinga command transports
  */
-interface CommandTransportInterface
-{
-    /**
-     * Send the command
-     *
-     * @param   IcingaCommand $command
-     *
-     * @throws  \Icinga\Module\Monitoring\Command\Exception\TransportException
-     */
-    public function send(IcingaCommand $command);
-}
+interface CommandTransportInterface {}
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 8278b79b0..2fc68d315 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -9,6 +9,7 @@ use LogicException;
 use Icinga\Logger\Logger;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
 use Icinga\Util\File;
 
 /**
@@ -30,6 +31,21 @@ class LocalCommandFile implements CommandTransportInterface
      */
     protected $openMode = 'wn';
 
+    /**
+     * Command renderer
+     *
+     * @var IcingaCommandFileCommandRenderer
+     */
+    protected $renderer;
+
+    /**
+     * Create a new local command file command transport
+     */
+    public function __construct()
+    {
+        $this->renderer = new IcingaCommandFileCommandRenderer();
+    }
+
     /**
      * Set the path to the local Icinga command file
      *
@@ -79,26 +95,28 @@ class LocalCommandFile implements CommandTransportInterface
     /**
      * Write the command to the local Icinga command file
      *
-     * @param   IcingaCommand $command
+     * @param   IcingaCommand   $command
+     * @param   int|null        $now
      *
      * @throws  LogicException
      * @throws  TransportException
      */
-    public function send(IcingaCommand $command)
+    public function send(IcingaCommand $command, $now = null)
     {
         if (! isset($this->path)) {
             throw new LogicException;
         }
+        $commandString = $this->renderer->render($command, $now);
         Logger::debug(
             sprintf(
                 mt('monitoring', 'Sending external Icinga command "%s" to the local command file "%s"'),
-                $command,
+                $commandString,
                 $this->path
             )
         );
         try {
             $file = new File($this->path, $this->openMode);
-            $file->fwrite($command . "\n");
+            $file->fwrite($commandString . "\n");
             $file->fflush();
         } catch (Exception $e) {
             throw new TransportException(
@@ -106,7 +124,7 @@ class LocalCommandFile implements CommandTransportInterface
                     'monitoring',
                     'Can\'t send external Icinga command "%s" to the local command file "%s": %s'
                 ),
-                $command,
+                $commandString,
                 $this->path,
                 $e
             );
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 8092a00bd..c019106cc 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -8,6 +8,7 @@ use LogicException;
 use Icinga\Logger\Logger;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
+use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
 
 /**
  * A remote Icinga command file
@@ -46,6 +47,21 @@ class RemoteCommandFile implements CommandTransportInterface
      */
     protected $path;
 
+    /**
+     * Command renderer
+     *
+     * @var IcingaCommandFileCommandRenderer
+     */
+    protected $renderer;
+
+    /**
+     * Create a new remote command file command transport
+     */
+    public function __construct()
+    {
+        $this->renderer = new IcingaCommandFileCommandRenderer();
+    }
+
     /**
      * Set the remote host
      *
@@ -143,12 +159,13 @@ class RemoteCommandFile implements CommandTransportInterface
     /**
      * Write the command to the Icinga command file on the remote host
      *
-     * @param   IcingaCommand $command
+     * @param   IcingaCommand   $command
+     * @param   int|null        $now
      *
      * @throws  LogicException
      * @throws  TransportException
      */
-    public function send(IcingaCommand $command)
+    public function send(IcingaCommand $command, $now = null)
     {
         if (! isset($this->path)) {
             throw new LogicException;
@@ -156,10 +173,11 @@ class RemoteCommandFile implements CommandTransportInterface
         if (! isset($this->host)) {
             throw new LogicException;
         }
+        $commandString = $this->renderer->render($command, $now);
         Logger::debug(
             sprintf(
                 mt('monitoring', 'Sending external Icinga command "%s" to the remote command file "%s:%u%s"'),
-                $command,
+                $commandString,
                 $this->host,
                 $this->port,
                 $this->path
@@ -173,7 +191,7 @@ class RemoteCommandFile implements CommandTransportInterface
         $ssh .= sprintf(
             ' %s "echo %s > %s" 2>&1',  // Redirect stderr to stdout
             escapeshellarg($this->host),
-            escapeshellarg($command),
+            escapeshellarg($commandString),
             escapeshellarg($this->path)
         );
         exec($ssh, $output, $status);

From aca5a2e466657531bb3f8b4cd9fca788edaabfc6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 10:16:31 +0200
Subject: [PATCH 213/277] monitoring: Fetch Icinga object properties lazily

---
 .../Monitoring/Object/MonitoredObject.php     | 461 +++++++++++-------
 1 file changed, 288 insertions(+), 173 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 8ff79f7b8..cb95c2e41 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -2,127 +2,249 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-/*
-CREATE INDEX tgelf_comments ON icinga_comments (object_id, comment_type, comment_time);
-
-CREATE INDEX tgelf_scheduleddowntime ON icinga_scheduleddowntime (object_id, is_in_effect, scheduled_start_time);
-
-*/
-
 namespace Icinga\Module\Monitoring\Object;
 
-use Icinga\Module\Monitoring\DataView\Contact;
-use Icinga\Module\Monitoring\DataView\Contactgroup;
-use Icinga\Module\Monitoring\DataView\Downtime;
-use Icinga\Module\Monitoring\DataView\EventHistory;
-use Icinga\Module\Monitoring\DataView\Hostgroup;
-use Icinga\Module\Monitoring\DataView\Comment;
-use Icinga\Module\Monitoring\DataView\Servicegroup;
-use Icinga\Module\Monitoring\DataView\Customvar;
-use Icinga\Web\UrlParams;
+use InvalidArgumentException;
 use Icinga\Application\Config;
+use Icinga\Exception\InvalidPropertyException;
+use Icinga\Module\Monitoring\Backend;
 
-
+/**
+ * A monitored Icinga object, i.e. host or service
+ */
 abstract class MonitoredObject
 {
-    public $type;
-    public $prefix;
+    /**
+     * Type host
+     */
+    const TYPE_HOST = 'host';
 
-    public $comments       = array();
-    public $downtimes      = array();
-    public $hostgroups     = array();
-    public $servicegroups  = array();
-    public $contacts       = array();
-    public $contactgroups  = array();
-    public $customvars     = array();
-    public $events         = array();
+    /**
+     * Type service
+     */
+    const TYPE_SERVICE = 'service';
 
-    protected $view;
-    private $properties = array();
-    protected $params;
+    /**
+     * Backend to fetch object information from
+     *
+     * @var Backend
+     */
+    protected $backend;
 
-    // TODO: Fetching parent states if any would be nice
-    //       Same goes for host/service dependencies
+    /**
+     * Type of the Icinga object, i.e. 'host' or 'service'
+     *
+     * @var string
+     */
+    protected $type;
 
-    public function __construct(UrlParams $params)
+    /**
+     * Prefix of the Icinga object, i.e. 'host_' or 'service_'
+     *
+     * @var string
+     */
+    protected $prefix;
+
+    /**
+     * Properties
+     *
+     * @var object
+     */
+    protected $properties;
+
+    /**
+     * Comments
+     *
+     * @var array
+     */
+    protected $comments;
+
+    /**
+     * Downtimes
+     *
+     * @var array
+     */
+    protected $downtimes;
+
+    /**
+     * Host groups
+     *
+     * @var array
+     */
+    protected $hostgroups;
+
+    /**
+     * Service groups
+     *
+     * @var array
+     */
+    protected $servicegroups;
+
+    /**
+     * Contacts
+     *
+     * @var array
+     */
+    protected $contacts;
+
+    /**
+     * Contact groups
+     *
+     * @var array
+     */
+    protected $contactgroups;
+
+    /**
+     * Custom variables
+     *
+     * @var array
+     */
+    protected $customvars;
+
+    /**
+     * Event history
+     *
+     * @var \Icinga\Module\Monitoring\DataView\EventHistory
+     */
+    protected $eventhistory;
+
+    /**
+     * Create a monitored object, i.e. host or service
+     *
+     * @param Backend $backend Backend to fetch object information from
+     */
+    public function __construct(Backend $backend)
     {
-        $this->params = $params;
-        $this->properties = $this->getProperties();
+        $this->backend = $backend;
     }
 
-    abstract protected function getProperties();
+    /**
+     * Get the object's data view
+     *
+     * @return \Icinga\Module\Monitoring\DataView\DataView
+     */
+    abstract protected function getDataView();
 
+    /**
+     * Fetch the object's properties
+     *
+     * @return bool
+     */
+    public function fetch()
+    {
+        $this->properties = $this->getDataView()->getQuery()->fetchRow();
+        return $this->properties !== false;
+    }
+
+    /**
+     * Get the type of the object
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Require the object's type to be one of the given types
+     *
+     * @param   array $oneOf
+     *
+     * @return  bool
+     * @throws  InvalidArgumentException If the object's type is not one of the given types.
+     */
+    public function assertOneOf(array $oneOf)
+    {
+        if (! in_array($this->type, $oneOf)) {
+            throw new InvalidArgumentException;
+        }
+        return true;
+    }
+
+    /**
+     * Fetch the object's comments
+     *
+     * @return $this
+     */
     public function fetchComments()
     {
-        // WTF???
-        $query = Comment::fromParams(array('backend' => null), array(
+        $comments = $this->backend->select()->from('comment', array(
             'id'        => 'comment_internal_id',
             'timestamp' => 'comment_timestamp',
             'author'    => 'comment_author',
             'comment'   => 'comment_data',
             'type'      => 'comment_type',
-        ));
-        $query->where('comment_type', array('comment', 'ack'));
-        $query->where('comment_objecttype', $this->type);
-        $query->where('comment_host', $this->host_name);
-        if ($this->type === 'service') {
-            $query->where('comment_service', $this->service_description);
+        ))
+            ->where('comment_type', array('comment', 'ack'))
+            ->where('comment_objecttype', $this->type)
+            ->where('comment_host', $this->host);
+        if ($this->type === self::TYPE_SERVICE) {
+            $comments->where('comment_service', $this->service);
         }
-        $this->comments = $query->getQuery()->fetchAll();
+        $this->comments = $comments->getQuery()->fetchAll();
         return $this;
     }
 
+    /**
+     * Fetch the object's downtimes
+     *
+     * @return $this
+     */
     public function fetchDowntimes()
     {
-        // TODO: We want to check for objecttype = 'host', not type_id = 1
-
-        // WTF???
-        $query = Downtime::fromParams(array('backend' => null), array(
-            'id'           => 'downtime_internal_id',
-            'objecttype'   => 'downtime_objecttype',
-            'comment'      => 'downtime_comment',
-            'author'       => 'downtime_author',
-            'start'        => 'downtime_start',
-            'scheduled_start' => 'downtime_scheduled_start',
-            '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'         => 'downtime_host',
-            'service'      => 'downtime_service'
-        ));
-
-        $query->where('downtime_objecttype', $this->type);
-        $query->where('downtime_host', $this->host_name);
-        if ($this->type === 'service') {
-            $query->where('downtime_service', $this->service_description);
+        $downtimes = $this->backend->select()->from('downtime', array(
+            'id'                => 'downtime_internal_id',
+            'objecttype'        => 'downtime_objecttype',
+            'comment'           => 'downtime_comment',
+            'author'            => 'downtime_author',
+            'start'             => 'downtime_start',
+            'scheduled_start'   => 'downtime_scheduled_start',
+            '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'              => 'downtime_host',
+            'service'           => 'downtime_service'
+        ))
+            ->where('downtime_objecttype', $this->type)
+            ->where('downtime_host', $this->host)
+            ->order('downtime_is_in_effect', 'DESC')
+            ->order('downtime_scheduled_start', 'ASC');
+        if ($this->type === self::TYPE_SERVICE) {
+            $downtimes->where('downtime_service', $this->service);
         }
-        $query->order('downtime_is_in_effect', 'DESC')->order('downtime_scheduled_start', 'ASC');
-
-        $this->downtimes = $query->getQuery()->fetchAll();
-        return $this;
-
-        $this->downtimes = Downtime::fromRequest($this->request)->getQuery()->fetchAll();
+        $this->downtimes = $downtimes->getQuery()->fetchAll();
         return $this;
     }
 
+    /**
+     * Fetch the object's host groups
+     *
+     * @return $this
+     */
     public function fetchHostgroups()
     {
-        $query = HostGroup::fromParams(array('backend' => null), array(
+        $hostGroups = $this->backend->select()->from('hostGroup', array(
             'hostgroup_name',
             'hostgroup_alias'
-        ))->where('host_name', $this->host_name);
-
-        $this->hostgroups = $query->getQuery()->fetchPairs();
+        ))
+            ->where('host_name', $this->host);
+        $this->hostgroups = $hostGroups->getQuery()->fetchPairs();
         return $this;
     }
 
+    /**
+     * Fetch the object's custom variables
+     *
+     * @return $this
+     */
     public function fetchCustomvars()
     {
         $blacklist = array();
-        $blacklistPattern = '/^(.*pw.*|.*pass.*|community)$/';
+        $blacklistPattern = '/^(.*pw.*|.*pass.*|community)$/i';
 
         if ($security = Config::module('monitoring')->get('security')) {
 
@@ -138,23 +260,20 @@ abstract class MonitoredObject
             $blacklistPattern = '/^(' . implode('|', $blacklist) . ')$/i';
         }
 
-        $query = Customvar::fromParams(array('backend' => null), array(
-                'varname',
-                'varvalue'
-            )
-        );
-
-        if ($this->type === 'host') {
-            $query->where('host_name', $this->host_name)
-                ->where('object_type', 'host');
-        } else {
-            $query->where('host_name', $this->host_name)
-                ->where('object_type', 'service')
-                ->where('service_description', $this->service_description);
+        $query = $this->backend->select()->from('customvar', array(
+            'varname',
+            'varvalue'
+        ))
+            ->where('object_type', $this->type)
+            ->where('host_name', $this->host);
+        if ($this->type === self::TYPE_SERVICE) {
+            $query->where('service_description', $this->service);
         }
 
+        $this->customvars = array();
+
         $customvars = $query->getQuery()->fetchPairs();
-        foreach ($customvars as $name => &$value) {
+        foreach ($customvars as $name => $value) {
             $name = ucwords(str_replace('_', ' ', strtolower($name)));
             if ($blacklistPattern && preg_match($blacklistPattern, $name)) {
                 $value = '***';
@@ -165,83 +284,71 @@ abstract class MonitoredObject
         return $this;
     }
 
+    /**
+     * Fetch the object's contacts
+     *
+     * @return $this
+     */
     public function fetchContacts()
     {
-/*
-        $query = Contact::fromRequest(
-            $this->request,
-            array(
+        $contacts = $this->backend->select()->from('contact', array(
                 'contact_name',
                 'contact_alias',
                 'contact_email',
                 'contact_pager',
-            )
-        )->getQuery()
+        ))
             ->where('host_name', $this->host_name);
-*/
-
-        $query = Contact::fromParams(array('backend' => null), array(
-                'contact_name',
-                'contact_alias',
-                'contact_email',
-                'contact_pager',
-        ));
-
-        if ($this->type === 'service') {
-            $query->where('service_host_name', $this->host_name);
-            $query->where('service_description', $this->service_description);
-        } else {
-            $query->where('host_name', $this->host_name);
+        if ($this->type === self::TYPE_SERVICE) {
+            $contacts->where('service_description', $this->service);
         }
-
-        $this->contacts = $query->getQuery()->fetchAll();
+        $this->contacts = $contacts->getQuery()->fetchAll();
         return $this;
     }
 
+    /**
+     * Fetch the object's service groups
+     *
+     * @return $this
+     */
     public function fetchServicegroups()
     {
-        $query = Servicegroup::fromParams(array('backend' => null), array(
+        $serviceGroups = $this->backend->select()->from('serviceGroup', array(
                 'servicegroup_name',
-                'servicegroup_alias',
-            )
-        );
-        $query->where('service_host_name', $this->host_name);
-        $query->where('service_description', $this->service_description);
-        $this->servicegroups = $query->getQuery()->fetchPairs();
+                'servicegroup_alias'
+        ))
+            ->where('service_host_name', $this->host)
+            ->where('service_description', $this->service);
+        $this->servicegroups = $serviceGroups->getQuery()->fetchPairs();
         return $this;
     }
 
+    /**
+     * Fetch the object's contact groups
+     *
+     * @return $this
+     */
     public function fetchContactgroups()
     {
-
-        $query = Contactgroup::fromParams(array('backend' => null), array(
+        $contactsGroups = $this->backend->select()->from('contactGroup', array(
                 'contactgroup_name',
                 'contactgroup_alias'
-        ));
-
-        if ($this->type === 'service') {
-            $query->where('service_host_name', $this->host_name);
-            $query->where('service_description', $this->service_description);
-        } else {
-            $query->where('host_name', $this->host_name);
+        ))
+            ->where('host_name', $this->host);
+        if ($this->type === self::TYPE_SERVICE) {
+            $contactsGroups->where('service_description', $this->service);
         }
-/*
-        $query = Contactgroup::fromRequest(
-            $this->request,
-            array(
-                'contactgroup_name',
-                'contactgroup_alias'
-            )
-        )->getQuery();
-*/
-        $this->contactgroups = $query->getQuery()->fetchAll();
-
+        $this->contactgroups = $contactsGroups->getQuery()->fetchAll();
         return $this;
     }
 
-    public function fetchEventHistory()
+    /**
+     * Fetch the object's event history
+     *
+     * @return $this
+     */
+    public function fetchEventhistory()
     {
-        $query = EventHistory::fromParams(array('backend' => null), array(
+        $eventHistory = $this->backend->select()->from('eventHistory', array(
                 'object_type',
                 'host_name',
                 'service_description',
@@ -251,42 +358,50 @@ abstract class MonitoredObject
                 'max_attempts',
                 'output',
                 'type'
-            )
-        )->sort('timestamp', 'DESC');
-        if ($this->type === 'service') {
-            $query->where('service_host_name', $this->host_name);
-            $query->where('service_description', $this->service_description);
-        } else {
-            $query->where('host_name', $this->host_name);
+        ))
+            ->order('timestamp', 'DESC')
+            ->where('host_name', $this->host);
+        if ($this->type === self::TYPE_SERVICE) {
+            $eventHistory->where('service_description', $this->service);
         }
-
-        $this->eventhistory = $query->getQuery();
+        $this->eventhistory = $eventHistory->getQuery();
         return $this;
     }
 
-    public function __get($param)
+    /**
+     * Fetch all available data of the object
+     *
+     * @return $this
+     */
+    public function populate()
     {
-
-        if (isset($this->properties->$param)) {
-            return $this->properties->$param;
-        } elseif (isset($this->$param)) {
-            return $this->$param;
-        }
-        if (substr($param, 0, strlen($this->prefix)) === $this->prefix) {
-            return false;
-        }
-        $expandedName = $this->prefix . strtolower($param);
-        return $this->$expandedName;
+        $this
+            ->fetchComments()
+            ->fetchContacts()
+            ->fetchContactgroups()
+            ->fetchCustomvars()
+            ->fetchDowntimes();
+        // Call fetchHostgroups or fetchServicegroups depending on the object's type
+        $fetchGroups = 'fetch' . ucfirst($this->type) . 'groups';
+        $this->$fetchGroups();
+        return $this;
     }
 
-    public static function fromParams(UrlParams $params)
+    public function __get($name)
     {
-        if ($params->has('service') && $params->has('host')) {
-            return new Service($params);
-        } elseif ($params->has('host')) {
-            return new Host($params);
+        if (property_exists($this->properties, $name)) {
+            return $this->properties->$name;
+        } elseif (isset($this->$name)) {
+            return $this->$name;
+        } elseif (property_exists($this, $name)) {
+            $fetchMethod = 'fetch' . ucfirst($name);
+            $this->$fetchMethod();
+            return $this->$name;
         }
+        if (substr($name, 0, strlen($this->prefix)) === $this->prefix) {
+            throw new InvalidPropertyException('Can\'t access property \'%s\'. Property does not exist.', $name);
+        }
+        $prefixedName = $this->prefix . strtolower($name);
+        return $this->$prefixedName;
     }
-
-    abstract public function populate();
 }

From c0e3447339f7c378d15053208700fe528599cc24 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 10:17:46 +0200
Subject: [PATCH 214/277] monitoring: Adapt host and service classes to match
 their base class' interface

---
 .../library/Monitoring/Object/Host.php        |  66 ++++++++---
 .../library/Monitoring/Object/Service.php     | 110 +++++++++++-------
 2 files changed, 119 insertions(+), 57 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 1773337eb..0b482cfce 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -4,32 +4,64 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
-use Icinga\Module\Monitoring\DataView\HostStatus;
-use Icinga\Data\Db\DbQuery;
+use Icinga\Module\Monitoring\Backend;
 
+/**
+ * A Icinga host
+ */
 class Host extends MonitoredObject
 {
-    public $type   = 'host';
+    /**
+     * Type of the Icinga host
+     *
+     * @var string
+     */
+    public $type = self::TYPE_HOST;
+
+    /**
+     * Prefix of the Icinga host
+     *
+     * @var string
+     */
     public $prefix = 'host_';
 
-    protected function applyObjectFilter(DbQuery $query)
+    /**
+     * Host name
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Create a new host
+     *
+     * @param Backend   $backend    Backend to fetch host information from
+     * @param string    $host       Host name
+     */
+    public function __construct(Backend $backend, $host)
     {
-        return $query->where('host_name', $this->host_name);
+        parent::__construct($backend);
+        $this->host = $host;
     }
 
-    public function populate()
+    /**
+     * Get the host name
+     *
+     * @return string
+     */
+    public function getHost()
     {
-        $this->fetchComments()
-            ->fetchHostgroups()
-            ->fetchContacts()
-            ->fetchContactGroups()
-            ->fetchCustomvars()
-            ->fetchDowntimes();
+        return $this->host;
     }
 
-    protected function getProperties()
+    /**
+     * Get the data view to fetch the host information from
+     *
+     * @return \Icinga\Module\Monitoring\DataView\HostStatus
+     */
+    protected function getDataView()
     {
-        $this->view = HostStatus::fromParams(array('backend' => null), array(
+        return $this->backend->select()->from('hostStatus', array(
             'host_name',
             'host_alias',
             'host_address',
@@ -70,8 +102,8 @@ class Host extends MonitoredObject
             'host_notes_url',
             'host_modified_host_attributes',
             'host_problem',
-            'process_perfdata' => 'host_process_performance_data',
-        ))->where('host_name', $this->params->get('host'));
-        return $this->view->getQuery()->fetchRow();
+            'host_process_performance_data'
+        ))
+            ->where('host_name', $this->host);
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 3325ecc6b..1c1c80679 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -4,33 +4,83 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
-use Icinga\Module\Monitoring\DataView\ServiceStatus;
-use Icinga\Data\Db\DbQuery;
+use Icinga\Module\Monitoring\Backend;
 
+/**
+ * A Icinga service
+ */
 class Service extends MonitoredObject
 {
-    public $type   = 'service';
+    /**
+     * Type of the Icinga service
+     *
+     * @var string
+     */
+    public $type = self::TYPE_SERVICE;
+
+    /**
+     * Prefix of the Icinga service
+     *
+     * @var string
+     */
     public $prefix = 'service_';
 
-    protected function applyObjectFilter(DbQuery $query)
+    /**
+     * Host name the service is running on
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Service name
+     *
+     * @var string
+     */
+    protected $service;
+
+    /**
+     * Create a new service
+     *
+     * @param Backend   $backend    Backend to fetch service information from
+     * @param string    $host       Host name the service is running on
+     * @param string    $service    Service name
+     */
+    public function __construct(Backend $backend, $host, $service)
     {
-        return $query->where('service_host_name', $this->host_name)
-                     ->where('service_description', $this->service_description);
+        parent::__construct($backend);
+        $this->host = $host;
+        $this->service = $service;
     }
 
-    public function populate()
+    /**
+     * Get the host name the service is running on
+     *
+     * @return string
+     */
+    public function getHost()
     {
-        $this->fetchComments()
-            ->fetchServicegroups()
-            ->fetchContacts()
-            ->fetchContactGroups()
-            ->fetchCustomvars()
-            ->fetchDowntimes();
+        return $this->host;
     }
 
-    protected function getProperties()
+    /**
+     * Get the service name
+     *
+     * @return string
+     */
+    public function getService()
     {
-        $this->view = ServiceStatus::fromParams(array('backend' => null), array(
+        return $this->service;
+    }
+
+    /**
+     * Get the data view
+     *
+     * @return \Icinga\Module\Monitoring\DataView\ServiceStatus
+     */
+    protected function getDataView()
+    {
+        return $this->backend->select()->from('serviceStatus', array(
             'host_name',
             'host_state',
             'host_state_type',
@@ -114,30 +164,10 @@ class Service extends MonitoredObject
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
             'service_modified_service_attributes',
-            'process_perfdata' => 'service_process_performance_data',
-        ))->where('host_name', $this->params->get('host'))
-          ->where('service_description', $this->params->get('service'));
-
-        return $this->view->getQuery()->fetchRow();
-    }
-
-    /**
-     * Get the host name the service is running on
-     *
-     * @return string
-     */
-    public function getHostName()
-    {
-        return $this->params->get('host');
-    }
-
-    /**
-     * Get the service name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->params->get('service');
+            'service_process_performance_data',
+            'service_percent_state_change'
+        ))
+            ->where('host_name', $this->host)
+            ->where('service_description', $this->service);
     }
 }

From beecf16ad0cc266fac7ba6c7a61314d6fb306d60 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 10:18:48 +0200
Subject: [PATCH 215/277] lib: Add `InvalidPropertyException'

---
 library/Icinga/Exception/InvalidPropertyException.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 library/Icinga/Exception/InvalidPropertyException.php

diff --git a/library/Icinga/Exception/InvalidPropertyException.php b/library/Icinga/Exception/InvalidPropertyException.php
new file mode 100644
index 000000000..f79055f0b
--- /dev/null
+++ b/library/Icinga/Exception/InvalidPropertyException.php
@@ -0,0 +1,10 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Exception;
+
+/**
+ * Exception thrown if a property does not exist
+ */
+class InvalidPropertyException extends IcingaException {}

From 3f216f26ff016ea08e4060cbad81db06817a6d17 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 10:20:38 +0200
Subject: [PATCH 216/277] monitoring/commands: Remove superseded command forms
 and command objects

refs #6593
---
 .../forms/Command/AcknowledgeForm.php         | 154 -----
 .../application/forms/Command/CommentForm.php |  75 ---
 .../Common/ScheduleDowntimeCommandForm.php    | 153 -----
 .../forms/Command/CustomNotificationForm.php  |  93 ---
 .../forms/Command/DelayNotificationForm.php   |  65 --
 .../DisableNotificationWithExpireForm.php     |  56 --
 .../forms/Command/MultiCommandFlagForm.php    | 147 -----
 .../forms/Command/RescheduleNextCheckForm.php |  82 ---
 .../forms/Command/ScheduleDowntimeForm.php    | 336 ----------
 .../ScheduleServiceDowntimeCommandForm.php    | 113 ----
 .../Command/SingleArgumentCommandForm.php     | 169 -----
 .../Command/SubmitPassiveCheckResultForm.php  | 177 -----
 .../forms/Command/WithChildrenCommandForm.php |  37 --
 .../Monitoring/Command/AcknowledgeCommand.php | 164 -----
 .../Monitoring/Command/AddCommentCommand.php  |  79 ---
 .../Monitoring/Command/CommandPipe.php        | 603 ------------------
 .../library/Monitoring/Command/Comment.php    |  61 --
 .../Command/Common/AddCommentCommand.php      |  50 --
 .../Command/Common/ObjectCommand.php          |  62 --
 .../Common/ScheduleDowntimeCommand.php        | 193 ------
 .../Command/Common/ToggleFeature.php          |  42 --
 .../Command/Common/WithCommentCommand.php     |  71 ---
 .../Command/CustomNotificationCommand.php     | 139 ----
 .../Command/DelayNotificationCommand.php      |  87 ---
 .../DisableNotificationWithExpireCommand.php  |  92 ---
 .../Exception/InvalidCommandException.php     |  12 -
 .../Monitoring/Command/PropertyModifier.php   | 110 ----
 .../Command/ScheduleCheckCommand.php          | 108 ----
 .../Command/Service/AddServiceComment.php     |  34 -
 .../ScheduleServiceDowntimeCommand.php        |  59 --
 .../Command/SingleArgumentCommand.php         | 183 ------
 .../SubmitPassiveCheckresultCommand.php       | 133 ----
 32 files changed, 3939 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Command/AcknowledgeForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/CommentForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/CustomNotificationForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/DelayNotificationForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
 delete mode 100644 modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/CommandPipe.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Comment.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/PropertyModifier.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
 delete mode 100644 modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php

diff --git a/modules/monitoring/application/forms/Command/AcknowledgeForm.php b/modules/monitoring/application/forms/Command/AcknowledgeForm.php
deleted file mode 100644
index 4ac4901b0..000000000
--- a/modules/monitoring/application/forms/Command/AcknowledgeForm.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Web\Form\Element\DateTimePicker;
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Util\DateTimeFactory;
-use Icinga\Module\Monitoring\Command\AcknowledgeCommand;
-
-/**
- * Form for problem acknowledgements
- */
-class AcknowledgeForm extends CommandForm
-{
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->addNote(
-            t(
-                '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.'
-            )
-        );
-
-        $this->addElement($this->createAuthorField());
-
-        $this->addElement(
-            'textarea',
-            'comment',
-            array(
-                'label'     => t('Comment'),
-                'rows'      => 4,
-                'cols'      => 72,
-                'required'  => true,
-                'helptext'  => t(
-                    ' 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.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'persistent',
-            array(
-                'label'    => t('Persistent Comment'),
-                'value'    => false,
-                'helptext' => t(
-                    'If you would like the comment to remain even when the acknowledgement is removed, '
-                    . 'check this option.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'expire',
-            array(
-                'label'    => t('Use Expire Time'),
-                'helptext' => t('If the acknowledgement should expire, check this option.')
-            )
-        );
-        $this->enableAutoSubmit(array('expire'));
-
-        if ($this->getRequest()->getPost('expire', '0') === '1') {
-            $now = DateTimeFactory::create();
-            $this->addElement(
-                new DateTimePicker(
-                    array(
-                        'name'      => 'expiretime',
-                        'label'     => t('Expire Time'),
-                        'value'     => $now->getTimestamp() + 3600,
-                        'patterns'  => $this->getValidDateTimeFormats(),
-                        'helptext'  => t(
-                            'Enter the expire date/time for this acknowledgement here. Icinga will '
-                            . ' delete the acknowledgement after this date expired.'
-                        ),
-                        'jspicker'  => true
-                    )
-                )
-            );
-        }
-
-        $this->addElement(
-            'checkbox',
-            'sticky',
-            array(
-                'label'    => t('Sticky Acknowledgement'),
-                'value'    => true,
-                'helptext' => t(
-                    'If you want the acknowledgement to disable notifications until the host/service '
-                    . 'recovers, check this option.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'notify',
-            array(
-                'label'    => t('Send Notification'),
-                'value'    => true,
-                'helptext' => t(
-                    'If you do not want an acknowledgement notification to be sent out to the appropriate '
-                    . 'contacts, uncheck this option.'
-                )
-            )
-        );
-
-        $this->setSubmitLabel(t('Acknowledge Problem'));
-
-        parent::create();
-    }
-
-    /**
-     * Add validator for dependent fields
-     *
-     * @param   array $data
-     *
-     * @see     \Icinga\Web\Form::preValidation()
-     */
-    protected function preValidation(array $data)
-    {
-        if (isset($data['expire']) && intval($data['expire']) === 1) {
-            $expireTime = $this->getElement('expiretime');
-            $expireTime->setRequired(true);
-        }
-    }
-
-    /**
-     * Create the acknowledgement command object
-     *
-     * @return AcknowledgeCommand
-     */
-    public function createCommand()
-    {
-        return new AcknowledgeCommand(
-            new Comment(
-                $this->getAuthorName(),
-                $this->getValue('comment'),
-                $this->getValue('persistent')
-            ),
-            $this->getValue('expire') ? $this->getValue('expire') : -1,
-            $this->getValue('notify'),
-            $this->getValue('sticky')
-        );
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/CommentForm.php b/modules/monitoring/application/forms/Command/CommentForm.php
deleted file mode 100644
index 497c276f1..000000000
--- a/modules/monitoring/application/forms/Command/CommentForm.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Module\Monitoring\Command\AddCommentCommand;
-
-/**
- * Form for adding comment commands
- */
-class CommentForm extends CommandForm
-{
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->setName('form_CommentForm');
-
-        $this->addNote(t('This command is used to add a comment to hosts or services.'));
-
-        $this->addElement($this->createAuthorField());
-
-        $this->addElement(
-            'textarea',
-            'comment',
-            array(
-                'label'    => t('Comment'),
-                'rows'     => 4,
-                'cols'     => 72,
-                'required' => true,
-                'helptext' => t(
-                    '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.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'persistent',
-            array(
-                'label'    => t('Persistent'),
-                'value'    => true,
-                'helptext' => t(
-                    'If you uncheck this option, the comment will automatically be deleted the next time '
-                    . 'Icinga is restarted.'
-                )
-            )
-        );
-
-        $this->setSubmitLabel(t('Post Comment'));
-
-        parent::create();
-    }
-
-    /**
-     * Create the command object to add comments
-     *
-     * @return AddCommentCommand
-     */
-    public function createCommand()
-    {
-        return new AddCommentCommand(
-            new Comment(
-                $this->getAuthorName(),
-                $this->getValue('comment'),
-                $this->getValue('persistent')
-            )
-        );
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php
deleted file mode 100644
index d48b814e7..000000000
--- a/modules/monitoring/application/forms/Command/Common/ScheduleDowntimeCommandForm.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Common;
-
-use DateTime;
-use DateInterval;
-use Icinga\Module\Monitoring\Form\Command\CommandForm;
-use Icinga\Web\Form\Element\DateTimePicker;
-use Icinga\Web\Form\Element\Number;
-
-/**
- * Base class for downtime command forms on an Icinga instance
- */
-abstract class ScheduleDowntimeCommandForm extends CommandForm
-{
-    /**
-     * Fixed downtime
-     */
-    const FIXED = 'fixed';
-
-    /**
-     * Flexible downtime
-     */
-    const FLEXIBLE = 'flexible';
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
-     */
-    public function createElements(array $formData = array())
-    {
-        $start = new DateTime;
-        $end = clone $start;
-        $end->add(new DateInterval('PT1H'));
-        $this->addElements(array(
-            array(
-                'textarea',
-                'comment',
-                array(
-                    'required'      => true,
-                    '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.'
-                    )
-                )
-            ),
-            new DateTimePicker(
-                'start',
-                array(
-                    'required'      => true,
-                    'label'         => t('Start Time'),
-                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
-                    'value'         => $start
-                )
-            ),
-            new DateTimePicker(
-                'end',
-                array(
-                    'required'      => true,
-                    'label'         => t('End Time'),
-                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
-                    'value'         => $end
-                )
-            ),
-            array(
-                'select',
-                'type',
-                array(
-                    'required'      => true,
-                    'autosubmit'    => true,
-                    '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     => mt('monitoring', 'Fixed'),
-                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
-                    ),
-                    'validators' => array(
-                        array(
-                            'InArray',
-                            true,
-                            array(array(self::FIXED, self::FLEXIBLE))
-                        )
-                    )
-                )
-            )
-        ));
-        $this->addDisplayGroup(
-            array('start', 'end'),
-            'start-end',
-            array(
-                'decorators' => array(
-                    'FormElements',
-                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
-                )
-            )
-        );
-        if (isset($formData['type']) && $formData['type'] === self::FLEXIBLE) {
-            $this->addElements(array(
-                new Number(
-                    'hours',
-                    array(
-                        'required'  => true,
-                        'label'     => mt('monitoring', 'Hours'),
-                        'value'     => 2,
-                        'min'       => -1
-                    )
-                ),
-                new Number(
-                    'minutes',
-                    array(
-                        'required'  => true,
-                        'label'     => mt('monitoring', 'Minutes'),
-                        'value'     => 0,
-                        'min'       => -1
-                    )
-                )
-            ));
-            $this->addDisplayGroup(
-                array('hours', 'minutes'),
-                'duration',
-                array(
-                    '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.'
-                    ),
-                    'decorators' => array(
-                        'FormElements',
-                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group')),
-                        array(
-                            'Description',
-                            array('tag' => 'span', 'class' => 'description', 'placement' => 'prepend')
-                        ),
-                        'Fieldset'
-                    )
-                )
-            );
-        }
-        return $this;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/CustomNotificationForm.php b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
deleted file mode 100644
index 9eb75a67b..000000000
--- a/modules/monitoring/application/forms/Command/CustomNotificationForm.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Module\Monitoring\Command\CustomNotificationCommand;
-
-/**
- * For for command CustomNotification
- */
-class CustomNotificationForm extends CommandForm
-{
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->addNote(
-            t(
-                '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.'
-            )
-        );
-
-        $this->addElement($this->createAuthorField());
-
-        $this->addElement(
-            'textarea',
-            'comment',
-            array(
-                'label'    => t('Comment'),
-                'rows'     => 4,
-                'cols'     => 72,
-                'required' => true,
-                'helptext' => t(
-                    '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.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'forced',
-            array(
-                'label'    => t('Forced'),
-                'helptext' => t(
-                    '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.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'checkbox',
-            'broadcast',
-            array(
-                'label'    => t('Broadcast'),
-                'helptext' => t(
-                    '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.'
-                )
-            )
-        );
-
-        $this->setSubmitLabel(t('Send Custom Notification'));
-
-        parent::create();
-    }
-
-    /**
-     * Create the command object to send custom notifications
-     *
-     * @return CustomNotificationCommand
-     */
-    public function createCommand()
-    {
-        return new CustomNotificationCommand(
-            new Comment(
-                $this->getAuthorName(),
-                $this->getValue('comment')
-                ),
-            $this->getValue('forced'),
-            $this->getValue('broadcast')
-        );
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/DelayNotificationForm.php b/modules/monitoring/application/forms/Command/DelayNotificationForm.php
deleted file mode 100644
index efb6eae0f..000000000
--- a/modules/monitoring/application/forms/Command/DelayNotificationForm.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Module\Monitoring\Command\DelayNotificationCommand;
-
-/**
- * Form for the delay notification command
- */
-class DelayNotificationForm extends CommandForm
-{
-    /**
-     * Maximum delay amount in minutes
-     */
-    const MAX_DELAY = 1440; // 1 day
-
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->addNote(t('This command is used to delay the next problem notification that is sent out.'));
-
-        $this->addElement(
-            'text',
-            'minutes',
-            array(
-                'label'         => t('Notification Delay (Minutes From Now)'),
-                'style'         => 'width: 80px;',
-                'value'         => 0,
-                'required'      => true,
-                'validators'    => array(
-                    array(
-                        'between',
-                        true,
-                        array(
-                            'min' => 1,
-                            'max' => self::MAX_DELAY
-                        )
-                    )
-                ),
-                'helptext'      => t(
-                    'The notification delay will be disregarded if the host/service changes state before the next '
-                    . 'notification is scheduled to be sent out.'
-                )
-            )
-        );
-
-        $this->setSubmitLabel(t('Delay Notification'));
-
-        parent::create();
-    }
-
-    /**
-     * Create the command object to delay notifications
-     *
-     * @return DelayNotificationCommand
-     */
-    public function createCommand()
-    {
-        return new DelayNotificationCommand($this->getValue('minutes') * 60);
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php b/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
deleted file mode 100644
index d6657dd37..000000000
--- a/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Module\Monitoring\Command\DisableNotificationWithExpireCommand;
-use Icinga\Util\DateTimeFactory;
-use Icinga\Web\Form\Element\DateTimePicker;
-
-/**
- * Provide expiration when notifications should be disabled
- */
-class DisableNotificationWithExpireForm extends CommandForm
-{
-    /**
-     * Build form content
-     */
-    protected function create()
-    {
-        $this->addNote('Disable notifications for a specific time on a program-wide basis');
-
-        $now = DateTimeFactory::create();
-        $this->addElement(
-            new DateTimePicker(
-                array(
-                    'name'      => 'expiretime',
-                    'label'     => t('Expire Time'),
-                    'value'     => $now->getTimestamp() + 3600,
-                    'patterns'  => $this->getValidDateTimeFormats(),
-                    'helptext'  => t(
-                        'Enter the expire date/time for this acknowledgement here. Icinga will '
-                        . ' delete the acknowledgement after this date expired.'
-                    )
-                )
-            )
-        );
-
-        $this->setSubmitLabel('Disable notifications');
-
-        parent::create();
-    }
-
-
-    /**
-     * Create command object for CommandPipe protocol
-     *
-     * @return AcknowledgeCommand
-     */
-    public function createCommand()
-    {
-        $command = new DisableNotificationWithExpireCommand();
-        $command->setExpirationTimestamp($this->getValue('expiretime'));
-        return $command;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php b/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
deleted file mode 100644
index e413848c8..000000000
--- a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Web\Form\Element\TriStateCheckbox;
-use Icinga\Web\Form;
-use Zend_Form_Element_Hidden;
-use Zend_Form;
-
-/**
- * A form to edit multiple command flags of multiple commands at once. When some commands have
- * different flag values, these flags will be displayed as an undefined state,
- * in a tri-state checkbox.
- */
-class MultiCommandFlagForm extends Form {
-
-    /**
-     * The Suffix used to mark the old values in the form-field
-     *
-     * @var string
-     */
-    const OLD_VALUE_MARKER = '_old_value';
-
-    /**
-     * The object properties to change
-     *
-     * @var array
-     */
-    private $flags;
-
-    /**
-     * The current values of this form
-     *
-     * @var array
-     */
-    private $values;
-
-    /**
-     * Create a new MultiCommandFlagForm
-     *
-     * @param array $flags  The flags that will be used. Should contain the
-     *                      names of the used property keys.
-     */
-    public function __construct(array $flags)
-    {
-        $this->flags = $flags;
-        parent::__construct();
-        $this->setEnctype(Zend_Form::ENCTYPE_MULTIPART);
-    }
-
-    /**
-     * Initialise the form values with the array of items to configure.
-     *
-     * @param mixed     $items    The items that will be edited with this form.
-     */
-    public function initFromItems($items)
-    {
-        $this->values = $this->valuesFromObjects($items);
-        $this->buildForm();
-        $this->populate($this->values);
-    }
-
-    /**
-     * Return only the values that have been updated.
-     */
-    public function getChangedValues()
-    {
-        $values = $this->getValues();
-        $changed = array();
-        foreach ($values as $key => $value) {
-            $oldKey = $key . self::OLD_VALUE_MARKER;
-            if (array_key_exists($oldKey, $values)) {
-                if ($values[$oldKey] !== $value) {
-                    $changed[$key] = $value;
-                }
-            }
-        }
-        return $changed;
-    }
-
-    private function valuesFromObjects($items)
-    {
-        $values = array();
-        foreach ($items as $item) {
-            foreach ($this->flags as $key => $unused) {
-                if (isset($item->{$key})) {
-                    $value = $item->{$key};
-                    // convert strings
-                    if ($value === '1' || $value === '0') {
-                        $value = intval($value);
-                    }
-                    // init key with first value
-                    if (!array_key_exists($key, $values)) {
-                        $values[$key] = $value;
-                        continue;
-                    }
-                    // already a mixed state ?
-                    if ($values[$key] === 'unchanged') {
-                        continue;
-                    }
-                    // values differ?
-                    if ($values[$key] ^ $value) {
-                        $values[$key] = 'unchanged';
-                    }
-                }
-            }
-        }
-        $old = array();
-        foreach ($values as $key => $value) {
-            $old[$key . self::OLD_VALUE_MARKER] = $value;
-        }
-        return array_merge($values, $old);
-    }
-
-    public function buildCheckboxes()
-    {
-        $checkboxes = array();
-        foreach ($this->flags as $flag => $description) {
-            $checkboxes[] = new TriStateCheckbox(
-                $flag,
-                array(
-                    'label' => $description,
-                    'required' => true
-                )
-            );
-        }
-        return $checkboxes;
-    }
-
-    /**
-     * Create the multi flag form
-     *
-     * @see Form::create()
-     */
-    public function create()
-    {
-        $this->setName('form_flag_configuration');
-        foreach ($this->buildCheckboxes() as $checkbox) {
-            $this->addElement($checkbox);
-            $old = new Zend_Form_Element_Hidden($checkbox->getName() . self::OLD_VALUE_MARKER);
-            $this->addElement($old);
-        }
-        $this->setSubmitLabel('Save Configuration');
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php b/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
deleted file mode 100644
index cb7ab90f1..000000000
--- a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Zend_Form_Element_Checkbox;
-use Icinga\Util\DateTimeFactory;
-use Icinga\Web\Form\Element\DateTimePicker;
-use Icinga\Module\Monitoring\Command\ScheduleCheckCommand;
-
-/**
- * Form for scheduling checks
- */
-class RescheduleNextCheckForm extends WithChildrenCommandForm
-{
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->addNote(
-            t(
-                'This command is used to schedule the next check of hosts/services. Icinga will re-queue the '
-                . 'check at the time you specify.'
-            )
-        );
-
-        $this->addElement(
-            new DateTimePicker(
-                array(
-                    'name'      => 'checktime',
-                    'label'     => t('Check Time'),
-                    'patterns'  => $this->getValidDateTimeFormats(),
-                    'value'     => DateTimeFactory::create()->getTimestamp(),
-                    'required'  => !$this->getRequest()->getPost('forcecheck'),
-                    'helptext'  => t('Set the date/time when this check should be executed.')
-                )
-            )
-        );
-
-        $this->addElement(
-            new Zend_Form_Element_Checkbox(
-                array(
-                    'name'     => 'forcecheck',
-                    'label'    => t('Force Check'),
-                    'value'    => true,
-                    'helptext' => t(
-                        '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.'
-                    )
-                )
-            )
-        );
-
-        // TODO: As of the time of writing it's possible to set hosts AND services as affected by this command but
-        // with children only makes sense on hosts
-        if ($this->getWithChildren() === true) {
-            $this->addNote(t('TODO: Help message when with children is enabled'));
-        } else {
-            $this->addNote(t('TODO: Help message when with children is disabled'));
-        }
-
-        $this->setSubmitLabel(t('Reschedule Check'));
-
-        parent::create();
-    }
-
-    /**
-     * Create the command object to schedule checks
-     *
-     * @return ScheduleCheckCommand
-     */
-    public function createCommand()
-    {
-        $command = new ScheduleCheckCommand(
-            $this->getValue('checktime'),
-            $this->getValue('forcecheck')
-        );
-        return $command->excludeHost($this->getWithChildren());
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
deleted file mode 100644
index 73ce2666c..000000000
--- a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Module\Monitoring\Object\MonitoredObject;
-use Zend_Form_Element_Text;
-use Zend_Validate_GreaterThan;
-use Zend_Validate_Digits;
-use Icinga\Web\Form\Element\DateTimePicker;
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Util\DateTimeFactory;
-use Icinga\Module\Monitoring\Backend;
-use Icinga\Module\Monitoring\Command\ScheduleDowntimeCommand;
-use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Web\Url;
-
-/**
- * Form for scheduling downtimes
- */
-class ScheduleDowntimeForm extends WithChildrenCommandForm
-{
-    /**
-     * Type constant for fixed downtimes
-     */
-    const  TYPE_FIXED = 'fixed';
-
-    /**
-     * Type constant for flexible downtimes
-     */
-    const TYPE_FLEXIBLE = 'flexible';
-
-    private $downtimes;
-
-    /**
-     * Initialize form
-     */
-    public function init()
-    {
-        $this->setName('ScheduleDowntimeForm');
-    }
-
-    /**
-     * Generate translated multi options based on type constants
-     *
-     * @return array
-     */
-    private function getDowntimeTypeOptions()
-    {
-        return array(
-            self::TYPE_FIXED    => t('Fixed'),
-            self::TYPE_FLEXIBLE => t('Flexible')
-        );
-    }
-
-    /**
-     * Fetch all available downtimes from the database
-     *
-     * @return array
-     */
-    private function getCurrentDowntimes()
-    {
-        if (isset($this->downtimes)) {
-            return $this->downtimes;
-        }
-
-        $cfg = $this->getConfiguration();
-        $preferences = $this->getUserPreferences();
-        $object = MonitoredObject::fromParams(Url::fromRequest()->getParams());
-        $object->fetchDowntimes();
-        $downtimes = $object->downtimes;
-/*
-
-        $downtimes = Backend::createBackend($this->getRequest()->getParam('backend'))->select()
-            ->from(
-                'downtime',
-                array(
-                    'host',
-                    'service',
-                    'downtime_start',
-                    'downtime_scheduled_start_time',
-                    'downtime_internal_downtime_id'
-                )
-            )->fetchAll();
-*/
-        $options = array(
-            '0' =>  'No Triggered Downtime'
-        );
-        $dateFormat = $this->getView()->dateFormat();
-        foreach ($downtimes as $downtime) {
-            $label = sprintf(
-                'ID %s: %s%s Starting @ %s',
-                $downtime->id,
-                $object->host_name,
-                $object instanceof Service ? ' (' . $object->service_description . ')' : '',
-                $dateFormat->formatDateTime($downtime->scheduled_start)
-            );
-            $options[$downtime->id] = $label;
-        }
-        return $options;
-    }
-
-    /**
-     * Set the downtimes displayed by this form (used for testing)
-     *
-     * @param   array   $downtimes  list of strings
-     */
-    public function setCurrentDowntimes($downtimes)
-    {
-        $this->downtimes = $downtimes;
-    }
-
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->addNote(
-            t(
-                '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.'
-            )
-        );
-
-        $this->addElement($this->createAuthorField());
-
-        $this->addElement(
-            'textarea',
-            'comment',
-            array(
-                'label'    => t('Comment'),
-                'rows'     => 4,
-                'cols'     => 72,
-                'required' => true,
-                'helptext' => t(
-                    '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.'
-                )
-            )
-        );
-
-        $this->addElement(
-            'select',
-            'triggered',
-            array(
-                'label'        => t('Triggered by'),
-                'required'     => true,
-                'multiOptions' => $this->getCurrentDowntimes()
-            )
-        );
-
-        $now = DateTimeFactory::create();
-
-        $this->addElement(
-            new DateTimePicker(
-                array(
-                    'name'      => 'starttime',
-                    'label'     => t('Start Time'),
-                    'value'     => $now->getTimestamp(),
-                    'patterns'  => $this->getValidDateTimeFormats(),
-                    'helptext'  => t('Set the start date/time for the downtime.')
-                )
-            )
-        );
-        $this->addElement(
-            new DateTimePicker(
-                array(
-                    'name'      => 'endtime',
-                    'label'     => t('End Time'),
-                    'value'     => $now->getTimestamp() + 3600,
-                    'patterns'  => $this->getValidDateTimeFormats(),
-                    'helptext'  => t('Set the end date/time for the downtime.')
-                )
-            )
-        );
-
-        $this->addElement(
-            'select',
-            'type',
-            array(
-                'label'        => t('Downtime Type'),
-                'multiOptions' => $this->getDowntimeTypeOptions(),
-                'required'     => true,
-                'validators'   => array(
-                    array(
-                        'InArray',
-                        true,
-                        array(
-                            array_keys($this->getDowntimeTypeOptions())
-                        )
-                    )
-                ),
-                'helptext'     => t(
-                    '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.'
-                )
-            )
-        );
-        $this->enableAutoSubmit(array('type'));
-
-        if ($this->getRequest()->getPost('type') === self::TYPE_FLEXIBLE) {
-            $hoursText = new Zend_Form_Element_Text('hours');
-            $hoursText->setLabel(t('Flexible Duration'));
-            $hoursText->setAttrib('style', 'width: 40px;');
-            $hoursText->setValue(1);
-            $hoursText->addDecorator('HtmlTag', array('tag' => 'dd', 'openOnly' => true));
-            $hoursText->addDecorator(
-                'Callback',
-                array(
-                    'callback' => function () {
-                        return t('Hours');
-                    }
-                )
-            );
-            $minutesText = new Zend_Form_Element_Text('minutes');
-            $minutesText->setLabel(t('Minutes'));
-            $minutesText->setAttrib('style', 'width: 40px;');
-            $minutesText->setValue(0);
-            $minutesText->removeDecorator('HtmlTag');
-            $minutesText->removeDecorator('Label');
-            $minutesText->addDecorator(
-                'Callback',
-                array(
-                    'callback' => function () {
-                        return t('Minutes');
-                    }
-                )
-            );
-            $this->addElements(array($hoursText, $minutesText));
-            $this->addNote(
-                t(
-                    'Enter here the duration of the downtime. Icinga will automatically delete the downtime '
-                    . 'after this time expired.'
-                )
-            );
-        }
-
-        // TODO: As of the time of writing it's possible to set hosts AND services as affected by this command but
-        // with children only makes sense on hosts
-        if ($this->getWithChildren() === true) {
-            $this->addNote(t('TODO: Help message when with children is enabled'));
-        } else {
-            $this->addElement(
-                'select',
-                'childobjects',
-                array(
-                    'label'        => t('Child Objects'),
-                    'required'     => true,
-                    'multiOptions' => array(
-                        0 => t('Do nothing with child objects'),
-                        1 => t('Schedule triggered downtime for all child objects'),
-                        2 => t('Schedule non-triggered downtime for all child objects')
-                    ),
-                    'validators'   => array(
-                        array(
-                            'Digits',
-                            true
-                        ),
-                        array(
-                            'InArray',
-                            true,
-                            array(
-                                array(0, 1, 2)
-                            )
-                        )
-                    )
-                )
-            );
-            $this->addNote(t('TODO: Help message when with children is disabled'));
-        }
-
-        $this->setSubmitLabel(t('Schedule Downtime'));
-
-        parent::create();
-    }
-
-    /**
-     * Change validators at runtime
-     *
-     * @param array $data   The user provided data that will go into validation
-     *
-     * @see Form::preValidation
-     */
-    protected function preValidation(array $data)
-    {
-        /*
-         * Other values needed when downtime type change to flexible
-         */
-        if (isset($data['type']) && $data['type'] === self::TYPE_FLEXIBLE) {
-            $greaterThanValidator = new Zend_Validate_GreaterThan(-1);
-            $digitsValidator = new Zend_Validate_Digits();
-
-            $hours = $this->getElement('hours');
-            $hours->setRequired(true);
-            $hours->addValidator($digitsValidator, true);
-            $hours->addValidator($greaterThanValidator, true);
-
-            $minutes = $this->getElement('minutes');
-            $minutes->setRequired(true);
-            $minutes->addValidator($digitsValidator, true);
-            $minutes->addValidator($greaterThanValidator, true);
-        }
-    }
-
-    /**
-     * Create ScheduleDowntimeCommand object
-     *
-     * @return ScheduleDowntimeCommand
-     */
-    public function createCommand()
-    {
-        // TODO: Add support for host-/servicegroups and services only (#4588)
-        $command = new ScheduleDowntimeCommand(
-            $this->getValue('starttime'),
-            $this->getValue('endtime'),
-            new Comment(
-                $this->getRequest()->getUser()->getUsername(),
-                $this->getValue('comment')
-                ),
-            $this->getValue('type') === self::TYPE_FIXED,
-            $this->getValue('hours') * 3600 + $this->getValue('minutes') * 60,
-            $this->getValue('triggered')
-        );
-
-        return $command->includeChildren(
-            $this->getWithChildren(),
-            $this->getValue('childobjects') === 1
-        );
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php
deleted file mode 100644
index 7f13034a0..000000000
--- a/modules/monitoring/application/forms/Command/Service/ScheduleServiceDowntimeCommandForm.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command\Service;
-
-use Icinga\Module\Monitoring\Command\Service\ScheduleServiceDowntimeCommand;
-use Icinga\Module\Monitoring\Form\Command\Common\ScheduleDowntimeCommandForm;
-use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Web\Notification;
-use Icinga\Web\Request;
-
-/**
- * Form for scheduling a service downtime on an Icinga instance
- */
-class ScheduleServiceDowntimeCommandForm extends ScheduleDowntimeCommandForm
-{
-    /**
-     * Service to set in downtime
-     *
-     * @var Service
-     */
-    protected $service;
-
-    /**
-     * Set the service to set in downtime
-     *
-     * @param   Service $service
-     *
-     * @return  $this
-     */
-    public function setService(Service $service)
-    {
-        $this->service = $service;
-        return $this;
-    }
-
-    /**
-     * Get the service to set in downtime
-     *
-     * @return Service
-     */
-    public function getService()
-    {
-        return $this->service;
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
-     */
-    public function init()
-    {
-        $this->setSubmitLabel(mt('monitoring', 'Schedule Service Downtime'));
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
-     */
-    public function createElements(array $formData = array())
-    {
-        $this->addElement(
-            'note',
-            'command-info',
-            array(
-                'value' => mt(
-                    'monitoring',
-                    'This command is used to schedule a service downtime. During the specified downtime,'
-                    . ' Icinga will not send notifications out about the service. When the scheduled downtime'
-                    . ' expires, Icinga will send out notifications for the service as it normally would.'
-                    . ' Scheduled downtimes are preserved across program shutdowns and restarts.'
-                )
-            )
-        );
-        parent::createElements($formData);
-        return $this;
-    }
-
-    /**
-     * Get the command which is to be sent to an Icinga instance
-     *
-     * @return ScheduleServiceDowntimeCommand
-     */
-    public function getCommand()
-    {
-        return new ScheduleServiceDowntimeCommand();
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
-     */
-    public function onSuccess(Request $request)
-    {
-        $scheduleDowntime = $this->getCommand();
-        $scheduleDowntime->setService($this->service);
-        $scheduleDowntime->setComment($this->getElement('comment')->getValue());
-        $scheduleDowntime->setAuthor($request->getUser());
-        $scheduleDowntime->setStart($this->getElement('start')->getValue());
-        $scheduleDowntime->setEnd($this->getElement('end')->getValue());
-        if ($this->getElement('type')->getValue() === self::FLEXIBLE) {
-            $scheduleDowntime->setFlexible();
-            $scheduleDowntime->setDuration(
-                (float) $this->getElement('hours')->getValue() * 3600
-                + (float) $this->getElement('minutes')->getValue() * 60
-            );
-        }
-        $this->getTransport($request)->send($scheduleDowntime);
-        Notification::success(mt('monitoring', 'Scheduling service downtime..'));
-        return true;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php b/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
deleted file mode 100644
index d7228ebdf..000000000
--- a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Zend_Controller_Request_Abstract;
-use Zend_Form_Element_Hidden;
-use Icinga\Module\Monitoring\Command\AcknowledgeCommand;
-use Icinga\Module\Monitoring\Command\SingleArgumentCommand;
-
-/**
- * Sending commands to core which only have one value
- */
-class SingleArgumentCommandForm extends CommandForm
-{
-    /**
-     * Name of host command
-     *
-     * @var string
-     */
-    private $hostCommand;
-
-    /**
-     * Name of service command
-     *
-     * @var string
-     */
-    private $serviceCommand;
-
-    /**
-     * Name of global command
-     *
-     * @var array
-     */
-    private $globalCommands = array();
-
-    /**
-     * Name of the parameter used as value
-     *
-     * @var string
-     */
-    private $parameterName;
-
-    /**
-     * Value of used parameter
-     *
-     * @var mixed
-     */
-    private $parameterValue;
-
-    /**
-     * Flag to ignore object name
-     *
-     * @var bool
-     */
-    private $ignoreObject = false;
-
-    /**
-     * Set command names
-     *
-     * @param string $hostCommand       Name of host command
-     * @param string $serviceCommand    Name of service command
-     */
-    public function setCommand($hostCommand, $serviceCommand = null)
-    {
-        $this->hostCommand = $hostCommand;
-
-        if ($serviceCommand !== null) {
-            $this->serviceCommand = $serviceCommand;
-        }
-    }
-
-    /**
-     * Setter for global commands
-     *
-     * @param string $hostOrGenericGlobalCommand    Generic command or one for host
-     * @param string $serviceGlobalCommand          If any (leave blank if you need a global global)
-     */
-    public function setGlobalCommands($hostOrGenericGlobalCommand, $serviceGlobalCommand = null)
-    {
-        $this->globalCommands[] = $hostOrGenericGlobalCommand;
-
-        if ($serviceGlobalCommand !== null) {
-            $this->globalCommands[] = $serviceGlobalCommand;
-        }
-    }
-
-    /**
-     * Use an explicit value to send with command
-     *
-     * @param mixed $parameterValue
-     */
-    public function setParameterValue($parameterValue)
-    {
-        $this->parameterValue = $parameterValue;
-    }
-
-    /**
-     * Use a form field to take the value from
-     *
-     * @param string $parameterName
-     */
-    public function setParameterName($parameterName)
-    {
-        $this->parameterName = $parameterName;
-    }
-
-    /**
-     * Flag to ignore every objects
-     *
-     * @param bool $flag
-     */
-    public function setObjectIgnoreFlag($flag = true)
-    {
-        $this->ignoreObject = (bool) $flag;
-    }
-
-    /**
-     *
-     */
-    protected function create()
-    {
-        if ($this->parameterName) {
-            $field = new Zend_Form_Element_Hidden($this->parameterName);
-            $value = $this->getRequest()->getParam($field->getName());
-            $field->setValue($value);
-            $this->addElement($field);
-        }
-        parent::create();
-    }
-
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        parent::setRequest($request);
-
-        if ($this->globalCommand === true) {
-            $this->setParameterName('global');
-        }
-    }
-
-
-    /**
-     * Create command object for CommandPipe protocol
-     *
-     * @return SingleArgumentCommand
-     */
-    public function createCommand()
-    {
-        $command = new SingleArgumentCommand();
-
-        if ($this->parameterValue !== null) {
-            $command->setValue($this->parameterValue);
-        } else {
-            $command->setValue($this->getValue($this->parameterName));
-        }
-
-        if ($this->provideGlobalCommand() == true) {
-            $command->setGlobalCommands($this->globalCommands);
-            $this->ignoreObject = true;
-        } else {
-            $command->setCommand($this->hostCommand, $this->serviceCommand);
-        }
-
-        $command->setObjectIgnoreFlag($this->ignoreObject);
-
-        return $command;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
deleted file mode 100644
index c2c9151f3..000000000
--- a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-use Icinga\Exception\ProgrammingError;
-
-/**
- * Form for submitting passive check results
- */
-class SubmitPassiveCheckResultForm extends CommandForm
-{
-    /**
-     * Type constant for host form
-     */
-    const TYPE_HOST = 'host';
-
-    /**
-     * Type constant for service form
-     */
-    const TYPE_SERVICE = 'service';
-
-    /**
-     * List of choices for plugin states
-     * @var array
-     */
-    private static $options = array();
-
-    /**
-     * Type of form
-     * @var string
-     */
-    private $type;
-
-    /**
-     * Setup plugin states
-     *
-     * @see Zend_Form::init
-     */
-    public function init()
-    {
-        if (!count(self::$options)) {
-            self::$options = array(
-                self::TYPE_HOST => array(
-                    0 => t('UP'),
-                    1 => t('DOWN'),
-                    2 => t('UNREACHABLE')
-                ),
-                self::TYPE_SERVICE => array(
-                    0 => t('OK'),
-                    1 => t('WARNING'),
-                    2 => t('CRITICAL'),
-                    3 => t('UNKNOWN')
-                )
-            );
-        }
-
-        parent::init();
-    }
-
-    /**
-     * Setter for type
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * Getter for type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Return array of options
-     *
-     * @return array
-     * @throws \Icinga\Exception\ProgrammingError
-     */
-    public function getOptions()
-    {
-        if (in_array($this->getType(), array(self::TYPE_HOST, self::TYPE_SERVICE)) === false) {
-            throw new ProgrammingError('Type is not valid');
-        }
-
-        return self::$options[$this->getType()];
-    }
-
-    /**
-     * Create the form's elements
-     */
-    protected function create()
-    {
-        $this->setName('form_submit_passive_checkresult');
-
-        $this->addNote(
-            t(
-                '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.'
-            )
-        );
-
-        $this->addElement(
-            'select',
-            'pluginstate',
-            array(
-                'label'        => t('Check Result'),
-                'multiOptions' => $this->getOptions(),
-                'required'     => true,
-                'validators'   => array(
-                    array(
-                        'Digits',
-                        true
-                    ),
-                    array(
-                        'InArray',
-                        true,
-                        array(
-                            array_keys($this->getOptions())
-                        )
-                    )
-                ),
-                'helptext'     => t('Set the state which should be send to Icinga for this objects.')
-            )
-        );
-
-        $this->addElement(
-            'textarea',
-            'checkoutput',
-            array(
-                'label'    => t('Check Output'),
-                'rows'     => 2,
-                'cols'     => 72,
-                'required' => true,
-                'helptext' => t('Fill in the check output string which should be send to Icinga.')
-            )
-        );
-
-        $this->addElement(
-            'textarea',
-            'performancedata',
-            array(
-                'label'    => t('Performance Data'),
-                'rows'     => 2,
-                'cols'     => 72,
-                'helptext' => t('Fill in the performance data string which should be send to Icinga.')
-            )
-        );
-
-        $this->setSubmitLabel(t('Submit Passive Check Result'));
-
-        parent::create();
-    }
-
-    /**
-     * Create the submit passive checkresult command object
-     *
-     * @return SubmitPassiveCheckresultCommand
-     */
-    public function createCommand()
-    {
-        return new SubmitPassiveCheckresultCommand(
-            $this->getValue('pluginstate'),
-            $this->getValue('checkoutput'),
-            $this->getValue('performancedata')
-        );
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php b/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
deleted file mode 100644
index 5ae69173e..000000000
--- a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Form\Command;
-
-/**
- * Base class for command forms which allow to propagate the command to child objects too
- */
-abstract class WithChildrenCommandForm extends CommandForm
-{
-    /**
-     * Whether to include all objects beyond as well
-     * @var bool
-     */
-    private $withChildren = false;
-
-    /**
-     * Setter for withChildren
-     *
-     * @param bool $flag
-     */
-    public function setWithChildren($flag = true)
-    {
-        $this->withChildren = $flag;
-    }
-
-    /**
-     * Getter for withChildren
-     *
-     * @return bool
-     */
-    public function getWithChildren()
-    {
-        return $this->withChildren;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php b/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
deleted file mode 100644
index 641a2ae73..000000000
--- a/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-use Icinga\Protocol\Commandpipe\Comment;
-
-/**
- * Command for acknowledging an object
- */
-class AcknowledgeCommand extends Command
-{
-    /**
-     * When this acknowledgement should expire
-     *
-     * @var int    The time as UNIX timestamp or -1 if it shouldn't expire
-     */
-    private $expireTime = -1;
-
-    /**
-     * The comment associated to this acknowledgment
-     *
-     * @var Comment
-     */
-    private $comment;
-
-    /**
-     * Whether to set the notify flag of this acknowledgment
-     *
-     * @var bool
-     */
-    private $notify;
-
-    /**
-     * Whether this acknowledgement is of type sticky
-     *
-     * @var bool
-     */
-    private $sticky;
-
-    /**
-     * Initialise a new acknowledgement command object
-     *
-     * @param   Comment $comment    The comment to use for this acknowledgement
-     * @param   int     $expire     The expire time or -1 of not expiring
-     * @param   bool    $notify     Whether to set the notify flag
-     * @param   bool    $sticky     Whether to set the sticky flag
-     */
-    public function __construct(Comment $comment, $expire = -1, $notify = false, $sticky = false)
-    {
-        $this->expireTime = $expire;
-        $this->comment = $comment;
-        $this->notify = $notify;
-        $this->sticky = $sticky;
-    }
-
-    /**
-     * Set the time when this acknowledgement should expire
-     *
-     * @param   int     $expireTime     The time as UNIX timestamp or -1 if it shouldn't expire
-     *
-     * @return  self
-     */
-    public function setExpire($expireTime)
-    {
-        $this->expireTime = (int) $expireTime;
-        return $this;
-    }
-
-    /**
-     * Set the comment for this acknowledgement
-     *
-     * @param   Comment     $comment
-     *
-     * @return  self
-     */
-    public function setComment(Comment $comment)
-    {
-        $this->comment = $comment;
-        return $this;
-    }
-
-    /**
-     * Set whether the notify flag of this acknowledgment should be set
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setNotify($state)
-    {
-        $this->notify = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set whether this acknowledgement is of type sticky
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setSticky($state)
-    {
-        $this->sticky = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        $parameters = array_merge(
-            array(
-                $this->sticky ? '2' : '0',
-                $this->notify ? '1' : '0'
-            ),
-            $this->comment->getArguments()
-        );
-
-        if ($this->expireTime > -1) {
-            array_splice($parameters, 3, 0, array($this->expireTime));
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        $parameters = $this->getArguments();
-        return sprintf('ACKNOWLEDGE_HOST_PROBLEM%s;', $this->expireTime > -1 ? '_EXPIRE' : '')
-               . implode(';', array_merge(array($hostname), $parameters));
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        $parameters = $this->getArguments();
-        return sprintf('ACKNOWLEDGE_SVC_PROBLEM%s;', $this->expireTime > -1 ? '_EXPIRE' : '')
-               . implode(';', array_merge(array($hostname, $servicename), $parameters));
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
deleted file mode 100644
index 0464d5cb2..000000000
--- a/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-use Icinga\Protocol\Commandpipe\Comment;
-
-/**
- * Icinga Command for adding comments
- *
- * @see Command
- */
-class AddCommentCommand extends Command
-{
-    /**
-     * The comment associated to this command
-     *
-     * @var Comment
-     */
-    private $comment;
-
-    /**
-     * Initialise a new command object to add comments
-     *
-     * @param   Comment $comment    The comment to use for this acknowledgement
-     */
-    public function __construct(Comment $comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * Set the comment for this command
-     *
-     * @param   Comment     $comment
-     *
-     * @return  self
-     */
-    public function setComment(Comment $comment)
-    {
-        $this->comment = $comment;
-        return $this;
-    }
-
-    public function getArguments()
-    {
-        return $this->comment->getArguments();
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        return sprintf('ADD_HOST_COMMENT;%s;', $hostname) . implode(';', $this->getArguments());
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return sprintf('ADD_SVC_COMMENT;%s;%s;', $hostname, $servicename)
-            . implode(';', $this->getArguments());
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/CommandPipe.php b/modules/monitoring/library/Monitoring/Command/CommandPipe.php
deleted file mode 100644
index 8d149dd20..000000000
--- a/modules/monitoring/library/Monitoring/Command/CommandPipe.php
+++ /dev/null
@@ -1,603 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe;
-
-use Icinga\Protocol\Commandpipe\Transport\Transport;
-use Icinga\Protocol\Commandpipe\Transport\LocalPipe;
-use Icinga\Protocol\Commandpipe\Transport\SecureShell;
-
-/**
- * Class to the access icinga CommandPipe via a @see Icinga\Protocol\Commandpipe\Transport.php
- *
- * Will be configured using the instances.ini
- */
-class CommandPipe
-{
-    /**
-     * The name of this class as defined in the instances.ini
-     *
-     * @var string
-     */
-    private $name = "";
-
-    /**
-     * The underlying @see Icinga\Protocol\Commandpipe\Transport.php class handling communication with icinga
-     *
-     * @var Icinga\Protocol\Commandpipe\Transport
-     */
-    private $transport = null;
-
-    /**
-     *  Constant identifying a monitoring object as host
-     */
-    const TYPE_HOST = "HOST";
-
-    /**
-     *  Constant identifying a monitoring object as service
-     */
-    const TYPE_SERVICE = "SVC";
-
-    /**
-     *  Constant identifying a monitoring object as hostgroup
-     */
-    const TYPE_HOSTGROUP = "HOSTGROUP";
-
-    /**
-     *  Constant identifying a monitoring object as servicegroups
-     */
-    const TYPE_SERVICEGROUP = "SERVICEGROUP";
-
-    /**
-     *  Notification option (use logical OR for combination)
-     *
-     *  Broadcast (send notification to all normal and all escalated contacts for the service)
-     */
-    const NOTIFY_BROADCAST  = 1;
-
-    /**
-     *  Notification option (use logical OR for combination)
-     *
-     *  notification is sent out regardless of current time, whether or not notifications are enabled, etc.
-     */
-    const NOTIFY_FORCED     = 2;
-
-    /**
-     *  Notification option (use logical OR for combination)
-     *
-     *  Increment current notification # for the service(this is not done by default for custom notifications)
-     */
-    const NOTIFY_INCREMENT  = 4;
-
-    /**
-     * Create a new CommandPipe class which accesses the icinga.cmd pipe as defined in $config
-     *
-     * @param \Zend_Config $config
-     */
-    public function __construct(\Zend_Config $config)
-    {
-        $this->getTransportForConfiguration($config);
-        $this->name = $config->name;
-    }
-
-    /**
-     * Setup the @see Icinga\Protocol\Commandpipe\Transport.php class that will be used for accessing the command pipe
-     *
-     * Currently this method uses SecureShell when a host is given, otherwise it assumes the pipe is accessible
-     * via the machines filesystem
-     *
-     * @param \Zend_Config $config          The configuration as defined in the instances.ini
-     */
-    private function getTransportForConfiguration(\Zend_Config $config)
-    {
-        if (isset($config->host)) {
-            $this->transport = new SecureShell();
-            $this->transport->setEndpoint($config);
-        } else {
-            $this->transport = new LocalPipe();
-            $this->transport->setEndpoint($config);
-        }
-    }
-
-    /**
-     * Send the command string $command to the icinga pipe
-     *
-     * This method just delegates the send command to the underlying transport
-     *
-     * @param String $command       The command string to send, without the timestamp
-     */
-    public function send($command)
-    {
-        $this->transport->send($this->escape($command));
-    }
-
-    /**
-     * Return the given command string with escaped newlines
-     *
-     * @param   string  $command    The command string to escape
-     *
-     * @return  string              The escaped command string
-     */
-    public function escape($command)
-    {
-        return str_replace(array("\r", "\n"), array('\r', '\n'), $command);
-    }
-
-    /**
-     * Send a command to the icinga pipe
-     *
-     * @param Command   $command
-     * @param array     $objects
-     */
-    public function sendCommand(Command $command, array $objects = array())
-    {
-        if ($command->provideGlobalCommand() === true) {
-            $this->send($command->getGlobalCommand());
-        } else {
-            foreach ($objects as $object) {
-                $objectType = $this->getObjectType($object);
-                if ($objectType === self::TYPE_SERVICE) {
-                    $this->send($command->getServiceCommand($object->host_name, $object->service_description));
-                } else {
-                    $this->send($command->getHostCommand($object->host_name));
-                }
-            }
-        }
-    }
-
-    /**
-     * Remove the acknowledgements of the provided objects
-     *
-     * @param array $objects        An array of mixed service and host objects whose acknowledgments will be removed
-     */
-    public function removeAcknowledge($objects)
-    {
-        foreach ($objects as $object) {
-            if (isset($object->service_description)) {
-                $this->send("REMOVE_SVC_ACKNOWLEDGEMENT;$object->host_name;$object->service_description");
-            } else {
-                $this->send("REMOVE_HOST_ACKNOWLEDGEMENT;$object->host_name");
-            }
-        }
-    }
-
-    /**
-     * Removes the submitted comments
-     *
-     * @param array $objectsOrComments      An array of hosts and services (to remove all their comments)
-     *                                      or single comment objects to remove
-     */
-    public function removeComment($objectsOrComments)
-    {
-        foreach ($objectsOrComments as $object) {
-            if (isset($object->comment_id)) {
-                if (isset($object->service_description)) {
-                    $type = "SERVICE_COMMENT";
-                } else {
-                    $type = "HOST_COMMENT";
-                }
-                $this->send("DEL_{$type};" . intval($object->comment_id));
-            } else {
-                if (isset($object->service_description)) {
-                    $type = "SERVICE_COMMENT";
-                } else {
-                    $type = "HOST_COMMENT";
-                }
-                $cmd = "DEL_ALL_{$type}S;" . $object->host_name;
-                if ($type == "SERVICE_COMMENT") {
-                    $cmd .= ";" . $object->service_description;
-                }
-                $this->send($cmd);
-            }
-        }
-    }
-
-    /**
-     *  Globally enable notifications for this instance
-     *
-     */
-    public function enableGlobalNotifications()
-    {
-        $this->send("ENABLE_NOTIFICATIONS");
-    }
-
-    /**
-     *  Globally disable notifications for this instance
-     *
-     */
-    public function disableGlobalNotifications()
-    {
-        $this->send("DISABLE_NOTIFICATIONS");
-    }
-
-    /**
-     * Return the object type of the provided object (TYPE_SERVICE or TYPE_HOST)
-     *
-     * @param $object           The object to identify
-     * @return string           TYPE_SERVICE or TYPE_HOST
-     */
-    private function getObjectType($object)
-    {
-        //@TODO: This must be refactored once more commands are supported
-        if (isset($object->service_description)) {
-            return self::TYPE_SERVICE;
-        }
-        return self::TYPE_HOST;
-    }
-
-    /**
-     * Remove downtimes for objects
-     *
-     * @param array $objects        An array containing hosts, service or downtime objects
-     * @param int $starttime        An optional starttime to use for the DEL_DOWNTIME_BY_HOST_NAME command
-     */
-    public function removeDowntime($objects, $starttime = 0)
-    {
-        foreach ($objects as $object) {
-            $type = $this->getObjectType($object);
-            if (isset($object->downtime_id)) {
-                $this->send("DEL_" . $type . "_DOWNTIME;" . $object->downtime_id);
-                continue;
-            }
-            $cmd = "DEL_DOWNTIME_BY_HOST_NAME;" . $object->host_name;
-            if ($type == self::TYPE_SERVICE) {
-                $cmd .= ";" . $object->service_description;
-            }
-            if ($starttime != 0) {
-                $cmd .= ";" . $starttime;
-            }
-            $this->send($cmd);
-        }
-    }
-
-    /**
-     *  Restart the icinga instance
-     *
-     */
-    public function restartIcinga()
-    {
-        $this->send("RESTART_PROCESS");
-    }
-
-    /**
-     * Modify monitoring flags for the provided objects
-     *
-     * @param array $objects            An arry of service and/or host objects to modify
-     * @param PropertyModifier $flags   The Monitoring attributes to modify
-     */
-    public function setMonitoringProperties($objects, PropertyModifier $flags)
-    {
-        foreach ($objects as $object) {
-            $type = $this->getObjectType($object);
-            $formatArray = $flags->getFormatString($type);
-            foreach ($formatArray as $format) {
-                $format .= ";"
-                    . $object->host_name
-                    . ($type == self::TYPE_SERVICE ? ";" . $object->service_description : "");
-                $this->send($format);
-            }
-        }
-    }
-
-    /**
-     * Enable active checks for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to enable active checks for
-     */
-    public function enableActiveChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::ACTIVE => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable active checks for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to disable active checks
-     */
-    public function disableActiveChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::ACTIVE => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable passive checks for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to enable passive checks for
-     */
-    public function enablePassiveChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::PASSIVE => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable passive checks for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to enable passive checks for
-     */
-    public function disablePassiveChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::PASSIVE => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable flap detection for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to enable flap detection
-     *
-     */
-    public function enableFlappingDetection($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::FLAPPING => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable flap detection for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to disable flap detection
-     *
-     */
-    public function disableFlappingDetection($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::FLAPPING => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable notifications for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to enable notification
-     *
-     */
-    public function enableNotifications($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::NOTIFICATIONS => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable flap detection for all provided objects
-     *
-     * @param array $objects        An array containing services and hosts to disable notifications
-     *
-     */
-    public function disableNotifications($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::NOTIFICATIONS => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable freshness checks for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function enableFreshnessChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::FRESHNESS => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable freshness checks for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function disableFreshnessChecks($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::FRESHNESS => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable event handler for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function enableEventHandler($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::EVENTHANDLER => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable event handler for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function disableEventHandler($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::EVENTHANDLER => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Enable performance data parsing for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function enablePerfdata($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::PERFDATA => PropertyModifier::STATE_ENABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable performance data parsing for all provided objects
-     *
-     * @param array $objects    An array of hosts and/or services
-     */
-    public function disablePerfdata($objects)
-    {
-        $this->setMonitoringProperties(
-            $objects,
-            new PropertyModifier(
-                array(
-                    PropertyModifier::PERFDATA => PropertyModifier::STATE_DISABLE
-                )
-            )
-        );
-    }
-
-    /**
-     * Disable notifications for all services of the provided hosts
-     *
-     * @param array $objects    An array of hosts
-     */
-    public function disableNotificationsForServices($objects)
-    {
-        foreach ($objects as $host) {
-            $msg = 'DISABLE_HOST_SVC_NOTIFICATIONS;'.$host->host_name;
-            $this->send($msg);
-        }
-    }
-
-    /**
-     * Enable notifications for all services of the provided hosts
-     *
-     * @param array $objects    An array of hosts
-     */
-    public function enableNotificationsForServices($objects)
-    {
-        foreach ($objects as $host) {
-            $msg = 'ENABLE_HOST_SVC_NOTIFICATIONS;'.$host->host_name;
-            $this->send($msg);
-        }
-    }
-
-    /**
-     * Disable active checks for all services of the provided hosts
-     *
-     * @param array $objects    An array of hosts
-     */
-    public function disableActiveChecksWithChildren($objects)
-    {
-        foreach ($objects as $host) {
-            $msg = 'DISABLE_HOST_SVC_CHECKS;'.$host->host_name;
-            $this->send($msg);
-        }
-    }
-
-    /**
-     * Enable active checks for all services of the provided hosts
-     *
-     * @param array $objects    An array of hosts
-     */
-    public function enableActiveChecksWithChildren($objects)
-    {
-        foreach ($objects as $host) {
-            $msg = 'ENABLE_HOST_SVC_CHECKS;'.$host->host_name;
-            $this->send($msg);
-        }
-    }
-
-    /**
-     * Reset modified attributes for all provided objects
-     *
-     * @param array $objects    An array of hosts and services
-     */
-    public function resetAttributes($objects)
-    {
-        foreach ($objects as $object) {
-            $type = $this->getObjectType($object);
-            if ($type === self::TYPE_SERVICE) {
-                $this->send('CHANGE_SVC_MODATTR;'.$object->host_name.';'.$object->service_description.';0');
-            } else {
-                $this->send('CHANGE_HOST_MODATTR;'.$object->host_name.';0');
-            }
-        }
-    }
-
-    /**
-     * Return the transport handler that handles actual sending of commands
-     *
-     * @return Transport
-     */
-    public function getTransport()
-    {
-        return $this->transport;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Comment.php b/modules/monitoring/library/Monitoring/Command/Comment.php
deleted file mode 100644
index 2b8caf52b..000000000
--- a/modules/monitoring/library/Monitoring/Command/Comment.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe;
-
-/**
- * Container for comment information that can be send to Icinga's external command pipe
- */
-class Comment
-{
-    /**
-     * Whether this comment is persistent or not
-     *
-     * @var bool
-     */
-    public $persistent;
-
-    /**
-     * The author of this comment
-     *
-     * @var string
-     */
-    public $author;
-
-    /**
-     * The text of this comment
-     *
-     * @var string
-     */
-    public $content;
-
-    /**
-     * Create a new comment object
-     *
-     * @param   string  $author         The name of the comment's author
-     * @param   string  $content        The text for this comment
-     * @param   bool    $persistent     Whether this comment should be persistent or not
-     */
-    public function __construct($author, $content, $persistent = false)
-    {
-        $this->author = $author;
-        $this->content = $content;
-        $this->persistent = $persistent;
-    }
-
-    /**
-     * Return this comment's properties as list of command parameters
-     *
-     * @param   bool    $ignorePersistentFlag   Whether the persistent flag should be included or not
-     * @return  array
-     */
-    public function getArguments($ignorePersistentFlag = false)
-    {
-        if ($ignorePersistentFlag) {
-            return array($this->author, $this->content);
-        } else {
-            return array($this->persistent ? '1' : '0', $this->author, $this->content);
-        }
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
deleted file mode 100644
index 5d56011ae..000000000
--- a/modules/monitoring/library/Monitoring/Command/Common/AddCommentCommand.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Common;
-
-/**
- * Add a comment to a host or service
- */
-class AddCommentCommand extends WithCommentCommand
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Common\ObjectCommand::$allowedObjects For the property documentation.
-     */
-    protected $allowedObjects = array(
-        self::TYPE_HOST,
-        self::TYPE_SERVICE
-    );
-
-    /**
-     * Whether the comment is persistent
-     *
-     * Persistent comments are not lost the next time the monitoring host restarts.
-     */
-    protected $persistent;
-
-    /**
-     * Set whether the comment is persistent
-     *
-     * @param   bool $persistent
-     *
-     * @return  $this
-     */
-    public function setPersistent($persistent = true)
-    {
-        $this->persistent = $persistent;
-        return $this;
-    }
-
-    /**
-     * Is the comment persistent?
-     *
-     * @return bool
-     */
-    public function getPersistent()
-    {
-        return $this->persistent;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php
deleted file mode 100644
index 8727c237b..000000000
--- a/modules/monitoring/library/Monitoring/Command/Common/ObjectCommand.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Common;
-
-use Icinga\Module\Monitoring\Command\IcingaCommand;
-use Icinga\Module\Monitoring\Object\MonitoredObject;
-
-/**
- * Base class for commands that involve a monitored object, i.e. a host or service
- */
-abstract class ObjectCommand extends IcingaCommand
-{
-    /**
-     * Type host
-     */
-    const TYPE_HOST = MonitoredObject::TYPE_HOST;
-
-    /**
-     * Type service
-     */
-    const TYPE_SERVICE = MonitoredObject::TYPE_SERVICE;
-
-    /**
-     * Allowed Icinga object types for the command
-     *
-     * @var string[]
-     */
-    protected $allowedObjects = array();
-
-    /**
-     * Involved object
-     *
-     * @var MonitoredObject
-     */
-    protected $object;
-
-    /**
-     * Set the involved object
-     *
-     * @param   MonitoredObject $object
-     *
-     * @return  $this
-     */
-    public function setObject(MonitoredObject $object)
-    {
-        $object->assertOneOf($this->allowedObjects);
-        $this->object = $object;
-        return $this;
-    }
-
-    /**
-     * Get the involved object
-     *
-     * @return MonitoredObject
-     */
-    public function getObject()
-    {
-        return $this->object;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
deleted file mode 100644
index 0afb4087a..000000000
--- a/modules/monitoring/library/Monitoring/Command/Common/ScheduleDowntimeCommand.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Common;
-
-use DateTime;
-
-/**
- * Base class for commands scheduling downtimes
- */
-abstract class ScheduleDowntimeCommand extends AddCommentCommand
-{
-    /**
-     * Downtime starts at the exact time specified
-     *
-     * If `Downtime::$flexible' is set to true, the time between `Downtime::$start' and `Downtime::$end' at which a
-     * host or service transitions to a problem state determines the time at which the downtime actually starts.
-     * The downtime will then last for `Downtime::$duration' seconds.
-     *
-     * @var DateTime
-     */
-    protected $start;
-
-    /**
-     * Downtime ends at the exact time specified
-     *
-     * If `Downtime::$flexible' is set to true, the time between `Downtime::$start' and `Downtime::$end' at which a
-     * host or service transitions to a problem state determines the time at which the downtime actually starts.
-     * The downtime will then last for `Downtime::$duration' seconds.
-     *
-     * @var DateTime
-     */
-    protected $end;
-
-    /**
-     * Whether it's a flexible downtime
-     *
-     * @var bool
-     */
-    protected $flexible = false;
-
-    /**
-     * ID of the downtime which triggers this downtime
-     *
-     * The start of this downtime is triggered by the start of the other scheduled host or service downtime.
-     *
-     * @var int|null
-     */
-    protected $triggerId;
-
-    /**
-     * The duration in seconds the downtime must last if it's a flexible downtime
-     *
-     * If `Downtime::$flexible' is set to true, the downtime will last for the duration in seconds specified, even
-     * if the host or service recovers before the downtime expires.
-     *
-     * @var int|null
-     */
-    protected $duration;
-
-    /**
-     * Set the date and time when the downtime should start
-     *
-     * @param   DateTime $start
-     *
-     * @return  $this
-     */
-    public function setStart(DateTime $start)
-    {
-        $this->start = $start;
-        return $this;
-    }
-
-    /**
-     * Get the date and time when the downtime should start
-     *
-     * @return DateTime
-     */
-    public function getStart()
-    {
-        return $this->start;
-    }
-
-    /**
-     * Set the date and time when the downtime should end
-     *
-     * @param   DateTime $end
-     *
-     * @return  $this
-     */
-    public function setEnd(DateTime $end)
-    {
-        $this->end = $end;
-        return $this;
-    }
-
-    /**
-     * Get the date and time when the downtime should end
-     *
-     * @return DateTime
-     */
-    public function getEnd()
-    {
-        return $this->end;
-    }
-
-    /**
-     * Set whether is flexible or fixed
-     *
-     * @param   boolean $flexible
-     *
-     * @return  $this
-     */
-    public function setFlexible($flexible = true)
-    {
-        $this->flexible = (bool) $flexible;
-        return $this;
-    }
-
-    /**
-     * Is the downtime flexible?
-     *
-     * @return boolean
-     */
-    public function getFlexible()
-    {
-        return $this->flexible;
-    }
-
-    /**
-     * Set the ID of the downtime which triggers this downtime
-     *
-     * @param   int $triggerId
-     *
-     * @return  $this
-     */
-    public function setTriggerId($triggerId)
-    {
-        $this->triggerId = (int) $triggerId;
-        return $this;
-    }
-
-    /**
-     * Get the ID of the downtime which triggers this downtime
-     *
-     * @return int|null
-     */
-    public function getTriggerId()
-    {
-        return $this->triggerId;
-    }
-
-    /**
-     * Set the duration in seconds the downtime must last if it's a flexible downtime
-     *
-     * @param   int $duration
-     *
-     * @return  $this
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = (int) $duration;
-        return $this;
-    }
-
-    /**
-     * Get the duration in seconds the downtime must last if it's a flexible downtime
-     *
-     * @return int|null
-     */
-    public function getDuration()
-    {
-        return $this->duration;
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return sprintf(
-            '%u;%u;%u;%u;%u;%s',
-            $this->start->getTimestamp(),
-            $this->end->getTimestamp(),
-            ! $this->flexible,
-            $this->triggerId,
-            $this->duration,
-            parent::getCommandString()
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php b/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
deleted file mode 100644
index 7002cd1e4..000000000
--- a/modules/monitoring/library/Monitoring/Command/Common/ToggleFeature.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Common;
-
-use Icinga\Module\Monitoring\Command\IcingaCommand;
-
-/**
- * Enable/disable features of an Icinga instance
- */
-abstract class ToggleFeature extends IcingaCommand
-{
-    /**
-     * Whether the feature should be enabled or disabled
-     *
-     * @var bool
-     */
-    protected $enable = true;
-
-    /**
-     * Enable the feature
-     *
-     * @return $this
-     */
-    public function enable()
-    {
-        $this->enable = true;
-        return $this;
-    }
-
-    /**
-     * Disable the feature
-     *
-     * @return $this
-     */
-    public function disable()
-    {
-        $this->enable = false;
-        return $this;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php
deleted file mode 100644
index c913e5bd3..000000000
--- a/modules/monitoring/library/Monitoring/Command/Common/WithCommentCommand.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Common;
-
-/**
- * Base class for commands adding comments
- */
-abstract class WithCommentCommand extends ObjectCommand
-{
-    /**
-     * Author of the comment
-     *
-     * @var string
-     */
-    protected $author;
-
-    /**
-     * Comment
-     *
-     * @var string
-     */
-    protected $comment;
-
-    /**
-     * Set the author
-     *
-     * @param   string $author
-     *
-     * @return  $this
-     */
-    public function setAuthor($author)
-    {
-        $this->author = (string) $author;
-        return $this;
-    }
-
-    /**
-     * Get the author
-     *
-     * @return string
-     */
-    public function getAuthor()
-    {
-        return $this->author;
-    }
-
-    /**
-     * Set the comment
-     *
-     * @param   string $comment
-     *
-     * @return  $this
-     */
-    public function setComment($comment)
-    {
-        $this->comment = (string) $comment;
-        return $this;
-    }
-
-    /**
-     * Get the comment
-     *
-     * @return string
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
deleted file mode 100644
index 21cf22520..000000000
--- a/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-use Icinga\Protocol\Commandpipe\Comment;
-
-/**
- * Command to send a custom notification
- */
-class CustomNotificationCommand extends Command
-{
-    /**
-     * The comment associated with this notification
-     *
-     * @var Comment
-     */
-    private $comment;
-
-    /**
-     * Whether this notification is forced
-     *
-     * @var bool
-     */
-    private $forced;
-
-    /**
-     * Whether this notification is also sent to escalation-contacts
-     *
-     * @var bool
-     */
-    private $broadcast;
-
-    /**
-     * Initialise a new custom notification command object
-     *
-     * @param   Comment     $comment    The comment for this notification
-     * @param   bool        $forced     Whether this notificatin is forced
-     * @param   bool        $broadcast  Whether this notification is sent to all contacts
-     */
-    public function __construct(Comment $comment, $forced = false, $broadcast = false)
-    {
-        $this->comment = $comment;
-        $this->forced = $forced;
-        $this->broadcast = $broadcast;
-    }
-
-    /**
-     * Set the comment for this notification
-     *
-     * @param   Comment     $comment
-     *
-     * @return  self
-     */
-    public function setComment(Comment $comment)
-    {
-        $this->comment = $comment;
-        return $this;
-    }
-
-    /**
-     * Set whether this notification is forced
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setForced($state)
-    {
-        $this->forced = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Set whether this notification is sent to all contacts
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setBroadcast($state)
-    {
-        $this->broadcast = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        $options = 0;
-        if ($this->forced) {
-            $options |= 2;
-        }
-        if ($this->broadcast) {
-            $options |= 1;
-        }
-        return array_merge(array($options), $this->comment->getArguments(true));
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        return 'SEND_CUSTOM_HOST_NOTIFICATION;' . implode(';', array_merge(array($hostname), $this->getArguments()));
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return 'SEND_CUSTOM_SVC_NOTIFICATION;' . implode(
-            ';',
-            array_merge(
-                array($hostname, $servicename),
-                $this->getArguments()
-            )
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
deleted file mode 100644
index 7f8dcf749..000000000
--- a/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Command to delay a notification
- */
-class DelayNotificationCommand extends Command
-{
-    /**
-     * The delay in seconds
-     *
-     * @var int
-     */
-    private $delay;
-
-    /**
-     * Initialise a new delay notification command object
-     *
-     * @param   int     $delay      How long, in seconds, notifications should be delayed
-     */
-    public function __construct($delay)
-    {
-        $this->delay = $delay;
-    }
-
-    /**
-     * Set how long notifications should be delayed
-     *
-     * @param   int     $seconds    In seconds
-     *
-     * @return  self
-     */
-    public function setDelay($seconds)
-    {
-        $this->delay = (int) $seconds;
-        return $this;
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        return array($this->delay);
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        return 'DELAY_HOST_NOTIFICATION;' . implode(';', array_merge(array($hostname), $this->getArguments()));
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return 'DELAY_SVC_NOTIFICATION;' . implode(
-            ';',
-            array_merge(
-                array($hostname, $servicename),
-                $this->getArguments()
-            )
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php b/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
deleted file mode 100644
index d6fb6322a..000000000
--- a/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Exception\ProgrammingError;
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Disable notifications with expire
- */
-class DisableNotificationWithExpireCommand extends Command
-{
-    /**
-     * Timestamp when deactivation should expire
-     *
-     * @var integer
-     */
-    private $expirationTimestamp;
-
-    /**
-     * Create a new instance of this command
-     */
-    public function __construct()
-    {
-        // There is now object specific implementation, only global
-        $this->globalCommand = true;
-    }
-
-    /**
-     * Setter for expiration timestamp
-     *
-     * @param integer $timestamp
-     */
-    public function setExpirationTimestamp($timestamp)
-    {
-        $this->expirationTimestamp = $timestamp;
-    }
-
-    /**
-     * Return this command's arguments in the order expected by the actual command definition
-     *
-     * @return array
-     */
-    public function getArguments()
-    {
-        return array($this->expirationTimestamp);
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string $hostname   The name of the host to insert
-     * @throws  ProgrammingError
-     *
-     * @return  string              The string representation of the command
-     */
-    public function getHostCommand($hostname)
-    {
-        throw new ProgrammingError('This is not supported for single objects');
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string $hostname       The name of the host to insert
-     * @param   string $servicename    The name of the service to insert
-     * @throws  ProgrammingError
-     * @return  string                 The string representation of the command#
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        throw new ProgrammingError('This is not supported for single objects');
-    }
-
-    /**
-     * Create a global command
-     *
-     * @param   string $instance
-     *
-     * @return  string
-     */
-    public function getGlobalCommand($instance = null)
-    {
-        return sprintf(
-            'DISABLE_NOTIFICATIONS_EXPIRE_TIME;%d;%s',
-            time(),
-            implode(';', $this->getArguments())
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php b/modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
deleted file mode 100644
index 662a156e9..000000000
--- a/modules/monitoring/library/Monitoring/Command/Exception/InvalidCommandException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe\Exception;
-
-/**
- * Exception class for unknown/invalid external commands
- */
-class InvalidCommandException extends \Exception
-{
-}
diff --git a/modules/monitoring/library/Monitoring/Command/PropertyModifier.php b/modules/monitoring/library/Monitoring/Command/PropertyModifier.php
deleted file mode 100644
index b398d73c7..000000000
--- a/modules/monitoring/library/Monitoring/Command/PropertyModifier.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Protocol\Commandpipe;
-
-/**
- *  Container class to modify a few monitoring attributes at oncee
- *
- */
-class PropertyModifier
-{
-    /**
-     *  Set an attribute to be enabled in the command
-     */
-    const STATE_ENABLE = 1;
-
-    /**
-     *  Set an attribute to be disabled in the command
-     */
-    const STATE_DISABLE = 0;
-
-    /**
-     *  Set an attribute to not be modified in the command
-     */
-    const STATE_KEEP = -1;
-
-    /**
-     *  Template for enabling/disabling flap detection
-     */
-    const FLAPPING = "%s_FLAP_DETECTION";
-
-    /**
-     *  Template for enabling/disabling active checks
-     */
-    const ACTIVE = "%s_CHECK";
-
-    /**
-     *  Template for enabling/disabling passive checks
-     */
-    const PASSIVE = "PASSIVE_%s_CHECKS";
-
-    /**
-     *  Template for enabling/disabling notification
-     */
-    const NOTIFICATIONS = "%s_NOTIFICATIONS";
-
-    /**
-     *  Template for enabling/disabling freshness checks
-     */
-    const FRESHNESS = "%s_FRESHNESS_CHECKS";
-
-    /**
-     *  Template for enabling/disabling event handler
-     */
-    const EVENTHANDLER = "%s_EVENT_HANDLER";
-
-    /**
-     * The state that will be applied when fetching this container for an object
-     *
-     * @var array
-     */
-    private $flags = array(
-        self::FLAPPING => self::STATE_KEEP,
-        self::ACTIVE => self::STATE_KEEP,
-        self::PASSIVE => self::STATE_KEEP,
-        self::NOTIFICATIONS => self::STATE_KEEP,
-        self::FRESHNESS => self::STATE_KEEP,
-        self::EVENTHANDLER => self::STATE_KEEP
-    );
-
-    /**
-     * Create a new PropertyModified object using the given flags
-     *
-     * @param array $flags      Flags to enable/disable/keep different monitoring attributes
-     */
-    public function __construct(array $flags)
-    {
-        foreach ($flags as $type => $value) {
-            if (isset($this->flags[$type])) {
-                $this->flags[$type] = $value;
-            }
-        }
-    }
-
-    /**
-     * Return this object as a template for the given object type
-     *
-     * @param $type         Either CommandPipe::TYPE_HOST or CommandPipe::TYPE_SERVICE
-     * @return array        An array of external command templates for the given type representing the containers state
-     */
-    public function getFormatString($type)
-    {
-        $cmd = array();
-        foreach ($this->flags as $cmdTemplate => $setting) {
-            if ($setting == self::STATE_KEEP) {
-                continue;
-            }
-            $commandString = ($setting == self::STATE_ENABLE ? "ENABLE_" : "DISABLE_");
-            $targetString = $type;
-            if ($type == CommandPipe::TYPE_SERVICE && $cmdTemplate == self::FRESHNESS) {
-                // the external command definition is inconsistent here..
-                $targetString = "SERVICE";
-            }
-            $commandString .= sprintf($cmdTemplate, $targetString);
-            $cmd[] = $commandString;
-        }
-        return $cmd;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php b/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
deleted file mode 100644
index 7908e637d..000000000
--- a/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Command to schedule checks
- */
-class ScheduleCheckCommand extends Command
-{
-    /**
-     * When this check is scheduled
-     *
-     * @var int     The time as UNIX timestamp
-     */
-    private $checkTime;
-
-    /**
-     * Whether this check is forced
-     *
-     * @var bool
-     */
-    private $forced;
-
-    /**
-     * Initialises a new command object to schedule checks
-     *
-     * @param   int     $checkTime      The time as UNIX timestamp
-     * @param   bool    $forced         Whether this check is forced
-     */
-    public function __construct($checkTime, $forced = false)
-    {
-        $this->checkTime = $checkTime;
-        $this->forced = $forced;
-    }
-
-    /**
-     * Set when to schedule this check
-     *
-     * @param   int     $checkTime      The time as UNIX timestamp
-     *
-     * @return self
-     */
-    public function setCheckTime($checkTime)
-    {
-        $this->checkTime = (int) $checkTime;
-        return $this;
-    }
-
-    /**
-     * Set whether this check is forced
-     *
-     * @param   bool    $state
-     *
-     * @return  self
-     */
-    public function setForced($state)
-    {
-        $this->forced = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        return array($this->checkTime);
-    }
-
-    /**
-     * Return the command as a string for the given host or all of it's services
-     *
-     * @param   string  $hostname       The name of the host to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        return sprintf(
-            'SCHEDULE%s_HOST_%s;',
-            $this->forced ? '_FORCED' : '',
-            $this->onlyServices ? 'SVC_CHECKS' : 'CHECK'
-        ) . implode(';', array_merge(array($hostname), $this->getArguments()));
-    }
-
-    /**
-     * Return the command as a string for the given service
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return sprintf('SCHEDULE%s_SVC_CHECK;', $this->forced ? '_FORCED' : '')
-            . implode(';', array_merge(array($hostname, $servicename), $this->getArguments()));
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php b/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
deleted file mode 100644
index 926084bbf..000000000
--- a/modules/monitoring/library/Monitoring/Command/Service/AddServiceComment.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Service;
-
-use Icinga\Module\Monitoring\Command\Common\Comment;
-
-class AddServiceComment extends Comment
-{
-    protected $service;
-
-    /**
-     * Whether the comment is persistent
-     *
-     * Persistent comments are not lost the next time the monitoring host restarts.
-     */
-    protected $persistent;
-
-    public function __construct($service)
-    {
-        $this->serivce = (string) $service;
-    }
-
-    public function getCommand()
-    {
-        return sprintf(
-            'ADD_SVC_COMMENT;%s;%u;%s',
-            $this->host,
-            $this->persistent,
-            parent::getCommand()
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php
deleted file mode 100644
index 4697be36b..000000000
--- a/modules/monitoring/library/Monitoring/Command/Service/ScheduleServiceDowntimeCommand.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command\Service;
-
-use Icinga\Module\Monitoring\Command\Common\ScheduleDowntimeCommand;
-use Icinga\Module\Monitoring\Object\Service;
-
-/**
- * Schedule a service downtime on an Icinga instance
- */
-class ScheduleServiceDowntimeCommand extends ScheduleDowntimeCommand
-{
-    /**
-     * Service to set in downtime
-     *
-     * @var Service
-     */
-    protected $service;
-
-    /**
-     * Set the service to set in downtime
-     *
-     * @param   Service $service
-     *
-     * @return  $this
-     */
-    public function setService(Service $service)
-    {
-        $this->service = $service;
-        return $this;
-    }
-
-    /**
-     * Get the service to set in downtime
-     *
-     * @return Service
-     */
-    public function getService()
-    {
-        return $this->service;
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\IcingaCommand::getCommandString() For the method documentation.
-     */
-    public function getCommandString()
-    {
-        return sprintf(
-            '%s;%s;%s;%s',
-            'SCHEDULE_SVC_DOWNTIME',
-            $this->service->getHostName(),
-            $this->service->getName(),
-            parent::getCommandString()
-        );
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php b/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
deleted file mode 100644
index 27fecd48d..000000000
--- a/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Exception\ProgrammingError;
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Configurable simple command
- */
-class SingleArgumentCommand extends Command
-{
-    /**
-     * Value used for this command
-     *
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * Name of host command
-     *
-     * @var string
-     */
-    private $hostCommand;
-
-    /**
-     * Name of service command
-     *
-     * @var string
-     */
-    private $serviceCommand;
-
-    /**
-     * Name of global command
-     *
-     * @var array
-     */
-    private $globalCommands = array();
-
-    /**
-     * Ignore host in command string
-     *
-     * @var bool
-     */
-    private $ignoreObject = false;
-
-    /**
-     * Setter for this value
-     *
-     * @param mixed $value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Setter for command names
-     *
-     * @param   string  $hostCommand
-     * @param   string  $serviceCommand
-     */
-    public function setCommand($hostCommand, $serviceCommand)
-    {
-        $this->hostCommand = $hostCommand;
-        $this->serviceCommand = $serviceCommand;
-    }
-
-    /**
-     * Set a bunch of global commands
-     *
-     * @param array $commands One or more commands to control global parameters
-     */
-    public function setGlobalCommands(array $commands)
-    {
-        $this->globalCommands = $commands;
-        $this->globalCommand = true;
-    }
-
-    /**
-     * Ignore object values upon command creation
-     *
-     * @param bool $flag
-     */
-    public function setObjectIgnoreFlag($flag = true)
-    {
-        $this->ignoreObject = (bool) $flag;
-    }
-
-    /**
-     * Return this command's arguments in the order expected by the actual command definition
-     *
-     * @return array
-     */
-    public function getArguments()
-    {
-        if ($this->value !== null) {
-            return array($this->value);
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Build the argument string based on objects and arguments
-     *
-     * @param   array $objectNames
-     *
-     * @return  string String to append to command
-     */
-    private function getArgumentString(array $objectNames)
-    {
-        $data = array();
-        if ($this->ignoreObject === true) {
-            $data = $this->getArguments();
-        } else {
-            $data = array_merge($objectNames, $this->getArguments());
-        }
-
-        return implode(';', $data);
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     */
-    public function getHostCommand($hostname)
-    {
-        return strtoupper($this->hostCommand). ';' . $this->getArgumentString(array($hostname));
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string $hostname       The name of the host to insert
-     * @param   string $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return strtoupper($this->serviceCommand)
-        . ';'
-        . $this->getArgumentString(array($hostname, $servicename));
-    }
-
-    /**
-     * Getter for global command if configured
-     *
-     * @param string $instance
-     *
-     * @throws ProgrammingError
-     * @return string
-     */
-    public function getGlobalCommand($instance = null)
-    {
-        if (!count($this->globalCommands)) {
-            // This throws exception for us that globalCommand
-            // is not implemented properly
-            parent::getGlobalCommand();
-        }
-
-        if ($this->value === 'host') {
-            return strtoupper($this->globalCommands[0]);
-        }
-
-        if ($this->value === 'service') {
-            if (count($this->globalCommands) < 2) {
-                throw new ProgrammingError('If use global values you need at least 2 global commands');
-            }
-
-            return strtoupper($this->globalCommands[1]);
-        }
-
-        return strtoupper(implode(';', $this->globalCommands));
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php b/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php
deleted file mode 100644
index 262987de1..000000000
--- a/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Command;
-
-use Icinga\Protocol\Commandpipe\Command;
-
-/**
- * Command to submit passive check results
- */
-class SubmitPassiveCheckresultCommand extends Command
-{
-    /**
-     * The plugin-state that is being reported
-     *
-     * @var int
-     */
-    private $state;
-
-    /**
-     * The output that is included
-     *
-     * @var string
-     */
-    private $output;
-
-    /**
-     * The performance data that is included
-     *
-     * @var string
-     */
-    private $perfData;
-
-    /**
-     * Initialises a new command object to submit a passive check result
-     *
-     * @param   int     $state      The plugin-state to report
-     * @param   string  $output     The plugin-output to include
-     * @param   string  $perfData   The performance data to include
-     */
-    public function __construct($state, $output, $perfData)
-    {
-        $this->state = $state;
-        $this->output = $output;
-        $this->perfData = $perfData;
-    }
-
-    /**
-     * Set which plugin-state is being reported
-     *
-     * @param   int     $state
-     *
-     * @return  self
-     */
-    public function setState($state)
-    {
-        $this->state = (int) $state;
-        return $this;
-    }
-
-    /**
-     * Set the plugin-output to include in the result
-     *
-     * @param   string  $output
-     *
-     * @return  self
-     */
-    public function setOutput($output)
-    {
-        $this->output = (string) $output;
-        return $this;
-    }
-
-    /**
-     * Set the performance data to include in the result
-     *
-     * @param   string  $perfData
-     * @return  self
-     */
-    public function setPerformanceData($perfData)
-    {
-        $this->perfData = (string) $perfData;
-        return $this;
-    }
-
-    /**
-     * Return this command's parameters properly arranged in an array
-     *
-     * @return  array
-     * @see     Command::getArguments()
-     */
-    public function getArguments()
-    {
-        return array(
-            $this->state,
-            $this->perfData ? $this->output . '|' . $this->perfData : $this->output
-        );
-    }
-
-    /**
-     * Return the command as a string with the given host being inserted
-     *
-     * @param   string  $hostname   The name of the host to insert
-     *
-     * @return  string              The string representation of the command
-     * @see     Command::getHostCommand()
-     */
-    public function getHostCommand($hostname)
-    {
-        return 'PROCESS_HOST_CHECK_RESULT;' . implode(';', array_merge(array($hostname), $this->getArguments()));
-    }
-
-    /**
-     * Return the command as a string with the given host and service being inserted
-     *
-     * @param   string  $hostname       The name of the host to insert
-     * @param   string  $servicename    The name of the service to insert
-     *
-     * @return  string                  The string representation of the command
-     * @see     Command::getServiceCommand()
-     */
-    public function getServiceCommand($hostname, $servicename)
-    {
-        return 'PROCESS_SERVICE_CHECK_RESULT;' . implode(
-            ';',
-            array_merge(
-                array($hostname, $servicename),
-                $this->getArguments()
-            )
-        );
-    }
-}

From 1d54c7f8360405c9b707d5201612b8a0a25fa241 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 10:42:48 +0200
Subject: [PATCH 217/277] monitoring/commands: Support
 'DISABLE_NOTIFICATIONS_EXPIRE_TIME'

refs #6593
---
 .../Instance/DisableNotificationsExpireCommandForm.php |  2 +-
 .../Renderer/IcingaCommandFileCommandRenderer.php      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 08b1f1813..4ebe83c58 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -66,7 +66,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
     {
         $disableNotifications = new DisableNotificationsExpireCommand();
         $disableNotifications
-            ->setExpireTime($this->getElement('expire_time')->getValue());
+            ->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
         $this->getTransport($request)->send($disableNotifications);
         Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
         return true;
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 5045a8ade..ce813b7a2 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
+use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand;
 use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
 use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
@@ -386,4 +387,13 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
         }
         return $commandString;
     }
+
+    public function renderDisableNotificationsExpire(DisableNotificationsExpireCommand $command)
+    {
+        return sprintf(
+            '%s;%u',
+            'DISABLE_NOTIFICATIONS_EXPIRE_TIME',
+            $command->getExpireTime()
+        );
+    }
 }

From 16bc0e5d5addca6ac4d9c6aa07e9278fa3f4ab53 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 13:29:23 +0200
Subject: [PATCH 218/277] monitoring/commands: Add icon to the check now
 command form

refs #6593
---
 .../Command/Object/CheckNowCommandForm.php    | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index ecf933102..65ef67ff5 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -6,7 +6,6 @@ namespace Icinga\Module\Monitoring\Form\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
-use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 
@@ -15,17 +14,52 @@ use Icinga\Web\Request;
  */
 class CheckNowCommandForm extends ObjectsCommandForm
 {
-
     /**
      * (non-PHPDoc)
      * @see \Zend_Form::init() For the method documentation.
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Check Now'));
         $this->setAttrib('class', 'inline link-like');
     }
 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElements(array(
+            array(
+                'note',
+                'icon',
+                array(
+                    'decorators' => array(
+                        array(
+                            'HtmlTag',
+                            array(
+                                'tag' => 'img',
+                                'src' => $this->getView()->href('img/icons/refresh_petrol.png'),
+                            )
+                        )
+                    )
+                )
+            ),
+            array(
+                'submit',
+                'btn_submit',
+                array(
+                    'ignore'        => true,
+                    'label'         => mt('monitoring', 'Check Now'),
+                    'decorators'    => array(
+                        'ViewHelper'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.

From e5e806a3a12a3fae824ce373dbb3071f8f32df44 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 15:02:31 +0200
Subject: [PATCH 219/277] monitoring/commands: Fix instance command forms code
 compliance

refs #6593
---
 .../DisableNotificationsExpireCommandForm.php |  1 -
 .../ToggleInstanceFeaturesCommandForm.php     | 28 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 4ebe83c58..67d2c7fc6 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -71,5 +71,4 @@ class DisableNotificationsExpireCommandForm extends CommandForm
         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 db584bc1a..9b3f79801 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -59,6 +59,21 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
      */
     public function createElements(array $formData = array())
     {
+        if ((bool) $this->status->notifications_enabled) {
+            $description = 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->getView()->href('monitoring/process/disable-notifications'),
+                mt('monitoring', 'Disable temporarily')
+            );
+        } elseif ($this->status->disable_notif_expire_time) {
+            $description = sprintf(
+                mt('monitoring', 'Notifications will be re-enabled in <strong>%s</strong>'),
+                $this->getView()->timeUntil($this->status->disable_notif_expire_time)
+            );
+        } else {
+            $description = '';
+        }
         $this->addElements(array(
             array(
                 'checkbox',
@@ -97,7 +112,18 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
                     'label'         => mt('monitoring', 'Notifications Enabled'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'description'   => $description,
+                    'decorators'    => array(
+                        'ViewHelper',
+                        'Errors',
+                        array(
+                            'Description',
+                            array('tag' => 'span', 'class' => 'feature-instance-notifications', 'escape' => false)
+                        ),
+                        'Label',
+                        array('HtmlTag', array('tag' => 'div'))
+                    ),
                 )
             ),
             array(

From 442f956945181e0bc92bc26ed744ffe315b5101c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 15:03:03 +0200
Subject: [PATCH 220/277] monitoring/commands: Fix object command forms code
 compliance

refs #6593
---
 .../Object/AcknowledgeProblemCommandForm.php  | 16 +++++++--------
 .../Command/Object/AddCommentCommandForm.php  |  6 +++---
 .../Command/Object/CheckNowCommandForm.php    | 17 +++++-----------
 .../ScheduleServiceCheckCommandForm.php       |  4 ++--
 .../ScheduleServiceDowntimeCommandForm.php    | 20 +++++++++----------
 5 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index 8da595a0d..a9c1549af 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -39,8 +39,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'value' => 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.'
+                        . ' future notifications about problems are temporarily disabled until the host or service'
+                        . ' recovers.'
                     )
                 )
             ),
@@ -53,8 +53,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' the host or service that is having problems. Make sure you enter a brief description of'
+                        . ' what you are doing.'
                     )
                 )
             ),
@@ -66,7 +66,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you would like the comment to remain even when the acknowledgement is removed, check this'
-                            . ' option.'
+                        . ' option.'
                     )
                 )
             ),
@@ -92,7 +92,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                         'description'   => mt(
                             'monitoring',
                             'Enter the expire date and time for this acknowledgement here. Icinga will delete the'
-                                . ' acknowledgement after this time expired.'
+                            . ' acknowledgement after this time expired.'
                         )
                     )
                 )
@@ -118,7 +118,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you want the acknowledgement to disable notifications until the host or service recovers,'
-                            . 'check this option.'
+                        . 'check this option.'
                     )
                 )
             ),
@@ -131,7 +131,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
-                            . 'uncheck this option.'
+                        . 'uncheck this option.'
                     )
                 )
             )
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index 777d96868..1183070fc 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -48,8 +48,8 @@ class AddCommentCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' the host or service that is having problems. Make sure you enter a brief description of'
+                        . ' what you are doing.'
                     )
                 )
             ),
@@ -62,7 +62,7 @@ class AddCommentCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you uncheck this option, the comment will automatically be deleted the next time Icinga is'
-                            . ' restarted.'
+                        . ' restarted.'
                     )
                 )
             )
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 65ef67ff5..ade78402c 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -34,15 +34,10 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 'note',
                 'icon',
                 array(
-                    'decorators' => array(
-                        array(
-                            'HtmlTag',
-                            array(
-                                'tag' => 'img',
-                                'src' => $this->getView()->href('img/icons/refresh_petrol.png'),
-                            )
-                        )
-                    )
+                    'decorators' => array(array(
+                        'HtmlTag',
+                        array('tag' => 'img', 'src' => $this->getView()->href('img/icons/refresh_petrol.png'))
+                    ))
                 )
             ),
             array(
@@ -51,9 +46,7 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 array(
                     'ignore'        => true,
                     'label'         => mt('monitoring', 'Check Now'),
-                    'decorators'    => array(
-                        'ViewHelper'
-                    )
+                    'decorators'    => array('ViewHelper')
                 )
             )
         ));
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index a93fcf4ae..477fb1733 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -41,7 +41,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' hosts or services to be checked at the time you specify.'
                     )
                 )
             ),
@@ -62,7 +62,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                     '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.'
+                        . '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 76d36d214..b5d153dd5 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -53,10 +53,10 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'value' => 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'
-                            . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
-                            . ' restarts.'
+                        . ' 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.'
                     )
                 )
             ),
@@ -69,8 +69,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' the host or service that is having problems. Make sure you enter a brief description of'
+                        . ' what you are doing.'
                     )
                 )
             ),
@@ -102,9 +102,9 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' 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'),
@@ -159,7 +159,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'Enter here the duration of the downtime. The downtime will be automatically deleted after this'
-                            . ' time expired.'
+                        . ' time expired.'
                     ),
                     'decorators' => array(
                         'FormElements',

From 4d784c6097a09c50ee4a7b80980c865879ecc0d8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:42:00 +0200
Subject: [PATCH 221/277] monitoring/commands: Re-add the changed identifier to
 object features

refs #6593
---
 .../Command/Object/ToggleObjectFeaturesCommandForm.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 146fd7001..8e5e5408c 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -20,7 +20,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setAttrib('class', 'inline');
+        $this->setAttrib('class', 'inline object-features');
     }
 
     /**
@@ -93,7 +93,11 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
     {
         $this->create();
         foreach ($this->getValues() as $feature => $enabled) {
-            $this->getElement($feature)->setChecked($object->{$feature});
+            $element = $this->getElement($feature);
+            $element->setChecked($object->{$feature});
+            if ((bool) $object->{$feature . '_changed'} === true) {
+                $element->setDescription(mt('monitoring', 'changed'));
+            }
         }
         return $this;
     }

From 3a9774e6e5d42d28ac0cfd28692c1c4bcc87ef44 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:43:18 +0200
Subject: [PATCH 222/277] monitoring/commands: Support toggling instance
 features

refs #6593
---
 .../IcingaCommandFileCommandRenderer.php      | 113 +++++++++++++++++-
 .../IcingaCommandRendererInterface.php        |   4 +-
 2 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index ce813b7a2..84731c905 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -3,6 +3,7 @@
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
 use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand;
+use Icinga\Module\Monitoring\Command\Instance\ToggleInstanceFeatureCommand;
 use Icinga\Module\Monitoring\Command\Object\AcknowledgeProblemCommand;
 use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
@@ -36,8 +37,8 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
     /**
      * Render a command
      *
-     * @param   IcingaCommand $command
-     * @param   int|null $now
+     * @param   IcingaCommand   $command
+     * @param   int|null        $now
      *
      * @return  string
      */
@@ -391,9 +392,115 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
     public function renderDisableNotificationsExpire(DisableNotificationsExpireCommand $command)
     {
         return sprintf(
-            '%s;%u',
+            '%s;%u;%u',
             'DISABLE_NOTIFICATIONS_EXPIRE_TIME',
+            time(),
             $command->getExpireTime()
         );
     }
+
+    public function renderToggleInstanceFeature(ToggleInstanceFeatureCommand $command)
+    {
+        switch ($command->getFeature()) {
+            case ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS:
+            case ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS:
+            case ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING:
+            case ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING:
+            case ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS:
+            case ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS:
+                if ($command->getEnabled() === true) {
+                    $commandPrefix = 'START';
+                } else {
+                    $commandPrefix = 'STOP';
+                }
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS:
+            case ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION:
+            case ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS:
+            case ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA:
+                if ($command->getEnabled() === true) {
+                    $commandPrefix = 'ENABLE';
+                } else {
+                    $commandPrefix = 'DISABLE';
+                }
+                break;
+            default:
+                throw new InvalidArgumentException($command->getFeature());
+        }
+        switch ($command->getFeature()) {
+            case ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'EXECUTING_HOST_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'EXECUTING_SVC_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'EVENT_HANDLERS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'FLAP_DETECTION'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'NOTIFICATIONS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'OBSESSING_OVER_HOST_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'OBSESSING_OVER_SVC_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'ACCEPTING_PASSIVE_HOST_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'ACCEPTING_PASSIVE_SVC_CHECKS'
+                );
+                break;
+            case ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA:
+                $commandString = sprintf(
+                    '%s_%s',
+                    $commandPrefix,
+                    'PERFORMANCE_DATA'
+                );
+                break;
+            default:
+                throw new InvalidArgumentException($command->getFeature());
+        }
+        return $commandString;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
index dddd16742..f901e3850 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -5,4 +5,6 @@ namespace Icinga\Module\Monitoring\Command\Renderer;
 /**
  * Interface for Icinga command renderer
  */
-interface IcingaCommandRendererInterface {}
+interface IcingaCommandRendererInterface
+{
+}

From 5f13db73ce536ff5b041b76146aee722c6e49116 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:46:07 +0200
Subject: [PATCH 223/277] monitoring/commands: Use the toggle instance features
 command form in the process controller

refs #6593
---
 .../controllers/ProcessController.php         | 135 +++++++----
 .../process/disable-notifications.phtml       |  15 ++
 .../views/scripts/process/info.phtml          | 224 ++++--------------
 3 files changed, 156 insertions(+), 218 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/process/disable-notifications.phtml

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 49f5715b1..98cba000f 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -2,66 +2,113 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Module\Monitoring\Controller as MonitoringController;
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Form\Command\Instance\DisableNotificationsExpireCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Instance\ToggleInstanceFeaturesCommandForm;
 
 /**
- * Display process information and global commands
+ * Display process and performance information of the monitoring host and program-wide commands
  */
-class Monitoring_ProcessController extends MonitoringController
+class Monitoring_ProcessController extends Controller
 {
     /**
-     * Retrieve backend and hooks for this controller
+     * Add tabs
      *
-     * @see ActionController::init
+     * @see \Icinga\Web\Controller\ActionController::init()
      */
     public function init()
     {
-        $this->getTabs()->add('info', array(
-            'title' => 'Process Info',
-            'url' =>'monitoring/process/info'
-        ))->add('performance', array(
-            'title' => 'Performance Info',
-            'url' =>'monitoring/process/performance'
-        ));
+        $this
+            ->getTabs()
+            ->add(
+                'info',
+                array(
+                    'title' => $this->translate('Process Info'),
+                    'url'   =>'monitoring/process/info'
+                )
+            )
+            ->add(
+                'performance',
+                array(
+                    'title' => $this->translate('Performance Info'),
+                    'url'   => 'monitoring/process/performance'
+                )
+            );
     }
 
+    /**
+     * Display process information and program-wide commands
+     */
     public function infoAction()
     {
+        $this->view->title = $this->translate('Process Info');
         $this->getTabs()->activate('info');
         $this->setAutorefreshInterval(10);
-
-        // TODO: This one is broken right now, doublecheck default columns
-        $this->view->programstatus = $this->backend->select()
-            ->from('programstatus', array(
-                'id',
-                'status_update_time',
-                'program_start_time',
-                'program_end_time',
-                'is_currently_running',
-                'process_id',
-                'daemon_mode',
-                'last_command_check',
-                'last_log_rotation',
-                'notifications_enabled',
-                'disable_notif_expire_time',
-                'active_service_checks_enabled',
-                'passive_service_checks_enabled',
-                'active_host_checks_enabled',
-                'passive_host_checks_enabled',
-                'event_handlers_enabled',
-                'flap_detection_enabled',
-                'failure_prediction_enabled',
-                'process_performance_data',
-                'obsess_over_hosts',
-                'obsess_over_services',
-                'modified_host_attributes',
-                'modified_service_attributes',
-                'global_host_event_handler',
-                'global_service_event_handler'
-            ))
-            ->getQuery()->fetchRow();
-
         $this->view->backendName = $this->backend->getName();
+        $programStatus = $this->backend
+            ->select()
+            ->from(
+                'programstatus',
+                array(
+                    'is_currently_running',
+                    'process_id',
+                    'program_start_time',
+                    'status_update_time',
+                    'last_command_check',
+                    'last_log_rotation',
+                    'global_service_event_handler',
+                    'global_host_event_handler',
+                    'notifications_enabled',
+                    'disable_notif_expire_time',
+                    'active_service_checks_enabled',
+                    'passive_service_checks_enabled',
+                    'active_host_checks_enabled',
+                    'passive_host_checks_enabled',
+                    'event_handlers_enabled',
+                    'obsess_over_services',
+                    'obsess_over_hosts',
+                    'flap_detection_enabled',
+                    'process_performance_data'
+                )
+            )
+            ->getQuery()
+            ->fetchRow();
+        $this->view->programStatus = $programStatus;
+        $toggleFeaturesForm = new ToggleInstanceFeaturesCommandForm();
+        $toggleFeaturesForm
+            ->setStatus($programStatus)
+            ->load($programStatus)
+            ->handleRequest();
+        $this->view->toggleFeaturesForm = $toggleFeaturesForm;
+    }
+
+    /**
+     * Disable notifications w/ an optional expire time
+     */
+    public function disableNotificationsAction()
+    {
+        $this->view->title = $this->translate('Disable Notifications');
+        $programStatus = $this->backend
+            ->select()
+            ->from(
+                'programstatus',
+                array(
+                    'notifications_enabled',
+                    'disable_notif_expire_time'
+                )
+            )
+            ->getQuery()
+            ->fetchRow();
+        $this->view->programStatus = $programStatus;
+        if ((bool) $programStatus->notifications_enabled === false) {
+            return;
+        } else {
+            $form = new DisableNotificationsExpireCommandForm();
+            $form
+                ->setRedirectUrl('monitoring/process/info')
+                ->handleRequest();
+            $this->view->form = $form;
+        }
     }
 
     public function performanceAction()
diff --git a/modules/monitoring/application/views/scripts/process/disable-notifications.phtml b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
new file mode 100644
index 000000000..6b45a1f22
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
@@ -0,0 +1,15 @@
+<div class="content">
+    <h1><?= $title ?></h1>
+    <?php if ((bool) $programStatus->notifications_enabled === false): ?>
+    <div>
+        <?= $this->translate('Host and service notifications are already disabled.') ?>
+        <?php if ($this->programStatus->disable_notif_expire_time): ?>
+            <?= sprintf(
+                $this->translate('Notifications will be re-enabled in <strong>%s</strong>.'),
+                $this->timeUntil($this->programStatus->disable_notif_expire_time)); ?>
+        <?php endif; ?>
+    </div>
+    <?php else: ?>
+    <?= $form ?>
+    <?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 8fb9bd0e3..c659544c2 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -1,179 +1,55 @@
 <div class="controls">
-<?= $this->tabs ?>
+    <?= $this->tabs ?>
 </div>
-<?php
-
-$ps = $this->programstatus;
-$cf = $this->getHelper('CommandForm');
-
-?>
 
 <div class="content processinfo">
-<p>Backend <strong><?= $this->backendName; ?></strong>
-<?= $ps->is_currently_running === '1'
-    ? sprintf(
-        $this->translate('has been running with PID %d '),
-        $ps->process_id
-    ) . $this->prefixedTimeSince($ps->program_start_time)
-    : $this->translate('is not running'); ?>.
-
-<table class="avp">
-  <tbody>
-    <tr>
-      <th><?= $this->translate('Last status update'); ?></th>
-      <td><?= $this->timeSince($ps->status_update_time) ?> ago</td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Last check command'); ?></th>
-      <td><?= $this->timeSince($ps->last_command_check) ?> ago</td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Global host event handler'); ?></th>
-      <td><?= $ps->global_host_event_handler ? $ps->global_host_event_handler : $this->translate('Not set'); ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Global service event handler'); ?></th>
-      <td><?= $ps->global_service_event_handler ? $ps->global_service_event_handler : $this->translate('Not set'); ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Notifications enabled'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->notifications_enabled,
-          'enablenotifications',
-          'disablenotifications',
-          false,
-          array('global' => '1')
-      ) ?>
-<?php if ($ps->notifications_enabled === '1'): ?>
- <a rel="tooltip" title="<?= $this->translate('Disable notifications for a specific time on a program-wide basis'); ?>"
-    href="<?= $this->href('monitoring/command/disablenotificationswithexpire') ?>" data-base-target="_next">
-     <?= $this->translate('Temporarily disable'); ?>
- </a>
-<?php elseif ($ps->disable_notif_expire_time): ?>
-<?= sprintf($this->translate('Will be re-enabled in %s'), '<strong>' . $this->timeUntil($ps->disable_notif_expire_time) . '</strong>'); ?>
-</div>
-<?php endif; ?>
-      </td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Execute active service checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->active_service_checks_enabled,
-          'enableactivechecks',
-          'disableactivechecks',
-          false,
-          array('global' => 'service')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Accept passive service checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->passive_service_checks_enabled,
-          'startacceptingpassivechecks',
-          'stopacceptingpassivechecks',
-          false,
-          array('global' => 'service')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Execute active host checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->active_host_checks_enabled,
-          'enableactivechecks',
-          'disableactivechecks',
-          false,
-          array('global' => 'host')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Accept passive host checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->passive_host_checks_enabled,
-          'startacceptingpassivechecks',
-          'stopacceptingpassivechecks',
-          false,
-          array('global' => 'host')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Eventhandlers enabled'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->event_handlers_enabled,
-          'enableeventhandler',
-          'disableeventhandler',
-          false,
-          array('global' => '1')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Obsessing over host checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->obsess_over_hosts,
-          'startobsessing',
-          'stopobsessing',
-          false,
-          array('global' => 'host')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Obsessing over service checks'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->obsess_over_services,
-          'startobsessing',
-          'stopobsessing',
-          false,
-          array('global' => 'service')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Flap detection enabled'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->flap_detection_enabled,
-          'enableflapdetection',
-          'disableflapdetection',
-          false,
-          array('global' => '1')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Process performance data'); ?></th>
-      <td><?= $cf->toggleSubmitForm(
-          '',
-          $ps->process_performance_data,
-          'enableperformancedata',
-          'disableperformancedata',
-          false,
-          array('global' => '1')
-      ) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Monitoring Process'); ?></th>
-      <td><?= $cf->labelSubmitForm(
-          $this->translate('Restart'),
-          $this->translate('Restart the monitoring process'),
-          '',
-          'restartprocess'
-      ) ?>
-      <!--<?=
-      $cf->labelSubmitForm(
-          $this->translate('Shutdown monitoring process'),
-          $this->translate('Shutdown the monitoring process'),
-          'btn-cta',
-          'shutdownprocess'
-      );
-      ?>-->
-      </td>
-    </tr>
-  </tbody>
-</table>
-
+    <?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->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) ?>
+    </div>
+    <?php endif ?>
+    <table class="avp">
+        <tbody>
+        <tr>
+            <th><?= $this->translate('Program Start Time') ?></th>
+            <td><?= $this->dateFormat()->formatDateTime($this->programStatus->program_start_time) ?></td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Last Status Update'); ?></th>
+            <td><?= $this->timeSince($this->programStatus->status_update_time) ?> ago</td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Last External Command Check'); ?></th>
+            <td><?= $this->timeSince($this->programStatus->last_command_check) ?> ago</td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Last Log File Rotation'); ?></th>
+            <td><?= $this->programStatus->last_log_rotation
+                    ? $this->timeSince($this->programStatus->last_log_rotation)
+                    : $this->translate('N/A') ?></td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Global Service Event Handler'); ?></th>
+            <td><?= $this->programStatus->global_service_event_handler
+                    ? $this->programStatus->global_service_event_handler
+                    : $this->translate('N/A'); ?></td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Global Host Event Handler'); ?></th>
+            <td><?= $this->programStatus->global_host_event_handler
+                    ? $this->programStatus->global_host_event_handler
+                    : $this->translate('N/A'); ?></td>
+        </tr>
+        </tbody>
+    </table>
+    <hr>
+    <?= $this->toggleFeaturesForm ?>
 </div>

From 5d07b04f82fc19d3493de138803d9ae40a658fb5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:50:42 +0200
Subject: [PATCH 224/277] monitoring/commands: Introduce `ServiceController'

refs #6593
---
 .../controllers/ServiceController.php         | 108 ++++++++++++++++--
 .../views/scripts/service/command.phtml       |   4 +
 .../views/scripts/service/show.phtml          |  27 +++++
 3 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/service/command.phtml
 create mode 100644 modules/monitoring/application/views/scripts/service/show.phtml

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 7f643e657..f0d298be0 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -3,9 +3,18 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Form\Command\CommandForm;
-use Icinga\Module\Monitoring\Form\Command\Service\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm;
 use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Web\Url;
 
 class Monitoring_ServiceController extends Controller
 {
@@ -14,22 +23,107 @@ class Monitoring_ServiceController extends Controller
      */
     protected $service;
 
-    public function init()
+    public function moduleInit()
     {
-        $this->service = new Service($this->params);  // Use $this->_request->getParams() instead of $this->params
-                                                      // once #7049 has been fixed
+        parent::moduleInit();
+        $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
+        if ($service->fetch() === false) {
+            throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
+        }
+        $this->service = $service;
     }
 
-    protected function handleCommandForm(CommandForm $form)
+    public function showAction()
+    {
+        $this->setAutorefreshInterval(10);
+        $checkNowForm = new CheckNowCommandForm();
+        $checkNowForm
+            ->setObjects($this->service)
+            ->handleRequest();
+        $this->view->checkNowForm = $checkNowForm;
+
+        if ( ! in_array((int) $this->service->state, array(0, 99))) {
+            if ((bool) $this->service->acknowledged) {
+                $removeAckForm = new RemoveAcknowledgementCommandForm();
+                $removeAckForm
+                    ->setObjects($this->service)
+                    ->handleRequest();
+                $this->view->removeAckForm = $removeAckForm;
+            } else {
+                $ackForm = new AcknowledgeProblemCommandForm();
+                $ackForm
+                    ->setObjects($this->service)
+                    ->handleRequest();
+                $this->view->ackForm = $ackForm;
+            }
+        }
+        if (count($this->service->comments) > 0) {
+            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm
+                ->setObjects($this->service)
+                ->handleRequest();
+            $this->view->delCommentForm = $delCommentForm;
+        }
+
+        if (count($this->service->downtimes > 0)) {
+            $delDowntimeForm = new DeleteDowntimeCommandForm();
+            $delDowntimeForm
+                ->setObjects($this->service)
+                ->handleRequest();
+            $this->view->delDowntimeForm = $delDowntimeForm;
+        }
+
+        $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
+        $toggleFeaturesForm
+            ->load($this->service)
+            ->setObjects($this->service)
+            ->handleRequest();
+        $this->view->toggleFeaturesForm = $toggleFeaturesForm;
+
+        $this->view->object = $this->service->populate();
+    }
+
+    protected function handleCommandForm(ObjectsCommandForm $form)
     {
         $form
-            ->setService($this->service)
+            ->setObjects($this->service)
+            ->setRedirectUrl(Url::fromPath(
+                'monitoring/service/show',
+                array('host' => $this->service->getHost(), 'service' => $this->service->getService())
+            ))
             ->handleRequest();
         $this->view->form = $form;
         $this->_helper->viewRenderer('command');
         return $form;
     }
 
+    /**
+     * Acknowledge a service downtime
+     */
+    public function acknowledgeProblemAction()
+    {
+        $this->view->title = $this->translate('Acknowledge Service Downtime');
+        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+    }
+
+    /**
+     * Add a service comment
+     */
+    public function addCommentAction()
+    {
+        $this->view->title = $this->translate('Add Service Comment');
+        $this->handleCommandForm(new AddCommentCommandForm());
+    }
+
+    /**
+     * Reschedule a service check
+     */
+    public function rescheduleCheckAction()
+    {
+        $this->view->title = $this->translate('Reschedule Service Check');
+        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+    }
+
     /**
      * Schedule a service downtime
      */
diff --git a/modules/monitoring/application/views/scripts/service/command.phtml b/modules/monitoring/application/views/scripts/service/command.phtml
new file mode 100644
index 000000000..5bff418e3
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/service/command.phtml
@@ -0,0 +1,4 @@
+<div class="content">
+    <h1><?= $title ?></h1>
+    <?= $form ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
new file mode 100644
index 000000000..5d0fd22c1
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -0,0 +1,27 @@
+<div class="controls">
+    <?= $this->render('show/components/header.phtml') ?>
+    <h1><?= $this->translate("This service's current state") ?></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>

From 17e04e9937fe9ce0f571d784d85e36fbf477b6e9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:51:18 +0200
Subject: [PATCH 225/277] monitoring: Point service's detail to the new
 `ServiceController' in the services list view

refs #6593
---
 .../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 dbb43217d..350cb96be 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -40,7 +40,7 @@ if (count($services) === 0) {
 }
 foreach ($services as $service):
     $serviceLink = $this->href(
-      'monitoring/show/service',
+      'monitoring/service/show',
       array(
         'host' => $service->host_name,
         'service' => $service->service_description

From 9b5c1f06d07d622d770d4da726c540db05faf998 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:52:45 +0200
Subject: [PATCH 226/277] monitoring/commands: Let detail snippets use the new
 command forms

refs #6593
---
 .../show/components/acknowledgement.phtml     |  57 +++++-----
 .../show/components/checkstatistics.phtml     |  50 +++++----
 .../scripts/show/components/comments.phtml    |  83 ++++++++------
 .../scripts/show/components/downtime.phtml    | 105 ++++++++++--------
 .../views/scripts/show/components/flags.phtml |  80 +------------
 5 files changed, 160 insertions(+), 215 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 38359bf34..669a37241 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -1,40 +1,39 @@
 <?php
 
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
+/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
 if (in_array((int) $object->state, array(0, 99))) {
+    // Ignore this markup if the object is in a non-problem state or pending
     return;
 }
 
-$cf = $this->getHelper('CommandForm');
-
-$data = array('host' => $object->host_name);
-if ($object->service_description) {
-    $data['service'] = $object->service_description;
+if ($object->getType() === $object::TYPE_HOST) {
+    $ackLink = $this->href(
+        'monitoring/host/acknowledge-problem',
+        array('host' => $object->getHost())
+    );
+} else {
+    $ackLink = $this->href(
+        'monitoring/service/acknowledge-problem',
+        array('host' => $object->getHost(), 'service' => $object->getService())
+    );
 }
 
-?>
-<tr>
-<?php
-
-if ($object instanceof Host && $object->host_acknowledged
-    || $object instanceof Service && $object->service_acknowledged): ?>
-  <th>Issue acknowledged</th>
-  <td data-base-target="_self"><?= $cf->labelSubmitForm(
-        $this->translate('Remove Acknowledgement'),
-        $this->translate('Remove problem acknowledgement'),
-        'link-like',
-        'removeacknowledgement',
-        $data
-    ) ?>
+if ($object->acknowledged): ?>
+    <tr>
+        <th><?= $this->translate('Acknowledged') ?></th>
+        <td><?= $removeAckForm ?></td>
+    </tr>
 <?php else: ?>
-  <th><?= $this->translate('Not acknowledged') ?></th>
-  <td>
-    <a href="<?= $this->href(
-        'monitoring/command/acknowledgeproblem',
-        $data
-    ) ?>"><?= $this->icon('acknowledgement_petrol.png') ?> <?= $this->translate('Acknowledge') ?></a>
-  </td>
+    <tr>
+        <th><?= $this->translate('Not acknowledged') ?></th>
+        <td>
+            <?php
+
+            ?>
+            <a href="<?= $ackLink ?>">
+                <?= $this->icon('acknowledgement_petrol.png') ?> <?= $this->translate('Acknowledge') ?>
+            </a>
+        </td>
+    </tr>
 <?php endif ?>
-</tr>
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index f0b39e603..93020f1f2 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -1,31 +1,36 @@
 <?php
 
-$cf = $this->getHelper('CommandForm');
+/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
-?><tr>
-  <th><?= $this->translate('Last check') ?></th>
-  <td data-base-target="_self"><?= $this->img('img/icons/refresh_petrol.png') ?> <?= $cf->labelSubmitForm(
-                    $this->translate('Check now'),
-                    $this->translate('Reschedule next check immediately'),
-                    'link-like',
-                    'reschedulenextcheck',
-                    array(
-                        'host'          => $this->object->host_name,
-                        'service'       => $this->object->service_description,
-                        'checktime'     => time(),
-                        'forcecheck'    => '1'
-                    )
-                ) ?> <?= $this->timeSince($object->last_check) ?></td>
+if ($object->getType() === $object::TYPE_HOST) {
+    $reschedule = $this->href(
+        'monitoring/host/reschedule-check',
+        array('host' => $object->getHost())
+    );
+} else {
+    $reschedule = $this->href(
+        'monitoring/service/reschedule-check',
+        array('host' => $object->getHost(), 'service' => $object->getService())
+    );
+}
+
+?>
+
+<tr>
+    <th><?= $this->translate('Last check') ?></th>
+    <td data-base-target="_self">
+        <?= $checkNowForm ?>
+        <?= $this->timeSince($object->last_check) ?>
+    </td>
 </tr>
 <tr>
   <th><?= $this->translate('Next check') ?></th>
-  <td><!--<input type="submit" value="Reschedule" style="width: 7em;" /> --><a href="<?= $this->href(
-        'monitoring/command/reschedulenextcheck',
-        array(
-            'host'      => $object->host_name,
-            'service'   => $object->service_description
-        )
-    ) ?>"><?= $this->img('img/icons/reschedule_petrol.png') ?> <?= $this->translate('Reschedule') ?></a> <?= $this->timeUntil($object->next_check) ?></td>
+  <td>
+      <a href="<?= $reschedule ?>">
+          <?= $this->icon('reschedule_petrol.png') ?> <?= $this->translate('Reschedule') ?>
+      </a>
+      <?= $this->timeUntil($object->next_check) ?>
+  </td>
 </tr>
 <?php if ($object->check_execution_time): ?>
 <tr>
@@ -39,4 +44,3 @@ $cf = $this->getHelper('CommandForm');
  <td><?= $object->check_latency ?>s</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 4365acdd5..cf65b8e04 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,15 +1,32 @@
+<tr>
+    <th><?= $this->translate('Comments') ?></th>
+    <td>
+        <?php
+
+        /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+
+        if ($object->getType() === $object::TYPE_HOST) {
+            $addCommentLink = $this->href(
+                'monitoring/host/add-comment',
+                array('host' => $object->getHost())
+            );
+        } else {
+            $addCommentLink = $this->href(
+                'monitoring/service/add-comment',
+                array('host' => $object->getHost(), 'service' => $object->getService())
+            );
+        }
+
+        ?>
+        <a href="<?= $addCommentLink ?>">
+            <?= $this->icon('comment_petrol.png') ?> <?= $this->translate('Add comment') ?>
+        </a>
+    </td>
+</tr>
+
 <?php
 
-$cf = $this->getHelper('CommandForm');
-
-$data = array('host' => $object->host_name);
-if ($object->service_description) {
-    $data['service'] = $object->service_description;
-}
-
-$list = array();
 foreach ($object->comments as $comment) {
-
     // Ticket hook sample
     $text = $this->tickets ? preg_replace_callback(
         $this->tickets->getPattern(),
@@ -17,34 +34,26 @@ foreach ($object->comments as $comment) {
         $this->escape($comment->comment)
     ) : $this->escape($comment->comment);
 
-    $deleteData = $data;
-    $deleteData['commentid'] = $comment->id;
 
-    // $iconForm = $cf->iconSubmitForm(
-    //     'img/icons/remove_petrol.png',
-    $iconForm = $cf->labelSubmitForm(
-        'X',
-        'Remove comment',
-        'link-like',
-        'removecomment',
-        $deleteData
-    );
+    $form = clone $delCommentForm;
+    $form->populate(array('comment_id' => $comment->id));
 
-    $list[] = sprintf(
-        '<tr><th>%s (%s)</th><td><table><tr><td style="vertical-align: top;" data-base-target="_self">%s (%s):</td><td style="padding-left: .5em;">%s</td></tr></table></td></tr>',
-        $this->escape($comment->author),
-        $this->timeSince($comment->timestamp),
-        $iconForm,
-        ucfirst($comment->type),
-        str_replace(array('\r\n', '\n'), '<br>', $text)
-    );
-}
+    ?>
 
-?>
-<tr>
-    <th><?= $this->translate('Comments') ?></th>
-    <td>
-        <a href="<?= $this->href('monitoring/command/addComment', $data) ?>"><?= $this->icon('comment_petrol.png') ?> <?= $this->translate('Add comment') ?></a>
-    </td>
-</tr>
-<?= implode("\n", $list) ?>
+    <tr>
+        <th><?= $this->escape($comment->author) ?> (<?= $this->timeSince($comment->timestamp) ?>)</th>
+        <td>
+            <table>
+                <tr>
+                    <td style="vertical-align: top;" data-base-target="_self">
+                        <?= $form ?> (<?= ucfirst($comment->type) ?>):
+                    </td>
+                    <td style="padding-left: .5em;">
+                        <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
+                    </td>
+                </tr>
+            </table>
+        </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 f78666531..9198c2120 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -1,39 +1,31 @@
+<tr>
+    <th><?= $this->translate('Downtimes') ?></th>
+    <td>
+        <?php
+
+        /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+
+        if ($object->getType() === $object::TYPE_HOST) {
+            $scheduleDowntimeLink = $this->href(
+                'monitoring/host/schedule-downtime',
+                array('host' => $object->getHost())
+            );
+        } else {
+            $scheduleDowntimeLink = $this->href(
+                'monitoring/service/schedule-downtime',
+                array('host' => $object->getHost(), 'service' => $object->getService())
+            );
+        }
+        ?>
+        <a href="<?= $scheduleDowntimeLink ?>">
+            <?= $this->icon('in_downtime_petrol.png') ?> <?= $this->translate('Schedule downtime') ?>
+        </a>
+    </td>
+</tr>
+
 <?php
 
-$cf = $this->getHelper('CommandForm');
-
-$data = array('host' => $object->host_name);
-if ($object->service_description) {
-    $data['service'] = $object->service_description;
-}
-
-
-$list = array();
 foreach ($object->downtimes as $downtime) {
-    $deleteData = $data;
-    $deleteData['downtimeid'] = $downtime->id;
-
-    // TODO: This needs improvement
-    if ((int) $downtime->is_in_effect) {
-        $state = 'in downtime since ' . $this->timeSince($downtime->start);
-    } else {
-        if ($downtime->is_fixed) {
-            $state = 'scheduled ' . $this->timeUntil($downtime->start);
-        } else {
-            $state = 'scheduled flexible ' . $this->timeUntil($downtime->start);
-        }
-    }
-
-    // $iconForm = $cf->iconSubmitForm(
-    //     'img/icons/remove_petrol.png',
-    $iconForm = $cf->labelSubmitForm(
-        'X',
-        'Remove Downtime',
-        'link-like',
-        'removedowntime',
-        $deleteData
-    );
-    
     // Ticket hook sample
     $text = $this->tickets ? preg_replace_callback(
         $this->tickets->getPattern(),
@@ -41,20 +33,35 @@ foreach ($object->downtimes as $downtime) {
         $this->escape($downtime->comment)
     ) : $this->escape($downtime->comment);
 
-    $list[] = sprintf(
-        '<tr><th>%s</th><td><table><tr><td style="vertical-align: top;" data-base-target="_self">%s %s:</td><td style="padding-left: .5em;">%s</td></tr></table></td></tr>',
-        $this->escape($downtime->author),
-        $iconForm,
-        $state,
-        str_replace(array('\r\n', '\n'), '<br>', $text)
-    );
-}
+    $form = clone $delDowntimeForm;
+    $form->populate(array('downtime_id' => $downtime->id));
 
-?>
-<tr>
-  <th><?= $this->translate('Downtimes') ?></th>
-  <td>
-    <a href="<?= $this->href('monitoring/command/scheduleDowntime', $data) ?>"><?= $this->icon('in_downtime_petrol.png') ?> <?= $this->translate('Schedule downtime') ?></a>
-  </td>
-</tr>
-<?= implode("\n", $list) ?>
+    if ((bool) $downtime->is_in_effect) {
+        $state = 'in downtime since ' . $this->timeSince($downtime->start);
+    } else {
+        if ((bool) $downtime->is_fixed) {
+            $state = 'scheduled ' . $this->timeUntil($downtime->start);
+        } else {
+            $state = 'scheduled flexible ' . $this->timeUntil($downtime->start);
+        }
+    }
+
+    ?>
+
+    <tr>
+        <th><?= $this->escape($downtime->author) ?></th>
+        <td>
+            <table>
+                <tr>
+                    <td style="vertical-align: top;" data-base-target="_self">
+                        <?= $form ?> <?= $state ?>
+                    </td>
+                    <td style="padding-left: .5em;">
+                        <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+
+<?php }  // endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/flags.phtml b/modules/monitoring/application/views/scripts/show/components/flags.phtml
index fb02b97a3..1ecc788b7 100644
--- a/modules/monitoring/application/views/scripts/show/components/flags.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/flags.phtml
@@ -1,77 +1,3 @@
-<?php
-
-$o = $this->object;
-$cf = $this->getHelper('CommandForm');
-
-$data = array(
-    'host'      => $o->host_name,
-    'service'   => $o->service_description
-);
-
-?>
-  <tr class="newsection">
-    <th><?= $this->translate('Passive Checks') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->passive_checks_enabled,
-        'startacceptingpassivechecks',
-        'stopacceptingpassivechecks',
-        $o->passive_checks_enabled_changed === '1',
-        $data
-    ) ?></td>
-  </tr>
-  <tr>
-    <th><?= $this->translate('Active Checks') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->active_checks_enabled,
-        'enableactivechecks',
-        'disableactivechecks',
-        $o->active_checks_enabled_changed === '1',
-        $data
-    ) ?></td>
-  </tr>
-  <tr>
-    <th><?= $this->translate('Notifications') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->notifications_enabled,
-        'enablenotifications',
-        'disablenotifications',
-        $o->notifications_enabled_changed === '1',
-        $data
-    ) ?></td>
-  </tr>
-  <tr>
-    <th><?= $this->translate('Event Handler') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->event_handler_enabled,
-        'enableeventhandler',
-        'disableeventhandler',
-        $o->event_handler_enabled_changed === '1',
-        $data
-    ) ?></td>
-  </tr>
-  <tr>
-    <th><?= $this->translate('Flap Detection') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->flap_detection_enabled,
-        'enableflapdetection',
-        'disableflapdetection',
-        $o->flap_detection_enabled_changed === '1',
-        $data
-     ) ?></td>
-  </tr>
-  <tr>
-    <th><?= $this->translate('Obsessing') ?></th>
-    <td data-base-target="_self"><?= $cf->toggleSubmitForm(
-        '',
-        $o->obsessing,
-        'startobsessing',
-        'stopobsessing',
-        $o->obsessing_changed === '1',
-        $data
-    ) ?></td>
-  </tr>
+<tr class="newsection">
+    <td colspan="2" data-base-target="_self"><?= $toggleFeaturesForm ?></td>
+</tr>

From 33e0fbb7d9811d291b471996d540e40b55adcea3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 12 Sep 2014 16:53:48 +0200
Subject: [PATCH 227/277] monitoring/commands: Fix code compliance

refs #6593
---
 .../Instance/ToggleInstanceFeaturesCommandForm.php | 14 +++++++-------
 .../Transport/CommandTransportInterface.php        |  4 +++-
 .../Command/Transport/RemoteCommandFile.php        |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 9b3f79801..883a11a35 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -27,7 +27,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
      */
     public function init()
     {
-        $this->setAttrib('class', 'inline');
+        $this->setAttrib('class', 'inline instance-features');
     }
 
     /**
@@ -60,19 +60,19 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
     public function createElements(array $formData = array())
     {
         if ((bool) $this->status->notifications_enabled) {
-            $description = sprintf(
+            $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->getView()->href('monitoring/process/disable-notifications'),
                 mt('monitoring', 'Disable temporarily')
             );
         } elseif ($this->status->disable_notif_expire_time) {
-            $description = sprintf(
+            $notificationDescription = sprintf(
                 mt('monitoring', 'Notifications will be re-enabled in <strong>%s</strong>'),
                 $this->getView()->timeUntil($this->status->disable_notif_expire_time)
             );
         } else {
-            $description = '';
+            $notificationDescription = null;
         }
         $this->addElements(array(
             array(
@@ -113,17 +113,17 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 array(
                     'label'         => mt('monitoring', 'Notifications Enabled'),
                     'autosubmit'    => true,
-                    'description'   => $description,
+                    'description'   => $notificationDescription,
                     'decorators'    => array(
                         'ViewHelper',
                         'Errors',
                         array(
                             'Description',
-                            array('tag' => 'span', 'class' => 'feature-instance-notifications', 'escape' => false)
+                            array('tag' => 'span', 'class' => 'description', 'escape' => false)
                         ),
                         'Label',
                         array('HtmlTag', array('tag' => 'div'))
-                    ),
+                    )
                 )
             ),
             array(
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index 5f0908fa3..21b532d49 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -7,4 +7,6 @@ namespace Icinga\Module\Monitoring\Command\Transport;
 /**
  * Interface for Icinga command transports
  */
-interface CommandTransportInterface {}
+interface CommandTransportInterface
+{
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index c019106cc..fad4eb0a2 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -183,13 +183,13 @@ class RemoteCommandFile implements CommandTransportInterface
                 $this->path
             )
         );
-        $ssh = sprintf('ssh -o BatchMode=yes -p %u', $this->port);  // -o BatchMode=yes for disabling interactive
-                                                                    // authentication methods
+        $ssh = sprintf('ssh -o BatchMode=yes -p %u', $this->port);
+        // -o BatchMode=yes for disabling interactive authentication methods
         if (isset($this->user)) {
             $ssh .= sprintf(' -l %s', escapeshellarg($this->user));
         }
         $ssh .= sprintf(
-            ' %s "echo %s > %s" 2>&1',  // Redirect stderr to stdout
+            ' %s "echo %s > %s" 2>&1', // Redirect stderr to stdout
             escapeshellarg($this->host),
             escapeshellarg($commandString),
             escapeshellarg($this->path)

From 6bfab250090fff83723da6bdccdbe2c462ba15d6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Sat, 13 Sep 2014 20:33:45 +0200
Subject: [PATCH 228/277] monitoring/commands: Remove the `CommandForm' view
 helper

All command forms will be renderered using their real classes.

refs #6593
---
 .../application/views/helpers/CommandForm.php | 179 ------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 modules/monitoring/application/views/helpers/CommandForm.php

diff --git a/modules/monitoring/application/views/helpers/CommandForm.php b/modules/monitoring/application/views/helpers/CommandForm.php
deleted file mode 100644
index fd0ffd581..000000000
--- a/modules/monitoring/application/views/helpers/CommandForm.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-use Icinga\Web\Form;
-
-/**
- * Helper to build inline html command forms
- */
-class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
-{
-    private static $getArguments = array(
-        'host',
-        'service',
-        'global',
-        'commentid',
-        'downtimeid'
-    );
-
-    /**
-     * Creates a simple form without additional input fields
-     *
-     * @param   string  $commandName    Name of command (icinga 2 web name)
-     * @param   array   $arguments      Add parameter as hidden fields
-     *
-     * @return  Form                    Form to modify
-     */
-    public function simpleForm($commandName, array $arguments = array())
-    {
-        $form = new Form();
-        $form->setAttrib('class', 'inline');
-        $form->setRequest(Zend_Controller_Front::getInstance()->getRequest());
-
-        // Filter work only from get parts. Put important
-        // fields in the action URL
-        $getParts = array();
-        foreach (self::$getArguments as $argumentName) {
-            if (array_key_exists($argumentName, $arguments) === true) {
-                if ($arguments[$argumentName]) {
-                    $getParts[$argumentName] = $arguments[$argumentName];
-                }
-
-                unset($arguments[$argumentName]);
-            }
-        }
-
-        $form->setAction($this->view->href('monitoring/command/' . $commandName, $getParts));
-
-        foreach ($arguments as $elementName => $elementValue) {
-            $hiddenField = new Zend_Form_Element_Hidden($elementName);
-            $hiddenField->setValue($elementValue);
-            $form->addElement($hiddenField);
-
-            $hiddenField = $form->getElement($elementName);
-        }
-
-        return $form;
-    }
-
-    /**
-     * Creates an iconized submit form
-     *
-     * @param string    $iconCls        Css class of icon
-     * @param string    $submitTitle   Title of submit button
-     * @param string    $cls           Css class names
-     * @param string    $commandName   Name of command
-     * @param array     $arguments     Additional arguments
-     *
-     * @return Form
-     */
-    public function iconSubmitForm($icon, $submitTitle, $cls, $commandName, array $arguments = array())
-    {
-        $form = $this->labelSubmitForm('', $submitTitle, $cls, $commandName, $arguments);
-        $submit = $form->getElement('btn_submit');
-        $submit->setLabel($this->view->img($icon));
-
-        return $form;
-    }
-
-    /**
-     * Renders a simple for with a labeled submit button
-     *
-     * @param string $submitLabel   Label of submit button
-     * @param string $submitTitle   Title of submit button
-     * @param string $cls           Css class names
-     * @param string $commandName   Name of command
-     * @param array  $arguments     Additional arguments
-     *
-     * @return Form
-     */
-    public function labelSubmitForm($submitLabel, $submitTitle, $cls = '', $commandName, array $arguments = array())
-    {
-        $form = $this->simpleForm($commandName, $arguments);
-
-        $button = new Zend_Form_Element_Submit(
-            array(
-                'name'      => 'btn_submit',
-                'class'     => $cls,
-                'escape'    => false,
-                'value'     => '1',
-                'type'      => 'submit',
-                'label'     => $submitLabel,
-                'title'     => $submitTitle
-            )
-        );
-
-        $form->addElement($button);
-
-        // Because of implicit added decorators
-        $form->getElement('btn_submit')->setDecorators(array('ViewHelper'));
-
-        return $form;
-    }
-
-    /**
-     * Create a toggle form for switch between commands
-     *
-     * @param   string  $label
-     * @param   string  $checkValue
-     * @param   string  $enabledCommand
-     * @param   string  $disabledCommand
-     * @param   bool    $changed
-     * @param   array   $arguments
-     *
-     * @return  string
-     */
-    public function toggleSubmitForm($label, $checkValue, $enabledCommand, $disabledCommand, $changed = false, array $arguments = array())
-    {
-        if ($checkValue === '1') {
-            $commandName = $disabledCommand;
-        } else {
-            $commandName = $enabledCommand;
-        }
-
-        $form = $this->simpleForm($commandName, $arguments);
-
-        $uniqueName = uniqid('check');
-
-        $checkBox = new Zend_Form_Element_Checkbox($uniqueName);
-
-        if ($checkValue === '1') {
-            $checkBox->setChecked(true);
-        }
-
-        $form->addElement($checkBox);
-
-        $checkBox->setDecorators(array('ViewHelper'));
-        $checkBox->setAttrib('id', $uniqueName);
-        $form->enableAutoSubmit(array($uniqueName));
-
-        $submit_identifier = new Zend_Form_Element_Hidden('btn_submit');
-        $submit_identifier->setValue('1');
-        $form->addElement($submit_identifier);
-        $form->getElement('btn_submit')->setDecorators(array('ViewHelper'));
-
-        $out = '';
-        if ($label) {
-            $out .= '<label for="' . $uniqueName . '">'
-                . $label
-                . '</label>';
-        }
-
-        if ($changed === true) {
-            $out .= ' (modified)';
-        }
-
-        $formCode = (string) $form;
-
-        $jsLessSubmit = '<noscript>'
-            . '<input type="submit" value="Change" class="button" />'
-            . '</noscript></form>';
-
-        $formCode = str_replace('</form>', $jsLessSubmit, $formCode);
-
-        $out .= $formCode;
-
-        return $out;
-    }
-}

From a18287d183b8cac1597556fac7301ddc1fc116f9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Sat, 13 Sep 2014 20:34:51 +0200
Subject: [PATCH 229/277] monitoring/commands: Rename `PropagateHostDowntime'
 to `PropagateHostDowntimeCommand'

refs #6593
---
 ...PropagateHostDowntime.php => PropagateHostDowntimeCommand.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/monitoring/library/Monitoring/Command/Object/{PropagateHostDowntime.php => PropagateHostDowntimeCommand.php} (100%)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntime.php
rename to modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php

From f8edb4f220c4654363441dac77d3ccba27f998de Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 09:28:10 +0200
Subject: [PATCH 230/277] lib: Add method `ActionController::prepareInit()'

As it should not be required for controllers to call the parent's init() method, base controllers should use
prepareInit() in order to prepare the controller initialization.
---
 library/Icinga/Web/Controller/ActionController.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index aead4043a..80d809804 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -91,9 +91,22 @@ class ActionController extends Zend_Controller_Action
         }
 
         $this->view->tabs = new Tabs();
+        $this->prepareInit();
         $this->init();
     }
 
+    /**
+     * Prepare controller initialization
+     *
+     * As it should not be required for controllers to call the parent's init() method, base controllers should use
+     * prepareInit() in order to prepare the controller initialization.
+     *
+     * @see \Zend_Controller_Action()::init() For the controller initialization method.
+     */
+    protected function prepareInit()
+    {
+    }
+
     public function Config($file = null)
     {
         if ($file === null) {

From 5c647719e423c1423a758c9a5db83a5b0bb88632 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 09:29:03 +0200
Subject: [PATCH 231/277] lib/ModuleActionController: Fix stupid code

---
 .../Web/Controller/ModuleActionController.php | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 55663123b..0f540c2a0 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -6,9 +6,10 @@ namespace Icinga\Web\Controller;
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
-use Zend_Controller_Request_Abstract as Request;
-use Zend_Controller_Response_Abstract as Response;
 
+/**
+ * Base class for module action controllers
+ */
 class ModuleActionController extends ActionController
 {
     private $config;
@@ -17,34 +18,42 @@ class ModuleActionController extends ActionController
 
     private $module;
 
+    /**
+     * Module name
+     *
+     * @var string
+     */
     protected $moduleName;
 
-    public function __construct(
-        Request $request,
-        Response $response,
-        array $invokeArgs = array()
-    ) {
-        parent::__construct($request, $response, $invokeArgs);
-        $this->moduleName = $request->getModuleName();
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Controller\ActionController For the method documentation.
+     */
+    protected function prepareInit()
+    {
+        $this->moduleName = $this->_request->getModuleName();
         $this->_helper->layout()->moduleName = $this->moduleName;
         $this->view->translationDomain = $this->moduleName;
         $this->moduleInit();
     }
 
+    /**
+     * Prepare module action controller initialization
+     */
+    protected function moduleInit()
+    {
+    }
+
     public function Config($file = null)
     {
-        $module = $this->getRequest()->getModuleName();
-
-        $this->moduleName = $module;
-
         if ($file === null) {
             if ($this->config === null) {
-                $this->config = Config::module($module);
+                $this->config = Config::module($this->moduleName);
             }
             return $this->config;
         } else {
             if (! array_key_exists($file, $this->configs)) {
-                $this->configs[$file] = Config::module($module, $file);
+                $this->configs[$file] = Config::module($this->moduleName, $file);
             }
             return $this->configs[$file];
         }
@@ -58,19 +67,13 @@ class ModuleActionController extends ActionController
         return $this->module;
     }
 
-    public function postDispatch()
-    {
-        $req = $this->getRequest();
-        $resp = $this->getResponse();
-
-        if ($this->isXhr()) {
-            $resp->setHeader('X-Icinga-Module', $this->moduleName);
-        }
-
-        parent::postDispatch();
-    }
-
-    protected function moduleInit()
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Controller\ActionController::postDispatchXhr() For the method documentation.
+     */
+    public function postDispatchXhr()
     {
+        parent::postDispatchXhr();
+        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName);
     }
 }

From c21d7d1fdda460050cac822e5627fd584b3f7a01 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 09:54:23 +0200
Subject: [PATCH 232/277] lib: Remove form element `Note'

Zend already provides this.
---
 library/Icinga/Web/Form/Element/Note.php | 31 ------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 library/Icinga/Web/Form/Element/Note.php

diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
deleted file mode 100644
index 5788c200d..000000000
--- a/library/Icinga/Web/Form/Element/Note.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Form\Element;
-
-use Zend_Form_Element_Xhtml;
-
-/**
- * Implements note element for Zend forms
- */
-class Note extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Name of the view helper
-     *
-     * @var string
-     */
-    public $helper = 'formNote';
-
-    /**
-     * Return true to ensure redrawing
-     *
-     * @param mixed $value      The value of to validate (ignored)
-     * @return bool             Always true
-     */
-    public function isValid($value)
-    {
-        return true;
-    }
-}

From 0e6e37199ab853d03f9d655808f9028a5f315ba0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 17:28:00 +0200
Subject: [PATCH 233/277] monitoring/commands: Add 'command-form' partial

refs #6593
---
 .../application/views/scripts/partials/command-form.phtml     | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 modules/monitoring/application/views/scripts/partials/command-form.phtml

diff --git a/modules/monitoring/application/views/scripts/partials/command-form.phtml b/modules/monitoring/application/views/scripts/partials/command-form.phtml
new file mode 100644
index 000000000..5bff418e3
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/command-form.phtml
@@ -0,0 +1,4 @@
+<div class="content">
+    <h1><?= $title ?></h1>
+    <?= $form ?>
+</div>

From 92d855e0350707311eb9e7d63d75f5b1e4e8b4ac Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 17:29:29 +0200
Subject: [PATCH 234/277] monitoring/lib: Add `MonitoredObjectController'

The `MonitoredObjectController' should be the base class for the host and service controller.
---
 .../Controller/MonitoredObjectController.php  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
new file mode 100644
index 000000000..4ad204e5c
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -0,0 +1,122 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Web\Controller;
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm;
+use Icinga\Web\Url;
+
+/**
+ * Base class for the host and service controller
+ */
+abstract class MonitoredObjectController extends Controller
+{
+    /**
+     * The requested host or service
+     *
+     * @var \Icinga\Module\Monitoring\Object\Host|\Icinga\Module\Monitoring\Object\Host
+     */
+    protected $object;
+
+    /**
+     * URL to redirect to after a command was handled
+     *
+     * @var string
+     */
+    protected $commandRedirectUrl;
+
+    /**
+     * Show a host or service
+     */
+    public function showAction()
+    {
+        $this->setAutorefreshInterval(10);
+        $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();
+                $removeAckForm
+                    ->setObjects($this->object)
+                    ->handleRequest();
+                $this->view->removeAckForm = $removeAckForm;
+            } else {
+                $ackForm = new AcknowledgeProblemCommandForm();
+                $ackForm
+                    ->setObjects($this->object)
+                    ->handleRequest();
+                $this->view->ackForm = $ackForm;
+            }
+        }
+        if (count($this->object->comments) > 0) {
+            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm
+                ->setObjects($this->object)
+                ->handleRequest();
+            $this->view->delCommentForm = $delCommentForm;
+        }
+        if (count($this->object->downtimes > 0)) {
+            $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;
+        $this->view->object = $this->object->populate();
+    }
+
+    /**
+     * Handle a command form
+     *
+     * @param   ObjectsCommandForm $form
+     *
+     * @return  ObjectsCommandForm
+     */
+    protected function handleCommandForm(ObjectsCommandForm $form)
+    {
+        $form
+            ->setObjects($this->object)
+            ->setRedirectUrl(Url::fromPath($this->commandRedirectUrl)->setParams($this->params))
+            ->handleRequest();
+        $this->view->form = $form;
+        $this->_helper->viewRenderer('partials/command-form', null, true);
+        return $form;
+    }
+
+    /**
+     * Acknowledge a problem
+     */
+    abstract public function acknowledgeProblemAction();
+
+    /**
+     * Add a comment
+     */
+    abstract public function addCommentAction();
+
+    /**
+     * Reschedule a check
+     */
+    abstract public function rescheduleCheckAction();
+
+    /**
+     * Schedule a downtime
+     */
+    abstract public function scheduleDowntimeAction();
+}

From 0a81aeefa25683e8d2f7836890e8b33ce0bc78aa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:21:41 +0200
Subject: [PATCH 235/277] monitoring: Deprecate `MonitoringState' view helper

---
 .../views/helpers/MonitoringState.php         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php
index 935578ca5..c20c08c96 100644
--- a/modules/monitoring/application/views/helpers/MonitoringState.php
+++ b/modules/monitoring/application/views/helpers/MonitoringState.php
@@ -2,11 +2,17 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
+/**
+ * @deprecated Crap.
+ */
 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 The host or service object must know it's possible states.
+     */
     public function monitoringState($object, $type = 'service')
     {
         if ($type === 'service') {
@@ -16,26 +22,41 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
         }
     }
 
+    /**
+     * @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();
@@ -60,6 +81,9 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
         return $state_classes;
     }
 
+    /**
+     * @deprecated Not translated.
+     */
     public function getStateTitle($object, $type)
     {
         return strtoupper($this->monitoringState($object, $type))

From 44c4ec751dfba4aed13aae39aed8b54112011e32 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:33:28 +0200
Subject: [PATCH 236/277] Deprecate monitoring module related methods in the
 `Util' view helper

---
 application/views/helpers/Util.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index 25b209a36..ccc3e8e1c 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -64,6 +64,9 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
         return date('H:i d.m.Y', $timestamp);
     }
 
+    /**
+     * @deprecated Not used. This is monitoring module stuff.
+     */
     public static function getHostStateClassName($state)
     {
         $class = 'unknown';
@@ -82,6 +85,9 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
         return $class;
     }
 
+    /**
+     * @deprecated Crap. This is monitoring module stuff.
+     */
     public static function getHostStateName($state)
     {
         $states = array(
@@ -98,6 +104,9 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
         return sprintf('OUT OF BOUNDS (%s)', var_export($state, 1));
     }
 
+    /**
+     * @deprecated Crap. This is monitoring module stuff.
+     */
     public static function getServiceStateName($state)
     {
         if ($state === null) { $state = 3; } // really?

From c04768ee8f899ce8657f457073ab2eb3994527d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:38:03 +0200
Subject: [PATCH 237/277] monitoring/`MonitoredObject': Use `host_name' and
 `service_description' for filtering

---
 .../Monitoring/Object/MonitoredObject.php     | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index cb95c2e41..e3044d2b3 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -162,6 +162,19 @@ abstract class MonitoredObject
         return true;
     }
 
+    /**
+     * Set the object's properties
+     *
+     * @param   object $properties
+     *
+     * @return  $this
+     */
+    public function setProperties($properties)
+    {
+        $this->properties = (object) $properties;
+        return $this;
+    }
+
     /**
      * Fetch the object's comments
      *
@@ -178,9 +191,9 @@ abstract class MonitoredObject
         ))
             ->where('comment_type', array('comment', 'ack'))
             ->where('comment_objecttype', $this->type)
-            ->where('comment_host', $this->host);
+            ->where('comment_host', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
-            $comments->where('comment_service', $this->service);
+            $comments->where('comment_service', $this->service_description);
         }
         $this->comments = $comments->getQuery()->fetchAll();
         return $this;
@@ -210,11 +223,11 @@ abstract class MonitoredObject
             'service'           => 'downtime_service'
         ))
             ->where('downtime_objecttype', $this->type)
-            ->where('downtime_host', $this->host)
+            ->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);
+            $downtimes->where('downtime_service', $this->service_description);
         }
         $this->downtimes = $downtimes->getQuery()->fetchAll();
         return $this;
@@ -265,9 +278,9 @@ abstract class MonitoredObject
             'varvalue'
         ))
             ->where('object_type', $this->type)
-            ->where('host_name', $this->host);
+            ->where('host_name', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
-            $query->where('service_description', $this->service);
+            $query->where('service_description', $this->service_description);
         }
 
         $this->customvars = array();
@@ -299,7 +312,7 @@ abstract class MonitoredObject
         ))
             ->where('host_name', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
-            $contacts->where('service_description', $this->service);
+            $contacts->where('service_description', $this->service_description);
         }
         $this->contacts = $contacts->getQuery()->fetchAll();
         return $this;
@@ -316,8 +329,8 @@ abstract class MonitoredObject
                 'servicegroup_name',
                 'servicegroup_alias'
         ))
-            ->where('service_host_name', $this->host)
-            ->where('service_description', $this->service);
+            ->where('service_host_name', $this->host_name)
+            ->where('service_description', $this->service_description);
         $this->servicegroups = $serviceGroups->getQuery()->fetchPairs();
         return $this;
     }
@@ -333,9 +346,9 @@ abstract class MonitoredObject
                 'contactgroup_name',
                 'contactgroup_alias'
         ))
-            ->where('host_name', $this->host);
+            ->where('host_name', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
-            $contactsGroups->where('service_description', $this->service);
+            $contactsGroups->where('service_description', $this->service_description);
         }
         $this->contactgroups = $contactsGroups->getQuery()->fetchAll();
         return $this;
@@ -360,9 +373,9 @@ abstract class MonitoredObject
                 'type'
         ))
             ->order('timestamp', 'DESC')
-            ->where('host_name', $this->host);
+            ->where('host_name', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
-            $eventHistory->where('service_description', $this->service);
+            $eventHistory->where('service_description', $this->service_description);
         }
         $this->eventhistory = $eventHistory->getQuery();
         return $this;
@@ -398,10 +411,12 @@ abstract class MonitoredObject
             $this->$fetchMethod();
             return $this->$name;
         }
-        if (substr($name, 0, strlen($this->prefix)) === $this->prefix) {
-            throw new InvalidPropertyException('Can\'t access property \'%s\'. Property does not exist.', $name);
+        if (substr($name, 0, strlen($this->prefix)) !== $this->prefix) {
+            $prefixedName = $this->prefix . strtolower($name);
+            if (property_exists($this->properties, $prefixedName)) {
+                return $this->properties->$prefixedName;
+            }
         }
-        $prefixedName = $this->prefix . strtolower($name);
-        return $this->$prefixedName;
+        throw new InvalidPropertyException('Can\'t access property \'%s\'. Property does not exist.', $name);
     }
 }

From 88b3b5d69031a4de3a5154d73a9cc6dc51c5751b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:39:13 +0200
Subject: [PATCH 238/277] monitoring/`Host': Add `fetchServices', `fetchStats'
 and `getStateText'

---
 .../library/Monitoring/Object/Host.php        | 116 +++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 0b482cfce..fbd90f2a5 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use InvalidArgumentException;
 use Icinga\Module\Monitoring\Backend;
 
 /**
@@ -11,6 +12,26 @@ use Icinga\Module\Monitoring\Backend;
  */
 class Host extends MonitoredObject
 {
+    /**
+     * Host state 'UP'
+     */
+    const STATE_UP = 0;
+
+    /**
+     * Host state 'DOWN'
+     */
+    const STATE_DOWN = 1;
+
+    /**
+     * Host state 'UNREACHABLE'
+     */
+    const STATE_UNREACHABLE = 2;
+
+    /**
+     * Host state 'PENDING'
+     */
+    const STATE_PENDING = 99;
+
     /**
      * Type of the Icinga host
      *
@@ -32,6 +53,20 @@ class Host extends MonitoredObject
      */
     protected $host;
 
+    /**
+     * The services running on the hosts
+     *
+     * @var \Icinga\Module\Monitoring\Object\Service[]
+     */
+    protected $services;
+
+    /**
+     * Stats
+     *
+     * @var object
+     */
+    protected $stats;
+
     /**
      * Create a new host
      *
@@ -49,7 +84,7 @@ class Host extends MonitoredObject
      *
      * @return string
      */
-    public function getHost()
+    public function getName()
     {
         return $this->host;
     }
@@ -106,4 +141,83 @@ class Host extends MonitoredObject
         ))
             ->where('host_name', $this->host);
     }
+
+    /**
+     * Fetch the services running on the host
+     *
+     * @return $this
+     */
+    public function fetchServices()
+    {
+        $services = array();
+        foreach ($this->backend->select()->from('serviceStatus', array('service_description'))
+                ->where('host_name', $this->host)
+                ->getQuery()
+                ->fetchAll() as $service) {
+            $services[] = new Service($this->backend, $this->host, $service->service_description);
+        }
+        $this->services = $services;
+        return $this;
+    }
+
+    /**
+     * Fetch stats
+     *
+     * @return $this
+     */
+    public function fetchStats()
+    {
+        $this->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->host)
+            ->getQuery()
+            ->fetchRow();
+        return $this;
+    }
+
+    /**
+     * Get the optional translated textual representation of a host state
+     *
+     * @param   int     $state
+     * @param   bool    $translate
+     *
+     * @return  string
+     * @throws  InvalidArgumentException If the host state is not valid
+     */
+    public static function getStateText($state, $translate = false)
+    {
+        switch ((int) $state) {
+            case self::STATE_UP:
+                $text = $translate ? mt('monitoring', 'up') : 'up';
+                break;
+            case self::STATE_DOWN:
+                $text = $translate ? mt('monitoring', 'down') : 'down';
+                break;
+            case self::STATE_UNREACHABLE:
+                $text = $translate ? mt('monitoring', 'unreachable') : 'unreachable';
+                break;
+            case self::STATE_PENDING:
+                $text = $translate ? mt('monitoring', 'pending') : 'pending';
+                break;
+            default:
+                throw new InvalidArgumentException('Invalid host state \'%s\'', $state);
+                break;
+        }
+        return $text;
+    }
 }

From d091e2150c2edf2c6f8c58e0d017753d5ee788d8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:43:14 +0200
Subject: [PATCH 239/277] Fix `ActionController::prepareInit()' php doc

---
 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 80d809804..081e4be54 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -101,7 +101,7 @@ class ActionController extends Zend_Controller_Action
      * As it should not be required for controllers to call the parent's init() method, base controllers should use
      * prepareInit() in order to prepare the controller initialization.
      *
-     * @see \Zend_Controller_Action()::init() For the controller initialization method.
+     * @see \Zend_Controller_Action::init() For the controller initialization method.
      */
     protected function prepareInit()
     {

From cc2d06e5821ee90bf9e3ab728456e1825c00d476 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:44:44 +0200
Subject: [PATCH 240/277] monitoring/`Service': Add `getStateText()', let
 `getHost()' return the host object

refs #6593
---
 .../library/Monitoring/Object/Service.php     | 73 +++++++++++++++++--
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 1c1c80679..ac6957eab 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use InvalidArgumentException;
 use Icinga\Module\Monitoring\Backend;
 
 /**
@@ -11,6 +12,31 @@ use Icinga\Module\Monitoring\Backend;
  */
 class Service extends MonitoredObject
 {
+    /**
+     * Service state 'OK'
+     */
+    const STATE_OK = 0;
+
+    /**
+     * Service state 'WARNING'
+     */
+    const STATE_WARNING = 1;
+
+    /**
+     * Service state 'CRITICAL'
+     */
+    const STATE_CRITICAL = 2;
+
+    /**
+     * Service state 'UNKNOWN'
+     */
+    const STATE_UNKNOWN = 3;
+
+    /**
+     * Service state 'PENDING'
+     */
+    const STATE_PENDING = 99;
+
     /**
      * Type of the Icinga service
      *
@@ -26,9 +52,9 @@ class Service extends MonitoredObject
     public $prefix = 'service_';
 
     /**
-     * Host name the service is running on
+     * Host the service is running on
      *
-     * @var string
+     * @var Host
      */
     protected $host;
 
@@ -49,14 +75,14 @@ class Service extends MonitoredObject
     public function __construct(Backend $backend, $host, $service)
     {
         parent::__construct($backend);
-        $this->host = $host;
+        $this->host = new Host($backend, $host);
         $this->service = $service;
     }
 
     /**
-     * Get the host name the service is running on
+     * Get the host the service is running on
      *
-     * @return string
+     * @return Host
      */
     public function getHost()
     {
@@ -68,7 +94,7 @@ class Service extends MonitoredObject
      *
      * @return string
      */
-    public function getService()
+    public function getName()
     {
         return $this->service;
     }
@@ -167,7 +193,40 @@ class Service extends MonitoredObject
             'service_process_performance_data',
             'service_percent_state_change'
         ))
-            ->where('host_name', $this->host)
+            ->where('host_name', $this->host->getName())
             ->where('service_description', $this->service);
     }
+
+    /**
+     * Get the translated textual representation of a service state
+     *
+     * @param   int $state
+     *
+     * @return  string
+     * @throws  InvalidArgumentException If the service state is not valid
+     */
+    public static function getStateText($state)
+    {
+        switch ((int) $state) {
+            case self::STATE_OK:
+                $text = mt('monitoring', 'ok');
+                break;
+            case self::STATE_WARNING:
+                $text = mt('monitoring', 'warning');
+                break;
+            case self::STATE_CRITICAL:
+                $text = mt('monitoring', 'critical');
+                break;
+            case self::STATE_UNKNOWN:
+                $text = mt('monitoring', 'unknown');
+                break;
+            case self::STATE_PENDING:
+                $text = mt('monitoring', 'pending');
+                break;
+            default:
+                throw new InvalidArgumentException('Invalid service state \'%s\'', $state);
+                break;
+        }
+        return $text;
+    }
 }

From 05776651b4684dba83baceacb6bba0d4641ad491 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:45:31 +0200
Subject: [PATCH 241/277] modules/commands: Fix
 `IcingaCommandFileCommandRenderer's `getHost()' and `getService()' calls

refs #6593
---
 .../IcingaCommandFileCommandRenderer.php      | 67 ++++++++++---------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 84731c905..67de7a02d 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -9,6 +9,7 @@ use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
+use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
@@ -61,14 +62,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             /** @var \Icinga\Module\Monitoring\Object\Host $object */
             $commandString = sprintf(
                 'ADD_HOST_COMMENT;%s',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 'ADD_SVC_COMMENT;%s;%s',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return sprintf(
@@ -87,14 +88,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             /** @var \Icinga\Module\Monitoring\Object\Host $object */
             $commandString = sprintf(
                 'SEND_CUSTOM_HOST_NOTIFICATION;%s',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 'SEND_CUSTOM_SVC_NOTIFICATION;%s;%s',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         $options = 0; // 0 for no options
@@ -120,14 +121,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             /** @var \Icinga\Module\Monitoring\Object\Host $object */
             $commandString = sprintf(
                 'PROCESS_HOST_CHECK_RESULT;%s',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 'PROCESS_SVC_CHECK_RESULT;%s;%s',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         $output = $command->getOutput();
@@ -164,15 +165,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 $commandName,
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 $command->getForced() === true ? 'SCHEDULE_FORCED_SVC_CHECK' : 'SCHEDULE_SVC_CHECK',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return sprintf(
@@ -188,7 +189,11 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
         if ($command->getObject()->getType() === $command::TYPE_HOST) {
             /** @var \Icinga\Module\Monitoring\Object\Host $object */
             /** @var \Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand $command */
-            if ($command->getForAllServices() === true) {
+            if ($command instanceof PropagateHostDowntimeCommand) {
+                /** @var \Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand $command */
+                $commandName = $command->getTriggered() === true ? 'SCHEDULE_AND_PROPAGATE_TRIGGERED_HOST_DOWNTIME'
+                    : 'SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME';
+            } elseif ($command->getForAllServices() === true) {
                 $commandName = 'SCHEDULE_HOST_SVC_DOWNTIME';
             } else {
                 $commandName = 'SCHEDULE_HOST_DOWNTIME';
@@ -196,15 +201,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 $commandName,
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 'SCHEDULE_SVC_DOWNTIME',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return sprintf(
@@ -228,15 +233,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 $command->getExpireTime() !== null ? 'ACKNOWLEDGE_HOST_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_HOST_PROBLEM',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 $command->getExpireTime() !== null ? 'ACKNOWLEDGE_SVC_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_SVC_PROBLEM',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         $commandString = sprintf(
@@ -301,15 +306,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 $commandFormat . ';%s',
                 'HOST',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 $commandFormat . ';%s;%s',
                 'SVC',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return $commandString;
@@ -323,15 +328,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 'DEL_HOST_DOWNTIME',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 'DEL_SVC_COMMENT',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return sprintf(
@@ -349,15 +354,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 'DEL_HOST_DOWNTIME',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 'DEL_SVC_DOWNTIME',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return sprintf(
@@ -375,15 +380,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
             $commandString = sprintf(
                 '%s;%s',
                 'REMOVE_HOST_ACKNOWLEDGEMENT',
-                $object->getHost()
+                $object->getName()
             );
         } else {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $commandString = sprintf(
                 '%s;%s;%s',
                 'REMOVE_SVC_ACKNOWLEDGEMENT',
-                $object->getHost(),
-                $object->getService()
+                $object->getHost()->getName(),
+                $object->getName()
             );
         }
         return $commandString;

From 0084fed2c352011c85f43b90702260cc8ef10faf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:46:27 +0200
Subject: [PATCH 242/277] monitoring/`ServiceController': Extend
 `MonitoredObjectController'

---
 .../controllers/ServiceController.php         | 94 +++----------------
 1 file changed, 14 insertions(+), 80 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index f0d298be0..24bb23024 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -2,107 +2,41 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm;
 use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Web\Url;
+use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 
-class Monitoring_ServiceController extends Controller
+class Monitoring_ServiceController extends MonitoredObjectController
 {
     /**
-     * @var Service
+     * (non-PHPDoc)
+     * @see MonitoredObjectController::$commandRedirectUrl For the property documentation.
      */
-    protected $service;
+    protected $commandRedirectUrl = 'monitoring/service/show';
 
-    public function moduleInit()
+    /**
+     * Fetch the requested service from the monitoring backend
+     *
+     * @throws Zend_Controller_Action_Exception If the service was not found
+     */
+    public function init()
     {
-        parent::moduleInit();
         $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
         if ($service->fetch() === false) {
             throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
         }
-        $this->service = $service;
-    }
-
-    public function showAction()
-    {
-        $this->setAutorefreshInterval(10);
-        $checkNowForm = new CheckNowCommandForm();
-        $checkNowForm
-            ->setObjects($this->service)
-            ->handleRequest();
-        $this->view->checkNowForm = $checkNowForm;
-
-        if ( ! in_array((int) $this->service->state, array(0, 99))) {
-            if ((bool) $this->service->acknowledged) {
-                $removeAckForm = new RemoveAcknowledgementCommandForm();
-                $removeAckForm
-                    ->setObjects($this->service)
-                    ->handleRequest();
-                $this->view->removeAckForm = $removeAckForm;
-            } else {
-                $ackForm = new AcknowledgeProblemCommandForm();
-                $ackForm
-                    ->setObjects($this->service)
-                    ->handleRequest();
-                $this->view->ackForm = $ackForm;
-            }
-        }
-        if (count($this->service->comments) > 0) {
-            $delCommentForm = new DeleteCommentCommandForm();
-            $delCommentForm
-                ->setObjects($this->service)
-                ->handleRequest();
-            $this->view->delCommentForm = $delCommentForm;
-        }
-
-        if (count($this->service->downtimes > 0)) {
-            $delDowntimeForm = new DeleteDowntimeCommandForm();
-            $delDowntimeForm
-                ->setObjects($this->service)
-                ->handleRequest();
-            $this->view->delDowntimeForm = $delDowntimeForm;
-        }
-
-        $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
-        $toggleFeaturesForm
-            ->load($this->service)
-            ->setObjects($this->service)
-            ->handleRequest();
-        $this->view->toggleFeaturesForm = $toggleFeaturesForm;
-
-        $this->view->object = $this->service->populate();
-    }
-
-    protected function handleCommandForm(ObjectsCommandForm $form)
-    {
-        $form
-            ->setObjects($this->service)
-            ->setRedirectUrl(Url::fromPath(
-                'monitoring/service/show',
-                array('host' => $this->service->getHost(), 'service' => $this->service->getService())
-            ))
-            ->handleRequest();
-        $this->view->form = $form;
-        $this->_helper->viewRenderer('command');
-        return $form;
+        $this->object = $service;
     }
 
     /**
-     * Acknowledge a service downtime
+     * Acknowledge a service problem
      */
     public function acknowledgeProblemAction()
     {
-        $this->view->title = $this->translate('Acknowledge Service Downtime');
+        $this->view->title = $this->translate('Acknowledge Service Problem');
         $this->handleCommandForm(new AcknowledgeProblemCommandForm());
     }
 

From a2a645892d16c5048065521eecce460023ad706f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:46:58 +0200
Subject: [PATCH 243/277] monitoring: Add `HostController'

---
 .../controllers/HostController.php            | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 modules/monitoring/application/controllers/HostController.php

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
new file mode 100644
index 000000000..7799cb4ec
--- /dev/null
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -0,0 +1,69 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm;
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
+
+class Monitoring_HostController extends MonitoredObjectController
+{
+    /**
+     * (non-PHPDoc)
+     * @see MonitoredObjectController::$commandRedirectUrl For the property documentation.
+     */
+    protected $commandRedirectUrl = 'monitoring/host/show';
+
+    /**
+     * 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'));
+        if ($host->fetch() === false) {
+            throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
+        }
+        $this->object = $host;
+    }
+
+    /**
+     * Acknowledge a host problem
+     */
+    public function acknowledgeProblemAction()
+    {
+        $this->view->title = $this->translate('Acknowledge Host Problem');
+        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+    }
+
+    /**
+     * Add a host comment
+     */
+    public function addCommentAction()
+    {
+        $this->view->title = $this->translate('Add Host Comment');
+        $this->handleCommandForm(new AddCommentCommandForm());
+    }
+
+    /**
+     * Reschedule a host check
+     */
+    public function rescheduleCheckAction()
+    {
+        $this->view->title = $this->translate('Reschedule Host Check');
+        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+    }
+
+    /**
+     * Schedule a host downtime
+     */
+    public function scheduleDowntimeAction()
+    {
+        $this->view->title = $this->translate('Schedule Host Downtime');
+        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+    }
+}

From 4d8b6dddf112aee65e941f54c76a2f5ba5916fb4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:48:07 +0200
Subject: [PATCH 244/277] monitoring/commands: Add schedule host downtime
 command form

refs #6593
---
 .../ScheduleHostDowntimeCommandForm.php       | 93 +++++++++++++++++++
 .../ScheduleServiceDowntimeCommandForm.php    | 33 ++++---
 2 files changed, 112 insertions(+), 14 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
new file mode 100644
index 000000000..a56d11a5c
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -0,0 +1,93 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+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
+ */
+class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        parent::createElements($formData);
+        $this->addElements(array(
+            array(
+                'checkbox',
+                'all_services',
+                array(
+                    'label'         => mt('monitoring', 'All Services'),
+                    'value'         => true,
+                    'description'   => mt(
+                        'monitoring',
+                        'Schedule downtime for all services on the hosts and the hosts themself.'
+                    )
+                )
+            ),
+            array(
+                'select',
+                'child_hosts',
+                array(
+                    'label'        => mt('monitoring', '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')
+                    ),
+                    'description' => mt(
+                        'monitoring',
+                        'Define what should be done with the child hosts of the hosts.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $childHosts = (int) $this->getElement('child_hosts')->getValue();
+            $allServices = $this->getElement('all_services')->isChecked();
+            if ($childHosts === 0) {
+                $hostDowntime = new ScheduleHostDowntimeCommand();
+                if ($allServices === true) {
+                    $hostDowntime->setForAllServices();
+                };
+            } else {
+                $hostDowntime = new PropagateHostDowntimeCommand();
+                if ($childHosts === 1) {
+                    $hostDowntime->setTriggered();
+                }
+                if ($allServices === true) {
+                    foreach ($object->services as $service) {
+                        $serviceDowntime = new ScheduleServiceDowntimeCommand();
+                        $serviceDowntime->setObject($service);
+                        $this->scheduleDowntime($serviceDowntime, $request);
+                    }
+                }
+            }
+            $hostDowntime->setObject($object);
+            $this->scheduleDowntime($hostDowntime, $request);
+        }
+        Notification::success(mt('monitoring', 'Scheduling host downtime..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index b5d153dd5..508c3eed0 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -176,6 +176,23 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
         return $this;
     }
 
+    public function scheduleDowntime(ScheduleServiceDowntimeCommand $downtime, Request $request)
+    {
+        $downtime
+            ->setComment($this->getElement('comment')->getValue())
+            ->setAuthor($request->getUser()->getUsername())
+            ->setStart($this->getElement('start')->getValue()->getTimestamp())
+            ->setEnd($this->getElement('end')->getValue()->getTimestamp());
+        if ($this->getElement('type')->getValue() === self::FLEXIBLE) {
+            $downtime->setFixed(false);
+            $downtime->setDuration(
+                (float) $this->getElement('hours')->getValue() * 3600
+                + (float) $this->getElement('minutes')->getValue() * 60
+            );
+        }
+        $this->getTransport($request)->send($downtime);
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -185,20 +202,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
         foreach ($this->objects as $object) {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $downtime = new ScheduleServiceDowntimeCommand();
-            $downtime
-                ->setObject($object)
-                ->setComment($this->getElement('comment')->getValue())
-                ->setAuthor($request->getUser()->getUsername())
-                ->setStart($this->getElement('start')->getValue()->getTimestamp())
-                ->setEnd($this->getElement('end')->getValue()->getTimestamp());
-            if ($this->getElement('type')->getValue() === self::FLEXIBLE) {
-                $downtime->setFixed(false);
-                $downtime->setDuration(
-                    (float) $this->getElement('hours')->getValue() * 3600
-                    + (float) $this->getElement('minutes')->getValue() * 60
-                );
-            }
-            $this->getTransport($request)->send($downtime);
+            $downtime->setObject($object);
+            $this->scheduleDowntime($downtime, $request);
         }
         Notification::success(mt('monitoring', 'Scheduling service downtime..'));
         return true;

From 71ffd0ed74e6d9ec880cb32ec1b33e4f6a81b707 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 16 Sep 2014 18:48:36 +0200
Subject: [PATCH 245/277] monitoring/commands: Add schedule host check command
 form

refs #6593
---
 .../Command/Object/CheckNowCommandForm.php    |  4 +-
 .../Object/ScheduleHostCheckCommandForm.php   | 57 +++++++++++++++++++
 .../ScheduleServiceCheckCommandForm.php       | 15 +++--
 3 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index ade78402c..6cdf620f4 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -31,8 +31,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
     {
         $this->addElements(array(
             array(
-                'note',
-                'icon',
+                'note', // Bogus
+                'icon', // Bogus
                 array(
                     'decorators' => array(array(
                         'HtmlTag',
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
new file mode 100644
index 000000000..81a277004
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -0,0 +1,57 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\Form\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand;
+use Icinga\Web\Notification;
+use Icinga\Web\Request;
+
+/**
+ * Form for scheduling host checks
+ */
+class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        parent::createElements($formData);
+        $this->addElements(array(
+            array(
+                'checkbox',
+                'all_services',
+                array(
+                    'label'         => mt('monitoring', 'All Services'),
+                    'value'         => true,
+                    'description'   => mt(
+                        'monitoring',
+                        'Schedule check for all services on the hosts and the hosts themself.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess(Request $request)
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\Host $object */
+            $check = new ScheduleHostCheckCommand();
+            $check
+                ->setObject($object)
+                ->setOfAllServices($this->getElement('all_services')->isChecked());
+            $this->scheduleCheck($check, $request);
+        }
+        Notification::success(mt('monitoring', 'Scheduling host check..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index 477fb1733..ae8f23384 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -70,6 +70,14 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
         return $this;
     }
 
+    public function scheduleCheck(ScheduleServiceCheckCommand $check, Request $request)
+    {
+        $check
+            ->setForced($this->getElement('force_check')->isChecked())
+            ->setCheckTime($this->getElement('check_time')->getValue()->getTimestamp());
+        $this->getTransport($request)->send($check);
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -79,11 +87,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
         foreach ($this->objects as $object) {
             /** @var \Icinga\Module\Monitoring\Object\Service $object */
             $check = new ScheduleServiceCheckCommand();
-            $check
-                ->setObject($object)
-                ->setForced((bool) $this->getElement('force_check')->getValue())
-                ->setCheckTime($this->getElement('check_time')->getValue());
-            $this->getTransport($request)->send($check);
+            $check->setObject($object);
+            $this->scheduleCheck($check, $request);
         }
         Notification::success(mt('monitoring', 'Scheduling service check..'));
         return true;

From 5cdcf3624335acbeef4a1b2ffb47e0f02079eb6c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 17 Sep 2014 09:46:42 +0200
Subject: [PATCH 246/277] monitoring: Add HostController's show action view
 script

---
 .../application/views/scripts/host/show.phtml | 27 +++++++++++++++++
 .../show/components/hostservicesummary.phtml  | 30 +++++++++----------
 2 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/host/show.phtml

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
new file mode 100644
index 000000000..8023c1821
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -0,0 +1,27 @@
+<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>
diff --git a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml b/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
index ffa3c806e..0390bcffc 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
@@ -6,10 +6,10 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 
 ?>
 <h3 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
-<?= $this->qlink(sprintf($this->translate('%s configured services:'), $this->stats->services_total), $selfUrl) ?>
-<?php if ($this->stats->services_ok > 0): ?>
+<?= $this->qlink(sprintf($this->translate('%s configured services:'), $object->stats->services_total), $selfUrl) ?>
+<?php if ($object->stats->services_ok > 0): ?>
  <span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $this->stats->services_ok,
+    $object->stats->services_ok,
     $selfUrl,
     array('service_state' => 0),
     array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('ok'))))
@@ -19,12 +19,12 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
-    if ($this->stats->$pre) {
+    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 ($this->stats->$unhandled) {
+        if ($object->stats->$unhandled) {
             $compareUrl = $selfUrl->with($paramsUnhandled)->getRelativeUrl();
         } else {
             $compareUrl = $selfUrl->with($paramsHandled)->getRelativeUrl();
@@ -35,34 +35,34 @@ 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) {
+
+        echo '<span class="state ' . $state . $active . ($object->stats->$unhandled ? '' : ' handled') . '">';
+        if ($object->stats->$unhandled) {
 
             echo $this->qlink(
-                $this->stats->$unhandled,
+                $object->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
                 array('title' => sprintf($this->translate('Unhandled services with state %s'), strtoupper($this->translate($state))))
             );
         }
-        if ($this->stats->$handled) {
+        if ($object->stats->$handled) {
 
             if ($selfUrl->with($paramsHandled)->getRelativeUrl() === $currentUrl) {
                 $active = ' active';
             } else {
                 $active = '';
             }
-            if ($this->stats->$unhandled) {
+            if ($object->stats->$unhandled) {
                 echo '<span class="state handled ' . $state . $active . '">';
             }
             echo $this->qlink(
-                $this->stats->$handled,
+                $object->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
                 array('title' => sprintf($this->translate('Handled services with state %s'), strtoupper($this->translate($state))))
             );
-            if ($this->stats->$unhandled) {
+            if ($object->stats->$unhandled) {
                 echo "</span>\n";
             }
         }
@@ -71,9 +71,9 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 }
 
 ?>
-<?php if ($this->stats->services_pending): ?>
+<?php if ($object->stats->services_pending): ?>
  <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $this->stats->services_pending,
+    $object->stats->services_pending,
     $selfUrl,
     array('service_state' => 99),
     array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('pending'))))

From 8afdc3db1a0ce3d260502a2aee952eb89942b17c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 17 Sep 2014 09:48:30 +0200
Subject: [PATCH 247/277] monitoring: Replace show partials calls to getHost()
 and getService() with getName()

---
 .../views/scripts/show/components/acknowledgement.phtml       | 4 ++--
 .../views/scripts/show/components/checkstatistics.phtml       | 4 ++--
 .../application/views/scripts/show/components/comments.phtml  | 4 ++--
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 .../application/views/scripts/show/components/header.phtml    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 669a37241..2ca0ca401 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -10,12 +10,12 @@ if (in_array((int) $object->state, array(0, 99))) {
 if ($object->getType() === $object::TYPE_HOST) {
     $ackLink = $this->href(
         'monitoring/host/acknowledge-problem',
-        array('host' => $object->getHost())
+        array('host' => $object->getName())
     );
 } else {
     $ackLink = $this->href(
         'monitoring/service/acknowledge-problem',
-        array('host' => $object->getHost(), 'service' => $object->getService())
+        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 93020f1f2..b9ad284eb 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -5,12 +5,12 @@
 if ($object->getType() === $object::TYPE_HOST) {
     $reschedule = $this->href(
         'monitoring/host/reschedule-check',
-        array('host' => $object->getHost())
+        array('host' => $object->getName())
     );
 } else {
     $reschedule = $this->href(
         'monitoring/service/reschedule-check',
-        array('host' => $object->getHost(), 'service' => $object->getService())
+        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
     );
 }
 
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index cf65b8e04..372a17f15 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -8,12 +8,12 @@
         if ($object->getType() === $object::TYPE_HOST) {
             $addCommentLink = $this->href(
                 'monitoring/host/add-comment',
-                array('host' => $object->getHost())
+                array('host' => $object->getName())
             );
         } else {
             $addCommentLink = $this->href(
                 'monitoring/service/add-comment',
-                array('host' => $object->getHost(), 'service' => $object->getService())
+                array('host' => $object->getHost()->getName(), 'service' => $object->getName())
             );
         }
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 9198c2120..243373966 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -8,12 +8,12 @@
         if ($object->getType() === $object::TYPE_HOST) {
             $scheduleDowntimeLink = $this->href(
                 'monitoring/host/schedule-downtime',
-                array('host' => $object->getHost())
+                array('host' => $object->getName())
             );
         } else {
             $scheduleDowntimeLink = $this->href(
                 'monitoring/service/schedule-downtime',
-                array('host' => $object->getHost(), 'service' => $object->getService())
+                array('host' => $object->getHost()->getName(), 'service' => $object->getName())
             );
         }
         ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index 49daaae09..a2c835e4a 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -1,4 +1,4 @@
-<?php $showService = $object->service_description && $tabs->getActiveName() !== 'host' ?>
+<?php $showService = $object->getType() === $object::TYPE_SERVICE ?>
 <?php if (!$this->compact): ?>
 <?= $tabs ?>
 <?php endif ?>

From f64087486524f56bc110c520247f9b3a07531118 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 17 Sep 2014 12:40:41 +0200
Subject: [PATCH 248/277] monitoring: Fix DateTimePicker test

---
 .../Web/Form/Element/DateTimePickerTest.php   | 98 ++++---------------
 1 file changed, 20 insertions(+), 78 deletions(-)

diff --git a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
index 7610803b2..802d610ab 100644
--- a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
+++ b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
@@ -4,102 +4,44 @@
 
 namespace Tests\Icinga\Web\Form\Element;
 
+use DateTime;
 use Icinga\Test\BaseTestCase;
 use Icinga\Web\Form\Element\DateTimePicker;
 
 class DateTimePickerTest extends BaseTestCase
 {
-    /**
-     * Test that DateTimePicker::isValid() returns false if the input is not valid in terms of being a date/time string
-     * or a timestamp
-     */
-    public function testValidateInvalidInput()
+    public function testLocalDateAndTimeInput()
     {
-        $dt = new DateTimePicker(
-            'foo',
-            array(
-                'patterns' => array(
-                    'd/m/Y g:i A',
-                    'd.m.Y H:i:s'
-                )
-            )
+        $dateTime = new DateTimePicker(
+            'name'
         );
-
-        $this->assertFalse(
-            $dt->isValid('08/27/2013 12:40 PM'),
-            'Wrong placed month/day must not be valid input'
+        $now = new DateTime();
+        $this->assertTrue(
+            $dateTime->isValid($now->format('Y-m-d\TH:i:s')),
+            'A string representing a local date and time (with no timezone information) must be considered valid input'
         );
-        $this->assertFalse(
-            $dt->isValid('bar'),
-            'Arbitrary strings must not be valid input'
-        );
-        $this->assertFalse(
-            $dt->isValid('12:40 AM'),
-            'Time strings must not be valid input'
-        );
-        $this->assertFalse(
-            $dt->isValid('27/08/2013'),
-            'Date strings must not be valid input'
-        );
-        $this->assertFalse(
-            $dt->isValid('13736a16223'),
-            'Invalid Unix timestamps must not be valid input'
+        $this->assertTrue(
+            $dateTime->getValue() instanceof DateTime,
+            'DateTimePicker::getValue() must return an instance of DateTime if its input is valid'
         );
     }
 
-    /**
-     * Test that DateTimePicker::isValid() returns true if the input is valid in terms of being a date/time string
-     * or a timestamp
-     */
-    public function testValidateValidInput()
+    public function testRFC3339Input()
     {
-        $dt = new DateTimePicker(
-            'foo',
+        $dateTime = new DateTimePicker(
+            'name',
             array(
-                'patterns' => array(
-                    'd/m/Y g:i A',
-                    'd.m.Y H:i:s'
-                )
+                'local' => false
             )
         );
-
+        $now = new DateTime();
         $this->assertTrue(
-            $dt->isValid('27/08/2013 12:40 PM'),
-            'Using a valid date/time string must not fail'
+            $dateTime->isValid($now->format(DateTime::RFC3339)),
+            'A string representing a global date and time (with timezone information) must be considered valid input'
         );
         $this->assertTrue(
-            $dt->isValid('12.07.2013 08:03:43'),
-            'Using a valid date/time string must not fail'
-        );
-        $this->assertTrue(
-            $dt->isValid(1373616223),
-            'Using valid Unix timestamps must not fail'
-        );
-        $this->assertTrue(
-            $dt->isValid('1373616223'),
-            'Using strings as Unix timestamps must not fail'
-        );
-    }
-
-    /**
-     * Test that DateTimePicker::getValue() returns a timestamp after a successful call to isValid
-     */
-    public function testGetValueReturnsUnixTimestampAfterSuccessfulIsValidCall()
-    {
-        $dt = new DateTimePicker(
-            'foo',
-            array(
-                'patterns' => array(
-                    'd.m.Y H:i:s'
-                )
-            )
-        );
-        $dt->isValid('12.07.2013 08:03:43');
-
-        $this->assertEquals(
-            1373616223,
-            $dt->getValue(),
-            'getValue did not return the correct Unix timestamp according to the given date/time string'
+            $dateTime->getValue() instanceof DateTime,
+            'DateTimePicker::getValue() must return an instance of DateTime if its input is valid'
         );
     }
 }

From d10afa1f9bb429dd6c4984d203e42f24258eee82 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 17 Sep 2014 12:59:45 +0200
Subject: [PATCH 249/277] Remove the command pipe tests

---
 .../Protocol/Commandpipe/CommandPipeTest.php  | 697 ------------------
 1 file changed, 697 deletions(-)
 delete mode 100644 test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php

diff --git a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
deleted file mode 100644
index 7d3fd94f6..000000000
--- a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
+++ /dev/null
@@ -1,697 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Protocol\Commandpipe;
-
-use Zend_Config;
-use Icinga\Test\BaseTestCase;
-use Icinga\Protocol\Commandpipe\Comment;
-use Icinga\Protocol\Commandpipe\CommandPipe;
-use Icinga\Protocol\Commandpipe\PropertyModifier as MONFLAG;
-use Icinga\Protocol\Ldap\Exception;
-use Icinga\Module\Monitoring\Command\AcknowledgeCommand;
-use Icinga\Module\Monitoring\Command\AddCommentCommand;
-use Icinga\Module\Monitoring\Command\ScheduleDowntimeCommand;
-use Icinga\Module\Monitoring\Command\CustomNotificationCommand;
-use Icinga\Module\Monitoring\Command\DelayNotificationCommand;
-use Icinga\Module\Monitoring\Command\ScheduleCheckCommand;
-use Icinga\Module\Monitoring\Command\SubmitPassiveCheckresultCommand;
-
-if (!defined('EXTCMD_TEST_BIN')) {
-    define('EXTCMD_TEST_BIN', './bin/extcmd_test');
-}
-
-/**
- * Several tests for the command pipe component
- *
- * Uses the helper script extcmd_test, which is basically the extracted command
- * parser functions from the icinga core
- */
-class CommandPipeTest extends BaseTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        if (! file_exists(EXTCMD_TEST_BIN)) {
-            $this->markTestSkipped('Cannot find "' . EXTCMD_TEST_BIN . '"');
-        }
-    }
-
-    /**
-     * Return the path of the test pipe used in these tests
-     *
-     * @return string
-     */
-    public function getPipeName()
-    {
-        return sys_get_temp_dir() . '/icinga_test_pipe';
-    }
-
-    /**
-     * Return a @see Icinga\Protocal\CommandPipe\CommandPipe instance set up for the local test pipe
-     *
-     * @return CommandPipe
-     */
-    private function getLocalTestPipe()
-    {
-        $tmpPipe = $this->getPipeName();
-        $this->cleanup();
-        touch($tmpPipe);
-
-        $cfg = new Zend_Config(
-            array(
-                'path' => $tmpPipe,
-                'name' => 'test'
-            )
-        );
-
-        return new CommandPipe($cfg);
-    }
-
-    /**
-     * Return a @see Icinga\Protocal\CommandPipe\CommandPipe instance set up
-     * for the local test pipe, but with ssh as the transport layer
-     *
-     * @return CommandPipe
-     */
-    private function getSSHTestPipe()
-    {
-        $tmpPipe = $this->getPipeName();
-        $this->cleanup();
-        touch($tmpPipe);
-
-        $cfg = new Zend_Config(
-            array(
-                'path'      => $tmpPipe,
-                'user'      => 'vagrant',
-                'password'  => 'vagrant',
-                'host'      => 'localhost',
-                'port'      => 22,
-                'name'      => 'test'
-            )
-        );
-
-        return new CommandPipe($cfg);
-    }
-
-    /**
-     * Remove the testpipe if it exists
-     */
-    private function cleanup() {
-        if (file_exists($this->getPipeName())) {
-            unlink($this->getPipeName());
-        }
-    }
-
-    /**
-     * Query the extcmd_test script with $command or the command pipe and test whether the result is $exceptedString and
-     * has a return code of 0.
-     *
-     * Note:
-     * - if no string is given, only the return code is tested
-     * - if no command is given, the content of the test commandpipe is used
-     *
-     * This helps testing whether commandpipe serialization works correctly
-     *
-     * @param bool $expectedString      The string that is expected to be returned from the extcmd_test binary
-     *                                  (optional, leave it to just test for the return code)
-     * @param bool $command             The commandstring to send (optional, leave it for using the command pipe content)
-     */
-    private function assertCommandSucceeded($expectedString = false, $command = false) {
-        $resultCode = null;
-        $resultArr = array();
-        $receivedCmd = exec(EXTCMD_TEST_BIN . ' ' . escapeshellarg(
-            $command ? $command : file_get_contents($this->getPipeName())),
-            $resultArr,
-            $resultCode
-        );
-        $this->assertEquals(0, $resultCode, 'Submit of external command returned error : ' . $receivedCmd);
-        if ($expectedString) {
-            $this->assertEquals(
-                $expectedString,
-                $receivedCmd,
-                'Asserting that the command icinga received matches the command we send'
-            );
-        }
-    }
-
-    /**
-     * Test whether a single host acknowledgment is serialized and send correctly
-     *
-     * @throws Exception
-     */
-    public function testAcknowledgeSingleHost()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $ack = new AcknowledgeCommand(new Comment('I can', 'sends teh ack'));
-            $pipe->sendCommand(
-                $ack,
-                array(
-                    (object) array(
-                        'host_name' => 'hostA'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('ACKNOWLEDGE_HOST_PROBLEM;hostA;0;0;0;I can;sends teh ack');
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether multiple host and service acknowledgments are serialized and send correctly
-     *
-     * @throws Exception
-     */
-    public function testAcknowledgeMultipleObjects()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $ack = new AcknowledgeCommand(new Comment('I can', 'sends teh ack'));
-            $pipe->getTransport()->setOpenMode('a');
-            $pipe->sendCommand(
-                $ack,
-                array(
-                    (object) array(
-                        'host_name'           => 'hostA'
-                    ),(object) array(
-                        'host_name'           => 'hostB'
-                    ),(object) array(
-                        'host_name'           => 'hostC'
-                    ),(object) array(
-                        'host_name'           => 'hostC',
-                        'service_description' => 'svc'
-                    )
-                )
-            );
-
-            $result = explode("\n", file_get_contents($this->getPipeName()));
-            $this->assertCount(5, $result, 'Asserting the correct number of commands being written to the command pipe');
-
-            $this->assertCommandSucceeded('ACKNOWLEDGE_HOST_PROBLEM;hostA;0;0;0;I can;sends teh ack', $result[0]);
-            $this->assertCommandSucceeded('ACKNOWLEDGE_HOST_PROBLEM;hostB;0;0;0;I can;sends teh ack', $result[1]);
-            $this->assertCommandSucceeded('ACKNOWLEDGE_HOST_PROBLEM;hostC;0;0;0;I can;sends teh ack', $result[2]);
-            $this->assertCommandSucceeded('ACKNOWLEDGE_SVC_PROBLEM;hostC;svc;0;0;0;I can;sends teh ack', $result[3]);
-
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether a single host comment is correctly serialized and send to the command pipe
-     *
-     * @throws Exception
-     */
-    public function testAddHostComment()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->sendCommand(
-                new AddCommentCommand(
-                    new Comment(
-                        'Autor',
-                        'Comment'
-                    )
-                ),
-                array(
-                    (object) array(
-                        'host_name' => 'hostA'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('ADD_HOST_COMMENT;hostA;0;Autor;Comment');
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether removing all hostcomments is correctly serialized and send to the command pipe
-     *
-     * @throws Exception
-     */
-    public function testRemoveAllHostComment()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->removeComment(
-                array(
-                    (object) array(
-                        'host_name' => 'test'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('DEL_ALL_HOST_COMMENTS;test');
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether removing a single host comment is correctly serialized and send to the command pipe
-     *
-     * @throws Exception
-     */
-    public function testRemoveSpecificComment()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->removeComment(
-                array(
-                    (object) array(
-                        'comment_id' => 34,
-                        'host_name'  => 'test'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('DEL_HOST_COMMENT;34');
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether a multiple reschedules for services and hosts are correctly serialized and send to the commandpipe
-     *
-     * @throws Exception
-     */
-    public function testScheduleChecks()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->getTransport()->setOpenMode('a'); // append so we have multiple results
-            $command = new ScheduleCheckCommand(5000);
-            $pipe->sendCommand(
-                $command,
-                array(
-                    (object) array(
-                        'host_name'           => 'test'
-                    ),
-                    (object) array(
-                        'host_name'           => 'test',
-                        'service_description' => 'svc1'
-                    )
-                )
-            );
-            $command->setForced(true);
-            $pipe->sendCommand(
-                $command,
-                array(
-                    (object) array(
-                        'host_name'           => 'test'
-                    ),
-                    (object) array(
-                        'host_name'           => 'test',
-                        'service_description' => 'svc1'
-                    )
-                )
-            );
-            $command->excludeHost();
-            $pipe->sendCommand(
-                $command,
-                array(
-                    (object) array(
-                        'host_name' => 'test'
-                    )
-                )
-            );
-
-            $result = explode("\n", file_get_contents($this->getPipeName()));
-            $this->assertCount(6, $result, 'Asserting a correct number of commands being written to the commandpipe');
-
-            $this->assertCommandSucceeded('SCHEDULE_HOST_CHECK;test;5000', $result[0]);
-            $this->assertCommandSucceeded('SCHEDULE_SVC_CHECK;test;svc1;5000', $result[1]);
-            $this->assertCommandSucceeded('SCHEDULE_FORCED_HOST_CHECK;test;5000', $result[2]);
-            $this->assertCommandSucceeded('SCHEDULE_FORCED_SVC_CHECK;test;svc1;5000', $result[3]);
-            $this->assertCommandSucceeded('SCHEDULE_FORCED_HOST_SVC_CHECKS;test;5000', $result[4]);
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether modifying monitoringflags of a host and service is correctly serialized and send to the command pipe
-     *
-     * @throws Exception
-     */
-    public function testObjectStateModifications()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->getTransport()->setOpenMode('a');
-            $pipe->setMonitoringProperties(
-                array(
-                    (object) array(
-                        'host_name'           => 'Testhost'
-                    ),
-                    (object) array(
-                        'host_name'           => 'host',
-                        'service_description' => 'svc'
-                    )
-                ), new MONFLAG(
-                    array(
-                        MONFLAG::ACTIVE         => MONFLAG::STATE_DISABLE,
-                        MONFLAG::PASSIVE        => MONFLAG::STATE_ENABLE,
-                        MONFLAG::NOTIFICATIONS  => MONFLAG::STATE_DISABLE,
-                        MONFLAG::EVENTHANDLER   => MONFLAG::STATE_ENABLE,
-                        MONFLAG::FLAPPING       => MONFLAG::STATE_DISABLE,
-                        MONFLAG::FRESHNESS      => MONFLAG::STATE_ENABLE,
-                    )
-                )
-            );
-
-            $result = explode("\n", file_get_contents($this->getPipeName()));
-            array_pop($result); // remove empty last line
-            $this->assertCount(12, $result, 'Asserting a correct number of commands being written to the commandpipe');
-            foreach ($result as $command) {
-                $this->assertCommandSucceeded(false, $command);
-            }
-
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether enabling and disabling global notifications are send correctly to the pipe
-     *
-     * @throws Exception
-     */
-    public function testGlobalNotificationTrigger()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->enableGlobalNotifications();
-            $this->assertCommandSucceeded('ENABLE_NOTIFICATIONS;');
-            $pipe->disableGlobalNotifications();
-            $this->assertCommandSucceeded('DISABLE_NOTIFICATIONS;');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether host and servicedowntimes are correctly scheduled
-     *
-     * @throws Exception
-     */
-    public function testScheduleDowntime()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $downtime = new ScheduleDowntimeCommand(25, 26, new Comment('me', 'test'));
-            $pipe->sendCommand(
-                $downtime,
-                array(
-                    (object) array(
-                        'host_name' => 'Testhost'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SCHEDULE_HOST_DOWNTIME;Testhost;25;26;1;0;0;me;test');
-
-            $pipe->sendCommand(
-                $downtime,
-                array(
-                    (object) array(
-                        'host_name' => 'Testhost',
-                        'service_description' => 'svc'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SCHEDULE_SVC_DOWNTIME;Testhost;svc;25;26;1;0;0;me;test');
-
-            $downtime->excludeHost();
-            $pipe->sendCommand(
-                $downtime,
-                array(
-                    (object) array(
-                        'host_name' => 'Testhost'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SCHEDULE_HOST_SVC_DOWNTIME;Testhost;25;26;1;0;0;me;test');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether propagated host downtimes are correctly scheduled
-     *
-     * @throws Exception
-     */
-    public function testSchedulePropagatedDowntime()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $downtime = new ScheduleDowntimeCommand(25, 26, new Comment('me', 'test'));
-            $downtime->includeChildren();
-            $pipe->sendCommand(
-                $downtime,
-                array(
-                    (object) array(
-                        'host_name' => 'Testhost'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME;Testhost;25;26;1;0;0;me;test');
-
-            $downtime->includeChildren(true, true);
-            $pipe->sendCommand(
-                $downtime,
-                array(
-                    (object) array(
-                        'host_name' => 'Testhost'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded(
-                'SCHEDULE_AND_PROPAGATE_TRIGGERED_HOST_DOWNTIME;Testhost;25;26;1;0;0;me;test'
-            );
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether the removal of downtimes is correctly serialized and send to the commandpipe for hosts and services
-     *
-     * @throws Exception
-     */
-    public function testRemoveDowntime()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $pipe->getTransport()->setOpenMode('a');
-            $pipe->removeDowntime(
-                array(
-                    (object) array(
-                        'host_name'             => 'Testhost'
-                    ),
-                    (object) array(
-                        'host_name'             => 'host',
-                        'service_description'   => 'svc'
-                    ),
-                    (object) array(
-                        'host_name'             => 'host',
-                        'service_description'   => 'svc',
-                        'downtime_id'           => 123
-                    )
-                )
-            );
-            $result = explode("\n", file_get_contents($this->getPipeName()));
-            array_pop($result); // remove empty last line
-            $this->assertCount(3, $result, 'Asserting a correct number of commands being written to the commandpipe');
-            $this->assertCommandSucceeded('DEL_DOWNTIME_BY_HOST_NAME;Testhost', $result[0]);
-            $this->assertCommandSucceeded('DEL_DOWNTIME_BY_HOST_NAME;host;svc', $result[1]);
-            $this->assertCommandSucceeded('DEL_SVC_DOWNTIME;123', $result[2]);
-
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether custom  servicenotifications are correctly send to the commandpipe without options
-     *
-     * @throws Exception
-     */
-    public function testSendCustomServiceNotification()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $notification = new CustomNotificationCommand(new Comment('Author', 'Comment'));
-            $pipe->sendCommand(
-                $notification,
-                array(
-                    (object) array(
-                        'host_name'             => 'Host',
-                        'service_description'   => 'Service'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SEND_CUSTOM_SVC_NOTIFICATION;Host;Service;0;Author;Comment');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether custom hostnotifications are correctly send to the commandpipe with a varlist of options
-     *
-     * @throws Exception
-     */
-    public function testSendCustomHostNotificationWithOptions()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $notification = new CustomNotificationCommand(new Comment('Author', 'Comment'), true, true);
-            $pipe->sendCommand(
-                $notification,
-                array(
-                    (object) array(
-                        'host_name'             => 'Host',
-                        'service_description'   => 'Service'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('SEND_CUSTOM_SVC_NOTIFICATION;Host;Service;3;Author;Comment');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether commands to delay notifications are being sent to the commandpipe
-     *
-     * @throws Exception
-     */
-    public function testDelayNotification()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $delay = new DelayNotificationCommand(300);
-            $pipe->sendCommand(
-                $delay,
-                array(
-                    (object) array(
-                        'host_name'             => 'Host',
-                        'service_description'   => 'Service'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('DELAY_SVC_NOTIFICATION;Host;Service;300');
-
-            $pipe->sendCommand(
-                $delay,
-                array(
-                    (object) array(
-                        'host_name'             => 'Host'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('DELAY_HOST_NOTIFICATION;Host;300');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test whether commands to submit passive check results are being sent to the commandpipe
-     *
-     * @throws Exception
-     */
-    public function testSubmitPassiveCheckresult()
-    {
-        $pipe = $this->getLocalTestPipe();
-        try {
-            $result = new SubmitPassiveCheckresultCommand(0, 'foo', 'bar');
-            $pipe->sendCommand(
-                $result,
-                array(
-                    (object) array(
-                        'host_name'             => 'Host',
-                        'service_description'   => 'Service'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('PROCESS_SERVICE_CHECK_RESULT;Host;Service;0;foo|bar');
-
-            $result->setOutput('foobar');
-            $result->setPerformanceData('');
-            $pipe->sendCommand(
-                $result,
-                array(
-                    (object) array(
-                        'host_name' => 'Host'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('PROCESS_HOST_CHECK_RESULT;Host;0;foobar');
-        } catch (Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-
-    /**
-     * Test sending of commands via SSH (currently disabled)
-     *
-     * @throws Exception
-     */
-    public function testSSHCommands()
-    {
-        $this->markTestSkipped('This test assumes running in a vagrant VM with key-auth');
-
-        $pipe = $this->getSSHTestPipe();
-        try {
-            $ack = new AcknowledgeCommand(new Comment('I can', 'sends teh ack'));
-            $pipe->sendCommand(
-                $ack,
-                array(
-                    (object) array(
-                        'host_name' => 'hostA'
-                    )
-                )
-            );
-            $this->assertCommandSucceeded('ACKNOWLEDGE_HOST_PROBLEM;hostA;0;0;0;I can;sends teh ack');
-        } catch(Exception $e) {
-            $this->cleanup();
-            throw $e;
-        }
-        $this->cleanup();
-    }
-}

From 7eb51f6367bfc974378533fb2cdda48e57403079 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 12:57:53 +0200
Subject: [PATCH 250/277] form/csrf: Set the csrf element decorators in the
 element not in the form

---
 library/Icinga/Web/Form.php                            | 4 +---
 library/Icinga/Web/Form/Element/CsrfCounterMeasure.php | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index f0695242e..dde9db41c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -480,9 +480,7 @@ class Form extends Zend_Form
     public function addCsrfCounterMeasure()
     {
         if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
-            $element = new CsrfCounterMeasure($this->tokenElementName);
-            $element->setDecorators(array('ViewHelper'));
-            $this->addElement($element);
+            $this->addElement(new CsrfCounterMeasure($this->tokenElementName));
         }
 
         return $this;
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
index 4d788f9d3..722b1d323 100644
--- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -29,6 +29,7 @@ class CsrfCounterMeasure extends Zend_Form_Element_Xhtml
     {
         $this->setRequired(true); // Not requiring this element would not make any sense
         $this->setIgnore(true); // We do not want this element's value being retrieved by Form::getValues()
+        $this->setDecorators(array('ViewHelper'));
         $this->setValue($this->generateCsrfToken());
     }
 

From 5ba96c32f90a4ae502c817f35b26dfe229790bfa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 12:59:01 +0200
Subject: [PATCH 251/277] `Form::setDefaults()' fix strict standards violation

Declaration of Icinga\Web\Form::setDefaults() should be compatible with that of Zend_Form::setDefaults().
---
 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 dde9db41c..1a9cb5b97 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -491,7 +491,7 @@ class Form extends Zend_Form
      *
      * @param   array   $defaults   The values to populate the elements with
      */
-    public function setDefaults($defaults)
+    public function setDefaults(array $defaults)
     {
         $this->create($defaults);
         return parent::setDefaults($defaults);

From 3c9859a0f1ba1c4cd3e382eb9587c10665a0c203 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 13:00:15 +0200
Subject: [PATCH 252/277] Call `Form::getSubmitLabal()' in
 `Form::addSubmitButton()'

This allows us to dynamically define submit labels in form subclasses.
---
 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 1a9cb5b97..c87724507 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -376,7 +376,7 @@ class Form extends Zend_Form
                 'btn_submit',
                 array(
                     'ignore'        => true,
-                    'label'         => $this->submitLabel,
+                    'label'         => $this->getSubmitLabel(),
                     'decorators'    => array(
                         'ViewHelper',
                         array('HtmlTag', array('tag' => 'div'))

From c13823d406fe4ecea9a84b7815d07acb21bc790e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 13:19:24 +0200
Subject: [PATCH 253/277] bootstrap: Fix error reporting level not including
 E_STRICT

---
 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 7736f8cf9..0df6700bc 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -383,7 +383,7 @@ abstract class ApplicationBootstrap
      */
     protected function setupErrorHandling()
     {
-        error_reporting(E_ALL | E_NOTICE);
+        error_reporting(E_ALL | E_STRICT);
         ini_set('display_startup_errors', 1);
         ini_set('display_errors', 1);
         return $this;

From 5b5f553d0d83d8c230d42b342314f51391c05e5e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 13:39:38 +0200
Subject: [PATCH 254/277] form: Fix dynamic submit label retrieval

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

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index c87724507..833ad4a33 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -370,13 +370,14 @@ class Form extends Zend_Form
      */
     public function addSubmitButton()
     {
-        if ($this->submitLabel) {
+        $submitLabel = $this->getSubmitLabel();
+        if ($submitLabel) {
             $this->addElement(
                 'submit',
                 'btn_submit',
                 array(
                     'ignore'        => true,
-                    'label'         => $this->getSubmitLabel(),
+                    'label'         => $submitLabel,
                     'decorators'    => array(
                         'ViewHelper',
                         array('HtmlTag', array('tag' => 'div'))

From 72a9a53201276589cb02a639d5441afc3c036ce0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:25:49 +0200
Subject: [PATCH 255/277] monitoring/commands: Use translate plurar in the
 object command forms

refs #6593
---
 .../Object/AcknowledgeProblemCommandForm.php  | 19 +++++++++----
 .../Command/Object/AddCommentCommandForm.php  | 17 +++++++----
 .../Command/Object/CheckNowCommandForm.php    |  9 ++++--
 .../Object/DeleteCommentCommandForm.php       | 28 ++++++++++++++++++-
 .../Object/DeleteDowntimeCommandForm.php      | 28 ++++++++++++++++++-
 .../RemoveAcknowledgementCommandForm.php      | 19 +++++++++++--
 .../Object/ScheduleHostCheckCommandForm.php   |  7 ++++-
 .../ScheduleHostDowntimeCommandForm.php       |  7 ++++-
 .../ScheduleServiceCheckCommandForm.php       | 23 +++++++++++----
 .../ScheduleServiceDowntimeCommandForm.php    | 15 +++++++---
 10 files changed, 144 insertions(+), 28 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index a9c1549af..f54c8bdb2 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -18,11 +18,13 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
 {
     /**
      * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function init()
+    public function getSubmitLabel()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Acknowledge Problem'));
+        return mtp(
+            'monitoring', 'Acknowledge problem', 'Acknowledge problems', count($this->objects)
+        );
     }
 
     /**
@@ -118,7 +120,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you want the acknowledgement to disable notifications until the host or service recovers,'
-                        . 'check this option.'
+                        . ' check this option.'
                     )
                 )
             ),
@@ -131,7 +133,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                     'description'   => mt(
                         'monitoring',
                         'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
-                        . 'uncheck this option.'
+                        . ' uncheck this option.'
                     )
                 )
             )
@@ -160,7 +162,12 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
             }
             $this->getTransport($request)->send($ack);
         }
-        Notification::success(mt('monitoring', 'Acknowledging problem..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Acknowledging problem..',
+            'Acknowledging problems..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index 1183070fc..a89353d52 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -15,11 +15,13 @@ class AddCommentCommandForm extends ObjectsCommandForm
 {
     /**
      * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function init()
+    public function getSubmitLabel()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Add Comment'));
+        return mtp(
+            'monitoring', 'Add comment', 'Add comments', count($this->objects)
+        );
     }
 
     /**
@@ -82,10 +84,15 @@ class AddCommentCommandForm extends ObjectsCommandForm
             $comment->setObject($object);
             $comment->setComment($this->getElement('comment')->getValue());
             $comment->setAuthor($request->getUser()->getUsername());
-            $comment->setPersistent((bool) $this->getElement('persistent')->getValue());
+            $comment->setPersistent($this->getElement('persistent')->isChecked());
             $this->getTransport($request)->send($comment);
         }
-        Notification::success(mt('monitoring', 'Adding comment..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Adding comment..',
+            'Adding comments..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 6cdf620f4..a77040ee5 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -45,7 +45,7 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 'btn_submit',
                 array(
                     'ignore'        => true,
-                    'label'         => mt('monitoring', 'Check Now'),
+                    'label'         => mt('monitoring', 'Check now'),
                     'decorators'    => array('ViewHelper')
                 )
             )
@@ -72,7 +72,12 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 ->setCheckTime(time());
             $this->getTransport($request)->send($check);
         }
-        Notification::success(mt('monitoring', 'Scheduling check..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Scheduling check..',
+            'Scheduling checks..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index c1a24ef50..4c7df0141 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -19,7 +19,6 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'X'));
         $this->setAttrib('class', 'inline link-like');
     }
 
@@ -36,11 +35,34 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
                 array(
                     'required' => true
                 )
+            ),
+            array(
+                'hidden',
+                'redirect'
             )
         ));
         return $this;
     }
 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'ignore'        => true,
+                'label'         => 'X',
+                'title'         => mt('monitoring', 'Delete comment'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        return $this;
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -55,6 +77,10 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
                 ->setCommentId($this->getElement('comment_id')->getValue());
             $this->getTransport($request)->send($delComment);
         }
+        $redirect = $this->getElement('redirect')->getValue();
+        if (! empty($redirect)) {
+            $this->setRedirectUrl($redirect);
+        }
         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 4558b71da..ae712eddb 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -19,7 +19,6 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'X'));
         $this->setAttrib('class', 'inline link-like');
     }
 
@@ -36,11 +35,34 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
                 array(
                     'required' => true
                 )
+            ),
+            array(
+                'hidden',
+                'redirect'
             )
         ));
         return $this;
     }
 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'submit',
+            'btn_submit',
+            array(
+                'ignore'        => true,
+                'label'         => 'X',
+                'title'         => mt('monitoring', 'Delete downtime'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        return $this;
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -55,6 +77,10 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
                 ->setDowntimeId($this->getElement('downtime_id')->getValue());
             $this->getTransport($request)->send($delDowntime);
         }
+        $redirect = $this->getElement('redirect')->getValue();
+        if (! empty($redirect)) {
+            $this->setRedirectUrl($redirect);
+        }
         Notification::success(mt('monitoring', 'Deleting downtime..'));
         return true;
     }
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
index c76cca19c..6ccd0633d 100644
--- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -19,10 +19,20 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Remove Problem Acknowledgement'));
         $this->setAttrib('class', 'inline link-like');
     }
 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     */
+    public function getSubmitLabel()
+    {
+        return mtp(
+            'monitoring', 'Remove problem acknowledgement', 'Remove problem acknowledgements', count($this->objects)
+        );
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -35,7 +45,12 @@ class RemoveAcknowledgementCommandForm extends ObjectsCommandForm
             $removeAck->setObject($object);
             $this->getTransport($request)->send($removeAck);
         }
-        Notification::success(mt('monitoring', 'Removing problem acknowledgement..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Removing problem acknowledgement..',
+            'Removing problem acknowledgements..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 81a277004..e7d71b9f2 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -51,7 +51,12 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 ->setOfAllServices($this->getElement('all_services')->isChecked());
             $this->scheduleCheck($check, $request);
         }
-        Notification::success(mt('monitoring', 'Scheduling host check..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Scheduling host check..',
+            'Scheduling host checks..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index a56d11a5c..ee7dff5bb 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -87,7 +87,12 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
             $hostDowntime->setObject($object);
             $this->scheduleDowntime($hostDowntime, $request);
         }
-        Notification::success(mt('monitoring', 'Scheduling host downtime..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Scheduling host downtime..',
+            'Scheduling host downtimes..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index ae8f23384..0a54e2af4 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -18,11 +18,13 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
 {
     /**
      * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function init()
+    public function getSubmitLabel()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Schedule Check'));
+        return mtp(
+            'monitoring', 'Schedule check', 'Schedule checks', count($this->objects)
+        );
     }
 
     /**
@@ -62,7 +64,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                     '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.'
+                        . ' scheduled check occurs and whether or not checks are enabled.'
                     )
                 )
             )
@@ -70,6 +72,12 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
         return $this;
     }
 
+    /**
+     * Schedule a check
+     *
+     * @param ScheduleServiceCheckCommand   $check
+     * @param Request                       $request
+     */
     public function scheduleCheck(ScheduleServiceCheckCommand $check, Request $request)
     {
         $check
@@ -90,7 +98,12 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
             $check->setObject($object);
             $this->scheduleCheck($check, $request);
         }
-        Notification::success(mt('monitoring', 'Scheduling service check..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Scheduling service check..',
+            'Scheduling service checks..',
+            count($this->objects)
+        ));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 508c3eed0..86e06f071 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -29,11 +29,13 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
 
     /**
      * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function init()
+    public function getSubmitLabel()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Schedule Downtime'));
+        return mtp(
+            'monitoring', 'Schedule downtime', 'Schedule downtimes', count($this->objects)
+        );
     }
 
     /**
@@ -205,7 +207,12 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
             $downtime->setObject($object);
             $this->scheduleDowntime($downtime, $request);
         }
-        Notification::success(mt('monitoring', 'Scheduling service downtime..'));
+        Notification::success(mtp(
+            'monitoring',
+            'Scheduling service downtime..',
+            'Scheduling service downtimes..',
+            count($this->objects)
+        ));
         return true;
     }
 }

From bea110d0c75b715008d83bee36e5692209073f0f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:27:04 +0200
Subject: [PATCH 256/277] Fix `Form::isSubmitted()' for dynamic submit labels

---
 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 833ad4a33..2763e073e 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -543,7 +543,7 @@ class Form extends Zend_Form
      */
     public function isSubmitted()
     {
-        if ($this->submitLabel !== null) {
+        if ($this->getSubmitLabel()) {
             return $this->getElement('btn_submit')->isChecked();
         }
 

From 4b7096bbbf208c2e3ac57bf611aaee45270dc504 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:28:23 +0200
Subject: [PATCH 257/277] monitoring: Support host and service filters for
 downtimes

refs #7278
---
 .../library/Monitoring/Backend/Ido/Query/CommentQuery.php     | 4 ++--
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 7ec76d4a8..5145a96ad 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -19,9 +19,9 @@ class CommentQuery extends IdoQuery
             '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',
+            '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',
+            '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",
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index fe1152076..2393c6ed9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -28,8 +28,10 @@ class DowntimeQuery extends IdoQuery
             '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',
+            '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'

From 90dbcdbbfb6924782da116727c4d66ee29e40486 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:29:29 +0200
Subject: [PATCH 258/277] The stupid `DbQuery::isTimestamp()' hack must return
 false

This a fix for modules using our query / filter combination since `return $this;' renders all columns as timestamps.
---
 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 a89544be8..b701f3ac0 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -223,7 +223,7 @@ class DbQuery extends SimpleQuery
      */
     public function isTimestamp($field)
     {
-        return $this;
+        return false;
     }
 
     public function whereToSql($col, $sign, $expression)

From 274f2e7410d568394ae9553633e3257e62da930d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:34:42 +0200
Subject: [PATCH 259/277] monitoring/commands: Fix remove commands in the list
 comments and list downtimes views

refs #6593
---
 .../views/scripts/list/comments.phtml         | 36 +++++++------------
 .../views/scripts/list/downtimes.phtml        | 34 +++++++-----------
 .../Controller/MonitoredObjectController.php  | 29 +++++++++++++++
 3 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 6093adb35..fb3408f16 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,9 +1,3 @@
-<?php
-
-$helper = $this->getHelper('CommandForm');
-
-?>
-
 <?php if (false === $this->compact): ?>
 <div class="controls">
   <?= $this->tabs->render($this); ?>
@@ -56,7 +50,7 @@ $helper = $this->getHelper('CommandForm');
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service.png'); ?> <a href="<?= $this->href('monitoring/show/service', array(
+          <?= $this->icon('service.png'); ?> <a href="<?= $this->href('monitoring/service/show', array(
             'host'    => $comment->host,
             'service' => $comment->service,
           )); ?>">
@@ -66,7 +60,7 @@ $helper = $this->getHelper('CommandForm');
             <?= $this->translate('on') . ' ' . $comment->host; ?>
           </small>
         <?php else: ?>
-          <?= $this->icon('host.png'); ?> <a href="<?= $this->href('monitoring/show/host', array(
+          <?= $this->icon('host.png'); ?> <a href="<?= $this->href('monitoring/host/show', array(
             'host' => $comment->host
           )); ?>">
             <?= $comment->host; ?>
@@ -89,23 +83,17 @@ $helper = $this->getHelper('CommandForm');
               date('H:i', $comment->expiration)
             ) : $this->translate('This comment does not expire.'); ?>
         </td>
-        <?php
-          $data = array(
-            'commentid' => $comment->id,
-            'host'      => $comment->host
-          );
-          if ($comment->objecttype === 'service') {
-            $data['service'] = $comment->service;
-          }
-        ?>
         <td style="width: 2em">
-          <?= $helper->labelSubmitForm(
-            'X',
-            $this->translate('Remove Comment'),
-            'link-like',
-            'removecomment',
-            $data
-          ); ?>
+          <?php
+          $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)));
+          } else {
+            $delCommentForm->setAction($this->url('monitoring/service/remove-comment', array('host' => $comment->host, 'service' => $comment->service)));
+          }
+          echo $delCommentForm;
+          ?>
         </td>
       </tr>
 <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index babb76074..956427b77 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -1,7 +1,3 @@
-<?php
-$helper = $this->getHelper('CommandForm');
-?>
-
 <?php if (false === $this->compact): ?>
 <div class="controls">
   <?= $this->tabs->render($this); ?>
@@ -37,7 +33,7 @@ $helper = $this->getHelper('CommandForm');
         </td>
         <td>
         <?php if (isset($downtime->service)): ?>
-          <a href="<?= $this->href('monitoring/show/service', array(
+          <a href="<?= $this->href('monitoring/service/show', array(
             'host'      => $downtime->host,
             'service'   => $downtime->service
           )); ?>">
@@ -47,7 +43,7 @@ $helper = $this->getHelper('CommandForm');
             <?= $this->translate('on'); ?> <?= $downtime->host; ?>
           </small>
         <?php else: ?>
-          <a href="<?= $this->href('monitoring/show/host', array(
+          <a href="<?= $this->href('monitoring/host/show', array(
             'host' => $downtime->host
           )); ?>">
             <?= $downtime->host; ?>
@@ -96,23 +92,17 @@ $helper = $this->getHelper('CommandForm');
         <?php endif ?>
           </small>
         </td>
-        <?php
-          $data = array(
-            'downtimeid'    => $downtime->id,
-            'host'          => $downtime->host
-          );
-          if (isset($downtime->service)) {
-            $data['service'] = $downtime->service;
-          }
-        ?>
         <td style="width: 2em">
-          <?= $helper->labelSubmitForm(
-            'X',
-            'Remove Downtime',
-            'link-like',
-            'removedowntime',
-            $data
-          ); ?>
+          <?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' => $downtime->host)));
+          } else {
+            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array('host' => $downtime->host, 'service' => $downtime->service)));
+          }
+          echo $delDowntimeForm;
+          ?>
         </td>
       </tr>
 <?php endforeach ?>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 4ad204e5c..ae257e9f1 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -119,4 +119,33 @@ abstract class MonitoredObjectController extends Controller
      * Schedule a downtime
      */
     abstract public function scheduleDowntimeAction();
+
+
+    /**
+     * Remove a comment
+     */
+    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->handleCommandForm(new DeleteCommentCommandForm());
+    }
+
+    /**
+     * Remove a downtime
+     */
+    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->handleCommandForm(new DeleteDowntimeCommandForm());
+    }
 }

From 27650be48193acad588f32fb1b5926d95b32d148 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:41:51 +0200
Subject: [PATCH 260/277] monitoring/commands: Add missing `ListController'
 change from the last commit

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index bd0bb047f..e2caee336 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -4,6 +4,8 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
@@ -297,6 +299,7 @@ class Monitoring_ListController extends Controller
             'downtime_scheduled_end'   => 'Scheduled End',
             'downtime_duration'        => 'Duration',
         ));
+        $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
     }
 
     /**
@@ -426,6 +429,7 @@ class Monitoring_ListController extends Controller
                 'comment_expiration' => 'Expiration',
             )
         );
+        $this->view->delCommentForm = new DeleteCommentCommandForm();
     }
 
     public function servicegroupsAction()

From 119e23e79e0578e7531d196570f1d201afc728a7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:43:25 +0200
Subject: [PATCH 261/277] Make `InlinePie's setters fluent

---
 library/Icinga/Web/Widget/Chart/InlinePie.php | 67 ++++++++++++++-----
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index da63ec403..4b4409e78 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -24,7 +24,7 @@ class InlinePie extends AbstractWidget
     const NUMBER_FORMAT_TIME = 'time';
     const NUMBER_FORMAT_BYTES = 'bytes';
     const NUMBER_FORMAT_RATIO = 'ratio';
-        
+
     /**
      * The template string used for rendering this widget
      * The template string used for rendering this widget
@@ -137,7 +137,7 @@ EOD;
      * @var string
      */
     private $tooltipFormat = '<b>{{title}}</b></br> {{label}}: {{formatted}} ({{percent}}%)';
-    
+
     /**
      * The number format used to render numeric values in tooltips
      *
@@ -148,30 +148,36 @@ EOD;
     /**
      * Set if the tooltip for the empty area should be hidden
      *
-     * @param bool $hide    Whether to hide the empty area
+     * @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.
      *
-     * @param $data array
+     * @param   $data array
+     *
+     * @return  $this
      */
     public function setData(array $data)
     {
         $this->data = $data;
         $this->url->setParam('data', implode(',', $data));
+        return $this;
     }
 
     /**
      * The labels to be displayed in the pie-chart
      *
-     * @param mixed $label     The label of the displayed value, or null for no labels
+     * @param   mixed $label     The label of the displayed value, or null for no labels
      *
-     * @return $this            Fluent interface
+     * @return  $this
      */
     public function setLabel($label)
     {
@@ -191,7 +197,9 @@ EOD;
     /**
      * Set the colors used by the slices of the pie chart.
      *
-     * @param array $colors
+     * @param   array $colors
+     *
+     * @return  $this
      */
     public function setColors(array $colors = null)
     {
@@ -201,18 +209,22 @@ EOD;
         } else {
             $this->url->setParam('colors', null);
         }
+        return $this;
     }
 
     /**
      * Set the used number format
      *
-     * @param $format   string  'bytes' or 'time'
+     * @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
      *
@@ -225,16 +237,23 @@ EOD;
      *      <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;
     }
 
     /**
-     * @param $height
+     * Set the height
      *
-     * @return $this
+     * @param   $height
+     *
+     * @return  $this
      */
     public function setHeight($height)
     {
@@ -245,17 +264,22 @@ EOD;
     /**
      * Set the border width of the pie chart
      *
-     * @param float $width    Width in px
+     * @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
+     * @param   string $col   The color string
+     *
+     * @return  $this
      */
     public function setBorderColor($col)
     {
@@ -263,9 +287,11 @@ EOD;
     }
 
     /**
-     * @param $width
+     * Set the width
      *
-     * @return $this
+     * @param   $width
+     *
+     * @return  $this
      */
     public function setWidth($width)
     {
@@ -276,7 +302,9 @@ EOD;
     /**
      * Set the styling of the created HtmlElement
      *
-     * @param string $style
+     * @param   string $style
+     *
+     * @return  $this
      */
     public function setStyle($style)
     {
@@ -286,11 +314,14 @@ EOD;
     /**
      * Set the title of the displayed Data
      *
-     * @param string $title
+     * @param   string $title
+     *
+     * @return  $this
      */
     public function setTitle($title)
     {
         $this->title = $title;
+        return $this;
     }
 
     /**
@@ -346,7 +377,7 @@ EOD;
     {
         $template = $this->template;
         $template = str_replace('{url}', $this->url, $template);
-        
+
         // style
         $template = str_replace('{width}', $this->width, $template);
         $template = str_replace('{height}', $this->height, $template);

From 264d8181337d6d0bf58b45a05ed49578731975e0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:44:21 +0200
Subject: [PATCH 262/277] Do not save config references in the
 `ActionController'

This is redundant because our `Config' class already caches loaded configs.
---
 .../Icinga/Web/Controller/ActionController.php    | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index fb3345077..d3fc54535 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -39,10 +39,6 @@ class ActionController extends Zend_Controller_Action
      */
     protected $requiresAuthentication = true;
 
-    private $config;
-
-    private $configs = array();
-
     private $autorefreshInterval;
 
     private $reloadCss = false;
@@ -110,17 +106,10 @@ class ActionController extends Zend_Controller_Action
     public function Config($file = null)
     {
         if ($file === null) {
-            if ($this->config === null) {
-                $this->config = Config::app();
-            }
-            return $this->config;
+            return Config::app();
         } else {
-            if (! array_key_exists($file, $this->configs)) {
-                $this->configs[$file] = Config::module($module, $file);
-            }
-            return $this->configs[$file];
+            return Config::app($file);
         }
-        return $this->config;
     }
 
     public function Auth()

From 2dd81d12ba5a63f16e8ed446ae4b24ae62c2f30c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 15:42:13 +0200
Subject: [PATCH 263/277] monitoring: Add `DataView::count()'

---
 .../library/Monitoring/DataView/DataView.php      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index b7035a850..2b91c1673 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
+use Countable;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\SimpleQuery;
 use Icinga\Data\Browsable;
@@ -18,7 +19,7 @@ use Icinga\Module\Monitoring\Backend;
 /**
  * A read-only view of an underlying query
  */
-abstract class DataView implements Browsable, Filterable, Sortable
+abstract class DataView implements Browsable, Countable, Filterable, Sortable
 {
     /**
      * The query used to populate the view
@@ -26,7 +27,7 @@ abstract class DataView implements Browsable, Filterable, Sortable
      * @var SimpleQuery
      */
     private $query;
-    
+
     protected $filter;
 
     protected $connection;
@@ -328,4 +329,14 @@ public function dump()
     {
         return $this->query->paginate($itemsPerPage, $pageNumber);
     }
+
+    /**
+     * Count result set
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->query);
+    }
 }

From b10737017d34569756f5b5ba58fa82b18cd615f0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 17:36:15 -0700
Subject: [PATCH 264/277] monitoring/commands: Default 'reschedule all service
 checks on the hosts' to false

refs #6593
---
 .../forms/Command/Object/ScheduleHostCheckCommandForm.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index e7d71b9f2..89d39716c 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -26,10 +26,9 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 'all_services',
                 array(
                     'label'         => mt('monitoring', 'All Services'),
-                    'value'         => true,
                     'description'   => mt(
                         'monitoring',
-                        'Schedule check for all services on the hosts and the hosts themself.'
+                        'Schedule check for all services on the hosts and the hosts themselves.'
                     )
                 )
             )

From 9601942116c2614f9c208af212037850ecbc5372 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 17:39:32 -0700
Subject: [PATCH 265/277] monitoring/commands: Default 'schedule downtime for
 all services on the hosts' to false

refs #6593
---
 .../forms/Command/Object/ScheduleHostDowntimeCommandForm.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index ee7dff5bb..25caa0f20 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -28,10 +28,9 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'all_services',
                 array(
                     'label'         => mt('monitoring', 'All Services'),
-                    'value'         => true,
                     'description'   => mt(
                         'monitoring',
-                        'Schedule downtime for all services on the hosts and the hosts themself.'
+                        'Schedule downtime for all services on the hosts and the hosts themselves.'
                     )
                 )
             ),

From 70500be5f72dfa70dc0f830b38b0ad0d38f726b4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 17:40:13 -0700
Subject: [PATCH 266/277] monitoring/commands: Fix the delete comment and
 delete downtime commands

They included the involved object's name which is wrong.

refs #6593
---
 .../IcingaCommandFileCommandRenderer.php      | 32 +++----------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 67de7a02d..8b4c2d0a0 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -322,22 +322,10 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
 
     public function renderDeleteComment(DeleteCommentCommand $command)
     {
-        $object = $command->getObject();
         if ($command->getObject()->getType() === $command::TYPE_HOST) {
-            /** @var \Icinga\Module\Monitoring\Object\Host $object */
-            $commandString = sprintf(
-                '%s;%s',
-                'DEL_HOST_DOWNTIME',
-                $object->getName()
-            );
+            $commandString = 'DEL_HOST_COMMENT';
         } else {
-            /** @var \Icinga\Module\Monitoring\Object\Service $object */
-            $commandString = sprintf(
-                '%s;%s;%s',
-                'DEL_SVC_COMMENT',
-                $object->getHost()->getName(),
-                $object->getName()
-            );
+            $commandString = 'DEL_SVC_COMMENT';
         }
         return sprintf(
             '%s;%u',
@@ -348,22 +336,10 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
 
     public function renderDeleteDowntime(DeleteDowntimeCommand $command)
     {
-        $object = $command->getObject();
         if ($command->getObject()->getType() === $command::TYPE_HOST) {
-            /** @var \Icinga\Module\Monitoring\Object\Host $object */
-            $commandString = sprintf(
-                '%s;%s',
-                'DEL_HOST_DOWNTIME',
-                $object->getName()
-            );
+            $commandString = 'DEL_HOST_DOWNTIME';
         } else {
-            /** @var \Icinga\Module\Monitoring\Object\Service $object */
-            $commandString = sprintf(
-                '%s;%s;%s',
-                'DEL_SVC_DOWNTIME',
-                $object->getHost()->getName(),
-                $object->getName()
-            );
+            $commandString = 'DEL_SVC_DOWNTIME';
         }
         return sprintf(
             '%s;%u',

From 6625e8d391f12bf9052a7062f33527e02d901363 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:16:33 -0700
Subject: [PATCH 267/277] monitoring: Add tabs to the host and service
 controller

---
 .../controllers/HostController.php            | 10 +++
 .../controllers/ServiceController.php         | 10 +++
 .../Controller/MonitoredObjectController.php  | 79 ++++++++++++++++++-
 3 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 7799cb4ec..f77d11deb 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -29,6 +29,16 @@ class Monitoring_HostController extends MonitoredObjectController
             throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
         }
         $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 24bb23024..ea29aa54a 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -29,6 +29,16 @@ class Monitoring_ServiceController extends MonitoredObjectController
             throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
         }
         $this->object = $service;
+        $this->createTabs();
+    }
+
+    /**
+     * Show a service
+     */
+    public function showAction()
+    {
+        $this->getTabs()->activate('service');
+        parent::showAction();
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index ae257e9f1..856496ca8 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -12,7 +12,10 @@ use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm;
+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
@@ -33,6 +36,21 @@ abstract class MonitoredObjectController extends Controller
      */
     protected $commandRedirectUrl;
 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Controller\ActionController For the method documentation.
+     */
+    public function prepareInit()
+    {
+        parent::prepareInit();
+        if (Hook::has('ticket')) {
+            $this->view->tickets = Hook::first('ticket');
+        }
+        if (Hook::has('grapher')) {
+            $this->view->grapher = Hook::first('grapher');
+        }
+    }
+
     /**
      * Show a host or service
      */
@@ -120,7 +138,6 @@ abstract class MonitoredObjectController extends Controller
      */
     abstract public function scheduleDowntimeAction();
 
-
     /**
      * Remove a comment
      */
@@ -148,4 +165,64 @@ abstract class MonitoredObjectController extends Controller
          */
         $this->handleCommandForm(new DeleteDowntimeCommandForm());
     }
+
+    /**
+     * Create tabs
+     */
+    protected function createTabs()
+    {
+        $tabs = $this->getTabs();
+        $object = $this->object;
+        if ($object->getType() === $object::TYPE_HOST) {
+            $params = array(
+                'host' => $object->getName()
+            );
+        } else {
+            $params = array(
+                'host'      => $object->getHost()->getName(),
+                'service'   => $object->getName()
+            );
+        }
+        $tabs->add(
+            'host',
+            array(
+                'title'     => 'Host',
+                'icon'      => 'img/icons/host.png',
+                'url'       => 'monitoring/host/show',
+                'urlParams' => $params
+            )
+        );
+        if (isset($params['service'])) {
+            $tabs->add(
+                'service',
+                array(
+                    'title'     => 'Service',
+                    'icon'      => 'img/icons/service.png',
+                    'url'       => 'monitoring/service/show',
+                    'urlParams' => $params
+                )
+            );
+        }
+        $tabs->add(
+            'services',
+            array(
+                'title'     => 'Services',
+                'icon'      => 'img/icons/service.png',
+                'url'       => 'monitoring/show/services',
+                'urlParams' => $params
+            )
+        );
+        $tabs->add(
+            'history',
+            array(
+                'title'     => 'History',
+                'icon'      => 'img/icons/history.png',
+                'url'       => 'monitoring/show/history',
+                'urlParams' => $params
+            )
+        );
+        $tabs
+            ->extend(new OutputFormat())
+            ->extend(new DashboardAction());
+    }
 }

From df18eab69b99423679cd3ff0133534f4c2338154 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:17:22 -0700
Subject: [PATCH 268/277] monitoring: Provide service stats on both the host
 and the service object

---
 .../library/Monitoring/Object/Host.php        | 37 --------------
 .../Monitoring/Object/MonitoredObject.php     | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index fbd90f2a5..e7521ae6b 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -60,13 +60,6 @@ class Host extends MonitoredObject
      */
     protected $services;
 
-    /**
-     * Stats
-     *
-     * @var object
-     */
-    protected $stats;
-
     /**
      * Create a new host
      *
@@ -160,36 +153,6 @@ class Host extends MonitoredObject
         return $this;
     }
 
-    /**
-     * Fetch stats
-     *
-     * @return $this
-     */
-    public function fetchStats()
-    {
-        $this->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->host)
-            ->getQuery()
-            ->fetchRow();
-        return $this;
-    }
-
     /**
      * Get the optional translated textual representation of a host state
      *
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index e3044d2b3..3171af5e8 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -8,6 +8,7 @@ use InvalidArgumentException;
 use Icinga\Application\Config;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Module\Monitoring\Backend;
+use Icinga\Web\UrlParams;
 
 /**
  * A monitored Icinga object, i.e. host or service
@@ -108,6 +109,13 @@ abstract class MonitoredObject
      */
     protected $eventhistory;
 
+    /**
+     * Stats
+     *
+     * @var object
+     */
+    protected $stats;
+
     /**
      * Create a monitored object, i.e. host or service
      *
@@ -381,6 +389,36 @@ abstract class MonitoredObject
         return $this;
     }
 
+    /**
+     * Fetch stats
+     *
+     * @return $this
+     */
+    public function fetchStats()
+    {
+        $this->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->host_name)
+            ->getQuery()
+            ->fetchRow();
+        return $this;
+    }
+
     /**
      * Fetch all available data of the object
      *
@@ -419,4 +457,17 @@ abstract class MonitoredObject
         }
         throw new InvalidPropertyException('Can\'t access property \'%s\'. Property does not exist.', $name);
     }
+
+    /**
+     * @deprecated
+     */
+    public static function fromParams(UrlParams $params)
+    {
+        if ($params->has('service') && $params->has('host')) {
+            return new Service(Backend::createBackend(), $params->get('host'), $params->get('service'));
+        } elseif ($params->has('host')) {
+            return new Host(Backend::createBackend(), $params->get('host'));
+        }
+        return null;
+    }
 }

From 051c9691a96d9a355ca3d115df23bf251a1a0a65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:18:06 -0700
Subject: [PATCH 269/277] Remove "WTF" comment

---
 modules/monitoring/application/views/scripts/show/contact.phtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index c4dc41b9e..a755266ea 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -40,7 +40,6 @@
       </tr>
     </tbody>
   </table>
-  <?php /* WTF?? */ ?>
   <?php if (count($commands)): ?>
   <h1><?= $this->translate('Commands') ?>:</h1>
   <ul>

From e8477701353f62658d823e4d314cb8d9aca3e20e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:19:35 -0700
Subject: [PATCH 270/277] monitoring/commands: Remove false property from the
 schedule service check command

refs #6593
---
 .../Monitoring/Command/Exception/TransportException.php    | 4 +++-
 .../Command/Object/ScheduleServiceCheckCommand.php         | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
index db06e67ba..440f21770 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -9,4 +9,6 @@ use Icinga\Exception\IcingaException;
 /**
  * Exception thrown if a command was not sent
  */
-class TransportException extends IcingaException {}
+class TransportException extends IcingaException
+{
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index 9bf719a25..fc2037146 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -38,13 +38,6 @@ class ScheduleServiceCheckCommand extends ObjectCommand
      */
     protected $forced = false;
 
-    /**
-     * Whether to schedule a check of all services associated with a particular host
-     *
-     * @var bool
-     */
-    protected $ofAllServices = false;
-
     /**
      * Set the time when the next check of a host or service is to be scheduled
      *

From 4258b13d45b21958f09873f81fd095aaea959a63 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:21:23 -0700
Subject: [PATCH 271/277] monitoring/commands: Remove `MonitoringCommands' view
 helper

The helper is not used anywhere.

refs #6593
---
 .../controllers/MonitoringCommands.php        | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 modules/monitoring/application/controllers/MonitoringCommands.php

diff --git a/modules/monitoring/application/controllers/MonitoringCommands.php b/modules/monitoring/application/controllers/MonitoringCommands.php
deleted file mode 100644
index 16b713d4c..000000000
--- a/modules/monitoring/application/controllers/MonitoringCommands.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-use Icinga\Module\Monitoring\Command\Meta;
-
-/**
- * Class MonitoringCommands
- *
- * Helper which produces a list of command buttons
- * depending on object states
- */
-class Zend_View_Helper_MonitoringCommands extends Zend_View_Helper_Abstract
-{
-    /**
-     * Fetch all monitoring commands that are currently available for *all*
-     * given objects and render a html string that contains buttons to execute
-     * these commands.
-     *
-     * NOTE: This means that if you give multiple commands, the commands that
-     * are not available on every single host, will be left out.
-     *
-     * @param array|stdClass    $object host or service object or something other
-     * @param string            $type   small or full
-     *
-     * @return string           The rendered html
-     */
-    public function monitoringCommands($object, $type)
-    {
-        $commands = new Meta();
-        $definitions = $commands->getCommandForObject($object, $type);
-        $out = '<div>';
-        $i = 0;
-
-        foreach ($definitions as $definition) {
-
-            if ($i % 5 === 0) {
-                $out .= '</div><div class="command-section pull-left">';
-            }
-
-            if ($type === Meta::TYPE_FULL) {
-                $out .= '<div>';
-            }
-
-            $out .= sprintf(
-                '<button type="button" data-target="command"'
-                . ' data-command-id="%1$s" class="btn %5$s"'
-                . ' title="%3$s">'
-                . '<i class="%4$s"></i> %2$s'
-                . '</button>',
-                $definition->id,
-                $definition->shortDescription,
-                $definition->longDescription,
-                $definition->iconCls,
-                ($definition->btnCls) ? $definition->btnCls : 'btn-default'
-            );
-
-            if ($type === Meta::TYPE_FULL) {
-                $out .= '</div>';
-            }
-
-            $i++;
-        }
-
-        $out .= '</div>';
-
-        $out .= '<div style="clear: both;"></div>';
-
-        if ($type === Meta::TYPE_FULL) {
-            return '<div>'. $out. '</div>';
-        }
-
-        return $out;
-    }
-}

From c8f00be75b040f094787d9eacac88ca1ba4d74fa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:23:56 -0700
Subject: [PATCH 272/277] monitoring/commands: Fix that removing a comment from
 the comment list opens and closes the detail area

This extends to removing a downtime from the downtime list.

refs #6593
---
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.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 fb3408f16..58fe4abec 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -83,7 +83,7 @@
               date('H:i', $comment->expiration)
             ) : $this->translate('This comment does not expire.'); ?>
         </td>
-        <td style="width: 2em">
+        <td style="width: 2em" data-base-target="self">
           <?php
           $delCommentForm = clone $delCommentForm;
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 956427b77..247bf61c9 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -92,7 +92,7 @@
         <?php endif ?>
           </small>
         </td>
-        <td style="width: 2em">
+        <td style="width: 2em" data-base-target="self">
           <?php
           $delDowntimeForm = clone $delDowntimeForm;
           $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));

From 3034ac52575590a7d921958918d0e1eddc3f50c6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:34:19 -0700
Subject: [PATCH 273/277] monitoring/commands: Show affected objects in command
 forms

refs #6593
---
 .../views/scripts/partials/command-form.phtml | 21 +++++++++++++++++++
 .../views/scripts/service/command.phtml       |  4 ----
 2 files changed, 21 insertions(+), 4 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/service/command.phtml

diff --git a/modules/monitoring/application/views/scripts/partials/command-form.phtml b/modules/monitoring/application/views/scripts/partials/command-form.phtml
index 5bff418e3..0aae10046 100644
--- a/modules/monitoring/application/views/scripts/partials/command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command-form.phtml
@@ -1,4 +1,25 @@
 <div class="content">
     <h1><?= $title ?></h1>
+    <table class="objectlist">
+        <thead>
+            <tr>
+                <th><?= $this->img('img/icons/host.png') ?> <?= $this->translate('Host') ?></th>
+                <th><?= $this->img('img/icons/service.png') ?> <?= $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/service/command.phtml b/modules/monitoring/application/views/scripts/service/command.phtml
deleted file mode 100644
index 5bff418e3..000000000
--- a/modules/monitoring/application/views/scripts/service/command.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="content">
-    <h1><?= $title ?></h1>
-    <?= $form ?>
-</div>

From 0b723bb57d30a41c07cd65db3518ecf274d7d57b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:37:14 -0700
Subject: [PATCH 274/277] monitoring: Deprecate the host and service action of
 the `ShowController'

There are the `HostController' and the `ServiceController' now instead.
---
 .../controllers/ShowController.php            | 56 +++++++------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 3630d6424..8a399c250 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -5,6 +5,7 @@
 use Icinga\Application\Benchmark;
 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;
@@ -35,14 +36,11 @@ class Monitoring_ShowController extends Controller
      */
     public function init()
     {
-        if ($this->getRequest()->getActionName() === 'host') {
-            $this->view->object = new Host($this->params);
-        } elseif ($this->getRequest()->getActionName() === 'service') {
-            $this->view->object = new Service($this->params);
-        } else {
-            // TODO: Well... this could be done better
-            $this->view->object = MonitoredObject::fromParams($this->params);
+        $this->view->object = MonitoredObject::fromParams($this->params);
+        if ($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');
         }
@@ -57,36 +55,19 @@ class Monitoring_ShowController extends Controller
     }
 
     /**
-     * Service overview
+     * @deprecated
      */
     public function serviceAction()
     {
-        $o = $this->view->object;
-        $this->setAutorefreshInterval(10);
-        $this->view->title = $o->service_description
-            . ' on ' . $o->host_name;
-        $this->getTabs()->activate('service');
-        $o->populate();
-        if ($this->grapher) {
-            $this->view->grapherHtml = $this->grapher->getPreviewHtml($o);
-        }
-        $this->fetchHostStats();
+        $this->redirectNow(Url::fromRequest()->setPath('monitoring/service/show'));
     }
 
     /**
-     * Host overview
+     * @deprecated
      */
     public function hostAction()
     {
-        $o = $this->view->object;
-        $this->setAutorefreshInterval(10);
-        $this->getTabs()->activate('host');
-        $this->view->title = $o->host_name;
-        $o->populate();
-        if ($this->grapher) {
-            $this->view->grapherHtml = $this->grapher->getPreviewHtml($o);
-        }
-        $this->fetchHostStats();
+        $this->redirectNow(Url::fromRequest()->setPath('monitoring/host/show'));
     }
 
     public function historyAction()
@@ -206,16 +187,17 @@ class Monitoring_ShowController extends Controller
         if (($object = $this->view->object) === null) {
             return;
         }
-
-        $tabs = $this->getTabs();
-        $params = array(
-            'host' => $object->host_name,
-        );
-        if ($object instanceof Service) {
-            $params['service'] = $object->service_description;
-        } elseif ($service = $this->_getParam('service')) {
-            $params['service'] = $service;
+        if ($object->getType() === $object::TYPE_HOST) {
+            $params = array(
+                'host' => $object->getName()
+            );
+        } else {
+            $params = array(
+                'host'      => $object->getHost()->getName(),
+                'service'   => $object->getName()
+            );
         }
+        $tabs = $this->getTabs();
         $tabs->add(
             'host',
             array(

From 1710a50d5c5c11271345bc483d9b87132af42587 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:43:33 -0700
Subject: [PATCH 275/277] Fix form CSS

---
 .../scripts/show/components/grapher.phtml     |  5 ++-
 modules/monitoring/public/css/module.less     |  6 ++-
 public/css/icinga/forms.less                  | 39 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/grapher.phtml b/modules/monitoring/application/views/scripts/show/components/grapher.phtml
index 2d8d3e4bd..b46ad6113 100644
--- a/modules/monitoring/application/views/scripts/show/components/grapher.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/grapher.phtml
@@ -1 +1,4 @@
-<?= $this->grapherHtml ?>
+<?php if (isset($grapher)) {
+  echo $grapher->getPreviewHtml($object);
+} ?>
+
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 4ee048529..5ab6d9c82 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -117,7 +117,7 @@ span.state.warning {
 
 span.state.handled.warning {
     background: @colorWarningHandled;
-}   
+}
 
 span.state.unknown {
     background: @colorUnknown;
@@ -130,3 +130,7 @@ span.state.handled.unknown {
 span.state.pending {
     background: @colorPending;
 }
+
+form.instance-features span.description, form.object-features span.description {
+  display: inline;
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 4712f4951..b201df7c6 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -97,7 +97,7 @@ form.inline {
   display: inline;
 }
 
-button.link-like, input.link-like {
+form.link-like input[type="submit"] {
   color: @colorLinkDefault;
   font-weight: normal;
   border: none;
@@ -107,7 +107,7 @@ button.link-like, input.link-like {
   cursor: pointer;
 }
 
-button.link-like:hover, input.link-like:hover, input.link-like:focus {
+form.link-like input[type="submit"]:hover, form.link-like input[type="submit"]:focus {
   text-decoration: underline;
   background: none;
   color: @colorLinkDefault;
@@ -140,4 +140,39 @@ form ul.errors li {
   font-size: 0.8em;
 }
 
+.description {
+  display: block;
+}
 
+textarea {
+  height: 4em;
+
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+
+  width: 100%;
+}
+
+input, select, textarea {
+  display: inline;
+}
+
+.control-group {
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-flow: row wrap;
+  flex-flow: row wrap;
+}
+
+.control-group > div {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}
+
+@media (min-width: 480px) {
+  .control-group > div {
+    width: auto;
+  }
+}

From 3229e5e587d22932fc65b531c59530cce4c5e812 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 22:47:26 -0700
Subject: [PATCH 276/277] monitoring: Add new multiselection controllers

---
 .../controllers/HostsController.php           | 157 ++++++++++++++++
 .../controllers/ServicesController.php        | 177 ++++++++++++++++++
 .../views/scripts/hosts/show.phtml            | 118 ++++++++++++
 .../views/scripts/list/hosts.phtml            |   6 +-
 .../views/scripts/list/services.phtml         |   4 +-
 .../views/scripts/services/show.phtml         | 131 +++++++++++++
 .../library/Monitoring/Object/HostList.php    |  27 +++
 .../library/Monitoring/Object/ObjectList.php  |  87 +++++++++
 .../library/Monitoring/Object/ServiceList.php |  27 +++
 9 files changed, 729 insertions(+), 5 deletions(-)
 create mode 100644 modules/monitoring/application/controllers/HostsController.php
 create mode 100644 modules/monitoring/application/controllers/ServicesController.php
 create mode 100644 modules/monitoring/application/views/scripts/hosts/show.phtml
 create mode 100644 modules/monitoring/application/views/scripts/services/show.phtml
 create mode 100644 modules/monitoring/library/Monitoring/Object/HostList.php
 create mode 100644 modules/monitoring/library/Monitoring/Object/ObjectList.php
 create mode 100644 modules/monitoring/library/Monitoring/Object/ServiceList.php

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
new file mode 100644
index 000000000..8298f456b
--- /dev/null
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -0,0 +1,157 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm;
+use Icinga\Module\Monitoring\Form\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;
+
+class Monitoring_HostsController extends Controller
+{
+    /**
+     * @var HostList
+     */
+    protected $hostList;
+
+    public function init()
+    {
+        $hostList = new HostList($this->backend);
+        $hostList->setFilter(Filter::fromQueryString((string) $this->params));
+        $this->hostList = $hostList;
+    }
+
+    protected function handleCommandForm(ObjectsCommandForm $form)
+    {
+        $form
+            ->setObjects($this->hostList)
+            ->setRedirectUrl(Url::fromPath('monitoring/hosts/show')->setParams($this->params))
+            ->handleRequest();
+        $this->view->form = $form;
+        $this->_helper->viewRenderer('partials/command-form', null, true);
+        return $form;
+    }
+
+    public function showAction()
+    {
+        $this->setAutorefreshInterval(15);
+        $checkNowForm = new CheckNowCommandForm();
+        $checkNowForm
+            ->setObjects($this->hostList)
+            ->handleRequest();
+        $this->view->checkNowForm = $checkNowForm;
+        $this->hostList->setColumns(array(
+            'host_name',
+            'host_state',
+            'host_problem',
+            'host_handled',
+            'host_acknowledged',
+            'host_in_downtime'/*,
+            'host_passive_checks_enabled',
+            'host_notifications_enabled',
+            'host_event_handler_enabled',
+            'host_flap_detection_enabled',
+            'host_active_checks_enabled',
+            'host_obsessing'*/
+        ));
+        $unhandledObjects = array();
+        $acknowledgedObjects = array();
+        $objectsInDowntime = 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->hostList as $host) {
+            /** @var Service $host */
+            if ((bool) $host->problem === true && (bool) $host->handled === false) {
+                $unhandledObjects[] = $host;
+            }
+            if ((bool) $host->acknowledged === true) {
+                $acknowledgedObjects[] = $host;
+            }
+            if ((bool) $host->in_downtime === true) {
+                $objectsInDowntime[] = $host;
+            }
+            ++$hostStates[$host::getStateText($host->state)];
+        }
+        if (! empty($acknowledgedObjects)) {
+            $removeAckForm = new RemoveAcknowledgementCommandForm();
+            $removeAckForm
+                ->setObjects($acknowledgedObjects)
+                ->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->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->acknowledgedObjects = $acknowledgedObjects;
+        $this->view->objectsInDowntime = $objectsInDowntime;
+        $this->view->inDowntimeLink = Url::fromRequest()
+            ->setPath('monitoring/list/downtimes');
+        $this->view->havingCommentsLink = 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
+            ->setLabel(array_map('strtoupper', array_keys($states)))
+            ->setHeight(100)
+            ->setWidth(100)
+            ->setTitle($title);
+    }
+
+    /**
+     * Acknowledge host problems
+     */
+    public function acknowledgeProblemAction()
+    {
+        $this->view->title = $this->translate('Acknowledge Host Problems');
+        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+    }
+
+    /**
+     * Reschedule host checks
+     */
+    public function rescheduleCheckAction()
+    {
+        $this->view->title = $this->translate('Reschedule Host Checks');
+        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+    }
+
+    /**
+     * Schedule host downtimes
+     */
+    public function scheduleDowntimeAction()
+    {
+        $this->view->title = $this->translate('Schedule Host Downtimes');
+        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+    }
+}
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
new file mode 100644
index 000000000..633ff521b
--- /dev/null
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -0,0 +1,177 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm;
+use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm;
+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
+{
+    /**
+     * @var ServiceList
+     */
+    protected $serviceList;
+
+    public function init()
+    {
+        $serviceList = new ServiceList($this->backend);
+        $serviceList->setFilter(Filter::fromQueryString((string) $this->params));
+        $this->serviceList = $serviceList;
+    }
+
+    protected function handleCommandForm(ObjectsCommandForm $form)
+    {
+        $form
+            ->setObjects($this->serviceList)
+            ->setRedirectUrl(Url::fromPath('monitoring/services/show')->setParams($this->params))
+            ->handleRequest();
+        $this->view->form = $form;
+        $this->_helper->viewRenderer('partials/command-form', null, true);
+        return $form;
+    }
+
+    public function showAction()
+    {
+        $this->setAutorefreshInterval(15);
+        $checkNowForm = new CheckNowCommandForm();
+        $checkNowForm
+            ->setObjects($this->serviceList)
+            ->handleRequest();
+        $this->view->checkNowForm = $checkNowForm;
+        $this->serviceList->setColumns(array(
+            'host_name',
+            'host_state',
+            'service_description',
+            'service_state',
+            'service_problem',
+            'service_handled',
+            'service_acknowledged',
+            'service_in_downtime'/*,
+            'service_passive_checks_enabled',
+            'service_notifications_enabled',
+            'service_event_handler_enabled',
+            'service_flap_detection_enabled',
+            'service_active_checks_enabled',
+            'service_obsessing'*/
+        ));
+        $unhandledObjects = array();
+        $acknowledgedObjects = array();
+        $objectsInDowntime = 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
+        );
+        $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) {
+            /** @var Service $service */
+            if ((bool) $service->problem === true && (bool) $service->handled === false) {
+                $unhandledObjects[] = $service;
+            }
+            if ((bool) $service->acknowledged === true) {
+                $acknowledgedObjects[] = $service;
+            }
+            if ((bool) $service->in_downtime === true) {
+                $objectsInDowntime[] = $service;
+            }
+            ++$serviceStates[$service::getStateText($service->state)];
+            if (! isset($knownHostStates[$service->getHost()->getName()])) {
+                $knownHostStates[$service->getHost()->getName()] = true;
+                ++$hostStates[$service->getHost()->getStateText($service->host_state)];
+            }
+        }
+        if (! empty($acknowledgedObjects)) {
+            $removeAckForm = new RemoveAcknowledgementCommandForm();
+            $removeAckForm
+                ->setObjects($acknowledgedObjects)
+                ->handleRequest();
+            $this->view->removeAckForm = $removeAckForm;
+        }
+        $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->hostStates = $hostStates;
+        $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));
+        $this->view->acknowledgedObjects = $acknowledgedObjects;
+        $this->view->objectsInDowntime = $objectsInDowntime;
+        $this->view->inDowntimeLink = Url::fromRequest()
+            ->setPath('monitoring/list/downtimes');
+        $this->view->havingCommentsLink = 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
+            ->setLabel(array_map('strtoupper', array_keys($states)))
+            ->setHeight(100)
+            ->setWidth(100)
+            ->setTitle($title);
+    }
+
+    /**
+     * Acknowledge service problems
+     */
+    public function acknowledgeProblemAction()
+    {
+        $this->view->title = $this->translate('Acknowledge Service Problems');
+        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+    }
+
+    /**
+     * Reschedule service checks
+     */
+    public function rescheduleCheckAction()
+    {
+        $this->view->title = $this->translate('Reschedule Service Checks');
+        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+    }
+
+    /**
+     * Schedule service downtimes
+     */
+    public function scheduleDowntimeAction()
+    {
+        $this->view->title = $this->translate('Schedule Service Downtimes');
+        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
new file mode 100644
index 000000000..14d160c1e
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -0,0 +1,118 @@
+<div class="controls">
+    <?= $this->tabs ?>
+</div>
+<div class="content">
+    <?php if (count($objects) === 0): ?>
+        <?= $this->translate('No hosts matching the filter') ?>
+    <?php else: ?>
+        <h1><?= sprintf($this->translate('Summary For %u Hosts'), count($objects)) ?></h1>
+        <table style="width: 100%; font-size: 0.8em;">
+            <tr>
+                <th colspan="2"><?= sprintf($this->translate('%u Hosts'), array_sum(array_values($hostStates)))  ?></th>
+            </tr>
+            <tr>
+                <td align="center">
+                    <?= $this->hostStatesPieChart ?>
+                </td>
+                <td>
+                    <?php
+
+                    foreach (array_filter($hostStates) as $text => $count) {
+                        echo sprintf('%s: %u<br>', strtoupper($text), $count);
+                    }
+
+                    ?>
+                </td>
+            </tr>
+        </table>
+
+        <div>
+            <a href="<?= $listAllLink ?>" title="<?= $this->translate('List all') ?>">
+                <?= $this->translate('List all') ?>
+            </a>
+        </div>
+
+        <hr>
+
+        <div>
+            <?= $checkNowForm ?>
+        </div>
+
+        <div>
+            <a href="<?= $rescheduleAllLink ?>">
+                <?= $this->icon('reschedule_petrol.png') ?>
+                <?= $this->translate('Reschedule host checks') ?>
+            </a>
+        </div>
+
+        <div>
+            <a href="<?= $downtimeAllLink ?>">
+                <?= $this->icon('in_downtime_petrol.png') ?>
+                <?= $this->translate('Schedule host downtimes') ?>
+            </a>
+        </div>
+
+        <?php if (! empty($unhandledObjects)): ?>
+        <h2>
+            <?= sprintf(
+                $this->translatePlural(
+                    '%u Unhandled Host Problem',
+                    '%u Unhandled Host Problems',
+                    count($unhandledObjects)
+                ),
+                count($unhandledObjects)
+            ) ?>
+        </h2>
+        <div>
+            <a href="<?= $downtimeUnhandledLink ?>"
+               title="<?= $this->translate('Schedule downtimes for unhandled problem hosts') ?>">
+                <?= $this->icon('in_downtime_petrol.png') ?>
+                <?= $this->translate('Schedule downtimes for unhandled problem hosts') ?>
+            </a>
+        </div>
+        <div>
+            <a href="<?= $acknowledgeUnhandledLink ?>"
+               title="<?= $this->translate('Acknowledge unhandled problem hosts') ?>">
+                <?= $this->icon('acknowledgement_petrol.png') ?>
+                <?= $this->translate('Acknowledge unhandled problem hosts') ?>
+            </a>
+        </div>
+        <?php endif ?>
+
+        <?php if (! empty($acknowledgedObjects)): ?>
+            <h2>
+                <?= sprintf(
+                    $this->translatePlural(
+                        '%u Acknowledged Host Problem',
+                        '%u Acknowledged Host Problems',
+                        count($acknowledgedObjects)
+                    ),
+                    count($acknowledgedObjects)
+                ) ?>
+            </h2>
+            <div>
+                <?= $removeAckForm ?>
+            </div>
+        <?php endif ?>
+
+        <?php if (! empty($objectsInDowntime)): ?>
+            <h2>
+                <a href="<?= $inDowntimeLink ?>"
+                   title="<?= $this->translate('Hosts in downtime') ?>">
+                    <?= $this->icon('in_downtime_petrol.png') ?>
+                    <?= $this->translate(sprintf('%u hosts are in downtime', count($objectsInDowntime))) ?>
+                </a>
+            </h2>
+        <?php endif ?>
+
+        <?php if (count($objects->getComments())): ?>
+            <h2>
+                <a href="<?= $havingCommentsLink ?>"
+                   title="<?= $this->translate('Comments') ?>">
+                    <?= $this->icon('comment.png') ?>
+                    <?= $this->translate(sprintf('%u comments', count($objects->getComments()))) ?>
+                </a>
+            </h2>
+        <?php endif ?>
+    <?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 3a38829b4..5cad9142e 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -15,7 +15,7 @@ if ($this->compact): ?>
 
 <?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
 <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
-<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/host?' . $this->filter->toQueryString())) ?>
+<?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
 </div>
 
 <div class="content">
@@ -36,14 +36,14 @@ if ($hosts->count() === 0) {
 <table
     data-base-target="_next"
     class="action multiselect"
-    data-icinga-multiselect-url="<?= $this->href('/monitoring/multi/host') ?>"
+    data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
     data-icinga-multiselect-data="host"
 >
   <tbody>
   <?php foreach($hosts as $host):
 
     $hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
-    $hostLink = $this->href('/monitoring/show/host', array('host' => $host->host_name));
+    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 350cb96be..46ca2c08f 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -19,7 +19,7 @@ if (!$this->compact): ?>
 <?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
 <?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
 <?php endif ?>
-<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service?' . $this->filter->toQueryString())) ?>
+<?= $this->selectionToolbar('multi', $this->href('monitoring/services/show?' . $this->filter->toQueryString())) ?>
 </div>
 
 <div class="content">
@@ -30,7 +30,7 @@ if (!$this->compact): ?>
 <?php endif ?>
 <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/multi/service") ?>"
+    data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"
     data-icinga-multiselect-data="service,host">
   <tbody>
 <?php
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
new file mode 100644
index 000000000..4d5d46e05
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -0,0 +1,131 @@
+<div class="controls">
+    <?= $this->tabs ?>
+</div>
+<div class="content">
+    <?php if (count($objects) === 0): ?>
+        <?= $this->translate('No services matching the filter') ?>
+    <?php else: ?>
+        <h1><?= sprintf($this->translate('Summary For %u Services'), count($objects)) ?></h1>
+        <table style="width: 100%; font-size: 0.8em;">
+            <tr>
+                <th colspan="2"><?= sprintf($this->translate('%u Services'), array_sum(array_values($serviceStates))) ?></th>
+                <th colspan="2"><?= sprintf($this->translate('%u Hosts'), array_sum(array_values($hostStates)))  ?></th>
+            </tr>
+            <tr>
+                <td align="center">
+                    <?= $this->serviceStatesPieChart ?>
+                </td>
+                <td>
+                    <?php
+
+                    foreach (array_filter($serviceStates) as $text => $count) {
+                        echo sprintf('%s: %u<br>', strtoupper($text), $count);
+                    }
+
+                    ?>
+                </td>
+                <td align="center">
+                    <?= $this->hostStatesPieChart ?>
+                </td>
+                <td>
+                    <?php
+
+                    foreach (array_filter($hostStates) as $text => $count) {
+                        echo sprintf('%s: %u<br>', strtoupper($text), $count);
+                    }
+
+                    ?>
+                </td>
+            </tr>
+        </table>
+
+        <div>
+            <a href="<?= $listAllLink ?>" title="<?= $this->translate('List all') ?>">
+                <?= $this->translate('List all') ?>
+            </a>
+        </div>
+
+        <hr>
+
+        <div>
+            <?= $checkNowForm ?>
+        </div>
+
+        <div>
+            <a href="<?= $rescheduleAllLink ?>">
+                <?= $this->icon('reschedule_petrol.png') ?>
+                <?= $this->translate('Reschedule service checks') ?>
+            </a>
+        </div>
+
+        <div>
+            <a href="<?= $downtimeAllLink ?>">
+                <?= $this->icon('in_downtime_petrol.png') ?>
+                <?= $this->translate('Schedule service downtimes') ?>
+            </a>
+        </div>
+
+        <?php if (! empty($unhandledObjects)): ?>
+        <h2>
+            <?= sprintf(
+                $this->translatePlural(
+                    '%u Unhandled Service Problem',
+                    '%u Unhandled Service Problems',
+                    count($unhandledObjects)
+                ),
+                count($unhandledObjects)
+            ) ?>
+        </h2>
+        <div>
+            <a href="<?= $downtimeUnhandledLink ?>"
+               title="<?= $this->translate('Schedule downtimes for unhandled problem services') ?>">
+                <?= $this->icon('in_downtime_petrol.png') ?>
+                <?= $this->translate('Schedule downtimes for unhandled problem services') ?>
+            </a>
+        </div>
+        <div>
+            <a href="<?= $acknowledgeUnhandledLink ?>"
+               title="<?= $this->translate('Acknowledge unhandled problem services') ?>">
+                <?= $this->icon('acknowledgement_petrol.png') ?>
+                <?= $this->translate('Acknowledge unhandled problem services') ?>
+            </a>
+        </div>
+        <?php endif ?>
+
+        <?php if (! empty($acknowledgedObjects)): ?>
+            <h2>
+                <?= sprintf(
+                    $this->translatePlural(
+                        '%u Acknowledged Service Problem',
+                        '%u Acknowledged Service Problems',
+                        count($acknowledgedObjects)
+                    ),
+                    count($acknowledgedObjects)
+                ) ?>
+            </h2>
+            <div>
+                <?= $removeAckForm ?>
+            </div>
+        <?php endif ?>
+
+        <?php if (! empty($objectsInDowntime)): ?>
+            <h2>
+                <a href="<?= $inDowntimeLink ?>"
+                   title="<?= $this->translate('Services in downtime') ?>">
+                    <?= $this->icon('in_downtime_petrol.png') ?>
+                    <?= $this->translate(sprintf('%u services are in downtime', count($objectsInDowntime))) ?>
+                </a>
+            </h2>
+        <?php endif ?>
+
+        <?php if (count($objects->getComments())): ?>
+            <h2>
+                <a href="<?= $havingCommentsLink ?>"
+                   title="<?= $this->translate('Comments') ?>">
+                    <?= $this->icon('comment.png') ?>
+                    <?= $this->translate(sprintf('%u comments', count($objects->getComments()))) ?>
+                </a>
+            </h2>
+        <?php endif ?>
+    <?php endif ?>
+</div>
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
new file mode 100644
index 000000000..2d3f57495
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Object;
+
+/**
+ * A host list
+ */
+class HostList extends ObjectList
+{
+    protected $dataViewName = 'hostStatus';
+
+    protected $columns = array('host_name');
+
+    protected function fetchObjects()
+    {
+        $hosts = array();
+        $query = $this->backend->select()->from($this->dataViewName, $this->columns)->applyFilter($this->filter)
+            ->getQuery()->getSelectQuery()->query();
+        foreach ($query as $row) {
+            /** @var object $row */
+            $host = new Host($this->backend, $row->host_name);
+            $host->setProperties($row);
+            $hosts[] = $host;
+        }
+        return $hosts;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
new file mode 100644
index 000000000..1e5595d58
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Object;
+
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use Icinga\Module\Monitoring\Backend;
+
+abstract class ObjectList implements Countable, IteratorAggregate
+{
+    protected $dataViewName;
+
+    protected $backend;
+
+    protected $columns;
+
+    protected $filter;
+
+    protected $objects;
+
+    protected $count;
+
+    public function __construct(Backend $backend)
+    {
+        $this->backend = $backend;
+    }
+
+    public function setColumns(array $columns)
+    {
+        $this->columns = $columns;
+        return $this;
+    }
+
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    public function setFilter($filter)
+    {
+        $this->filter = $filter;
+        return $this;
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    abstract protected function fetchObjects();
+
+    public function fetch()
+    {
+        if ($this->objects === null) {
+            $this->objects = $this->fetchObjects();
+        }
+        return $this->objects;
+    }
+
+    public function count()
+    {
+        if ($this->count === null) {
+            $this->count = (int) $this->backend->select()->from($this->dataViewName)->applyFilter($this->filter)
+                ->getQuery()->count();
+        }
+        return $this->count;
+    }
+
+    public function getIterator()
+    {
+        if ($this->objects === null) {
+            $this->fetch();
+        }
+        return new ArrayIterator($this->objects);
+    }
+
+    /**
+     * Get the comments
+     *
+     * @return \Icinga\Module\Monitoring\DataView\Comment
+     */
+    public function getComments()
+    {
+        return $this->backend->select()->from('comment')->applyFilter($this->filter);
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
new file mode 100644
index 000000000..858d04b5b
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Object;
+
+/**
+ * A service list
+ */
+class ServiceList extends ObjectList
+{
+    protected $dataViewName = 'serviceStatus';
+
+    protected $columns = array('host_name', 'service_description');
+
+    protected function fetchObjects()
+    {
+        $services = array();
+        $query = $this->backend->select()->from($this->dataViewName, $this->columns)->applyFilter($this->filter)
+            ->getQuery()->getSelectQuery()->query();
+        foreach ($query as $row) {
+            /** @var object $row */
+            $service = new Service($this->backend, $row->host_name, $row->service_description);
+            $service->setProperties($row);
+            $services[] = $service;
+        }
+        return $services;
+    }
+}

From c4d13a7850cb2c2d1efb2b9125cd1445e272a4e9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 23 Sep 2014 23:00:19 -0700
Subject: [PATCH 277/277] monitoring: Fix `$this' usage in a closure

---
 .../application/views/scripts/show/history.phtml           | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index e2c13aa8b..7c72888c4 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -12,10 +12,11 @@
 <?php return; endif ?>
 
 <?php
-function contactsLink($match, $self) {
+$self = $this;
+function contactsLink($match, $view) {
     $links = array();
     foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $self->qlink($contact, 'monitoring/show/contact', array('contact' => $contact));
+        $links[] = $view->qlink($contact, 'monitoring/show/contact', array('contact' => $contact));
     }
     return '[' . implode(', ', $links) . ']';
 }
@@ -39,7 +40,7 @@ function contactsLink($match, $self) {
 
           $msg = preg_replace_callback(
               '/^\[([^\]]+)\]/',
-              function($match) { return contactsLink($match, $this); },
+              function($match) use ($self) { return contactsLink($match, $self); },
               $this->escape($event->output)
           );
           break;