Merge branch 'master' into bugfix/test-fix-6542

.gitignore

@@ -10,7 +10,6 @@
 !.gitkeep
 
 build/
-test/js/npm-debug.log
 
 # ./configure output
 config.log
@@ -20,10 +19,9 @@ config.status
 Makefile
 
 # cmd tester
-test/php/bin/extcmd_test
+modules/test/bin/extcmd_test
 
 # misc test output
-test/frontend/static/public
 test/php/library/Icinga/Protocol/Statusdat/.cache
 
 # Generated API documentation

.vagrant-puppet/manifests/default.pp

@@ -202,7 +202,7 @@ exec { 'iptables-allow-http':
 
 exec { 'icinga-htpasswd':
   creates => '/usr/share/icinga/htpasswd.users',
-  command => 'mkdir /usr/share/icinga && htpasswd -b -c /usr/share/icinga/htpasswd.users icingaadmin icinga',
+  command => 'mkdir -p /usr/share/icinga && htpasswd -b -c /usr/share/icinga/htpasswd.users icingaadmin icinga',
   require => Class['apache']
 }
 

application/clicommands/AutocompleteCommand.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Clicommands;
 
@@ -118,4 +117,3 @@ class AutocompleteCommand extends Command
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/clicommands/HelpCommand.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Clicommands;
 
@@ -41,4 +40,3 @@ class HelpCommand extends Command
         );
     }
 }
-// @codeCoverageIgnoreEnd

application/clicommands/ModuleCommand.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Clicommands;
 
@@ -212,4 +211,3 @@ class ModuleCommand extends Command
         $this->fail("Not implemented yet");
     }
 }
-// @codeCoverageIgnoreEnd

application/clicommands/WebCommand.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Clicommands;
 
@@ -81,4 +80,3 @@ class WebCommand extends Command
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/AuthenticationController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -159,4 +158,3 @@ class AuthenticationController extends ActionController
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/ConfigController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -549,4 +548,3 @@ class ConfigController extends BaseConfigController
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/DashboardController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -191,4 +190,3 @@ class DashboardController extends ActionController
         return true;
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/ErrorController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -78,4 +77,3 @@ class ErrorController extends ActionController
         $this->view->request = $error->request;
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/FilterController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -117,4 +116,3 @@ class FilterController extends ActionController
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/IndexController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -56,4 +55,3 @@ class IndexController extends ActionController
     {
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/InstallController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -107,5 +106,3 @@ class InstallController extends ActionController
         $session->write();
     }
 }
-
-// @codeCoverageIgnoreEnd

application/controllers/LayoutController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -43,4 +42,3 @@ class LayoutController extends ActionController
         $this->renderScript('parts/topbar.phtml');
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/ListController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -79,4 +78,3 @@ class ListController extends Controller
         }
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/PreferenceController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -83,4 +82,3 @@ class PreferenceController extends BasePreferenceController
         $this->view->form = $form;
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/SearchController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
@@ -57,4 +56,3 @@ class SearchController extends ActionController
         $this->view->tabs = $dashboard->getTabs();
     }
 }
-// @codeCoverageIgnoreEnd

application/controllers/StaticController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -188,4 +187,3 @@ class StaticController extends ActionController
         $lessCompiler->printStack();
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Config/Authentication/DbBackendForm.php

@@ -30,10 +30,10 @@
 namespace Icinga\Form\Config\Authentication;
 
 use \Exception;
-use \Icinga\Authentication\Backend\DbUserBackend;
 use \Zend_Config;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\UserBackend;
+use Icinga\Authentication\DbConnection;
+use Icinga\Authentication\Backend\DbUserBackend;
 
 /**
  * Form class for adding/modifying database authentication backends
@@ -148,7 +148,6 @@ class DbBackendForm extends BaseBackendForm
             $this->addErrorMessage(sprintf(t('Using the specified backend failed: %s'), $e->getMessage()));
             return false;
         }
-
         return true;
     }
 }

application/forms/Config/ConfirmRemovalForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -93,4 +92,3 @@ class ConfirmRemovalForm extends Form
         );
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Config/GeneralForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -295,4 +294,3 @@ class GeneralForm extends Form
         return $cfg;
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Config/LoggingForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -202,4 +201,3 @@ class LoggingForm extends Form
         return new Zend_Config($cfg);
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Dashboard/AddUrlForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -165,4 +164,3 @@ class AddUrlForm extends Form
         $this->setSubmitLabel("Add To Dashboard");
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Install/LoggingPage.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -64,4 +63,3 @@ class LoggingPage extends Page
         return $this->createForm()->getConfig();
     }
 }
-// @codeCoverageIgnoreEnd

application/forms/Preference/GeneralForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -175,4 +174,3 @@ class GeneralForm extends Form
         );
     }
 }
-// @codeCoverageIgnoreEnd

application/views/helpers/FormDateTime.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -94,4 +93,3 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
         return $xhtml;
     }
 }
-// @codeCoverageIgnoreEnd

application/views/helpers/FormNumber.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -54,4 +53,3 @@ class Zend_View_Helper_FormNumber extends \Zend_View_Helper_FormText
              . $this->getClosingBracket();
     }
 }
-// @codeCoverageIgnoreEnd

application/views/helpers/FormTriStateCheckbox.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -63,4 +62,3 @@ class Zend_View_Helper_FormTriStateCheckbox extends Zend_View_Helper_FormElement
         return $xhtml . '</div>';
     }
 }
-// @codeCoverageIgnoreEnd

application/views/helpers/Util.php

@@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -142,5 +140,3 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
         return sprintf('OUT OF BOUND (%d)' . $state, (int) $state);
     }
 }
-
-// @codingStandardsIgnoreStop

library/Icinga/Application/ApplicationBootstrap.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -495,4 +494,3 @@ abstract class ApplicationBootstrap
         return $this;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/Benchmark.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -318,4 +317,3 @@ class Benchmark
     {
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/Cli.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -191,4 +190,3 @@ class Cli extends ApplicationBootstrap
         throw new ProgrammingError('Icinga is not running on CLI');
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/EmbeddedWeb.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -30,9 +29,7 @@
 
 namespace Icinga\Application;
 
-// @codingStandardsIgnoreStart
 require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
-// @codingStandardsIgnoreStop
 
 use Icinga\Exception\ProgrammingError;
 
@@ -62,4 +59,3 @@ class EmbeddedWeb extends ApplicationBootstrap
             ->loadEnabledModules();
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/LegacyWeb.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -56,4 +55,3 @@ class LegacyWeb extends Web
         return $this->legacyBasedir;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/Platform.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -93,4 +92,3 @@ class Platform
         }
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Application/Web.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -376,4 +375,3 @@ class Web extends ApplicationBootstrap
         return $this;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Chart/Inline/Inline.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.

library/Icinga/Chart/Inline/PieChart.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.

library/Icinga/Config/PreservingIniWriter.php

@@ -177,29 +177,42 @@ class PreservingIniWriter extends Zend_Config_Writer_FileAbstract
 
         // Iterate over all properties in the old configuration file and search for deleted properties
         foreach ($oldconfig as $key => $value) {
+            if ($newconfig->get($key) === null) {
                 $nextParents = array_merge($parents, array($key));
-            $newvalue = $newconfig->get($key);
                 $keyIdentifier = empty($parents) ? array($key) : array_slice($nextParents, 1, null, true);
+                foreach ($this->getPropertyIdentifiers($value, $keyIdentifier) as $propertyIdentifier) {
+                    $editor->reset($propertyIdentifier, $section);
+                }
+            }
+        }
+    }
+
+    /**
+     * Return all possible combinations of property identifiers for the given value
+     *
+     * @param   mixed   $value  The value to return all combinations for
+     * @param   array   $key    The root property identifier, if any
+     *
+     * @return  array           All property combinations that are possible
+     *
+     * @todo                    Cannot handle array properties yet (e.g. a.b[]='c')
+     */
+    protected function getPropertyIdentifiers($value, array $key = null)
+    {
+        $combinations = array();
+        $rootProperty = $key !== null ? $key : array();
 
-            if ($newvalue === null) {
         if ($value instanceof Zend_Config) {
-                    // The deleted value is a nested Zend_Config, handle it recursively
+            foreach ($value as $subProperty => $subValue) {
-                    $this->diffConfigs($value, new Zend_Config(array()), $editor, $nextParents);
+                $combinations = array_merge(
-                    if ($section === null) {
+                    $combinations,
-                        $editor->removeSection($key);
+                    $this->getPropertyIdentifiers($subValue, array_merge($rootProperty, array($subProperty)))
-                    }
+                );
-                } else {
-                    // The deleted value is a plain value, use the editor to delete it
-                    if (is_numeric($key)) {
-                        $editor->resetArrayElement($keyIdentifier, $section);
-                    } elseif (!empty($parents)) {
-                        // Drop nested properties, fixes #5958
-                        $editor->resetArrayElement($nextParents, $section);
-                    } else {
-                        $editor->reset($keyIdentifier, $section);
-                    }
-                }
-            }
             }
+        } elseif (is_string($value)) {
+            $combinations[] = $rootProperty;
+        }
+
+        return $combinations;
     }
 }

library/Icinga/Logger/Writer/SyslogWriter.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -107,4 +106,3 @@ class SyslogWriter extends LogWriter
         closelog();
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/User/Message.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\User;
 
@@ -56,4 +55,3 @@ class Message
         return $this->level;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Controller/ActionController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -477,4 +476,3 @@ class ActionController extends Zend_Controller_Action
         return parent::__call($name, $params);
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Controller/BaseConfigController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -85,4 +84,3 @@ class BaseConfigController extends ActionController
         return array();
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Controller/BasePreferenceController.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -92,4 +91,3 @@ class BasePreferenceController extends ActionController
         $store->save($currentPreferences);
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Controller/ControllerTabCollector.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -123,4 +122,3 @@ class ControllerTabCollector
         return array();
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Form/Decorator/BootstrapForm.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -104,4 +103,3 @@ class BootstrapForm extends Zend_Form_Decorator_Abstract
                . '</div>';
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Form/Decorator/ConditionalHidden.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -60,4 +59,3 @@ class ConditionalHidden extends Zend_Form_Decorator_Abstract
         return $content;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Form/Decorator/HelpText.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -61,4 +60,3 @@ class HelpText extends Zend_Form_Decorator_Abstract
         return $content;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Form/Validator/DateFormatValidator.php

@@ -61,11 +61,9 @@ class DateFormatValidator extends Zend_Validate_Abstract
      *
      * @see Zend_Validate_Abstract::$_messageTemplates
      */
-    // @codingStandardsIgnoreStart
     protected $_messageTemplates = array(
         'INVALID_CHARACTERS' => 'Invalid date format'
     );
-    // @codingStandardsIgnoreEnd
 
     /**
      * Validate the input value

library/Icinga/Web/Form/Validator/DateTimeValidator.php

@@ -60,9 +60,7 @@ class DateTimeValidator extends Zend_Validate_Abstract
      *
      * @see Zend_Validate_Abstract::$_messageTemplates
      */
-    // @codingStandardsIgnoreStart
     protected $_messageTemplates = array();
-    // @codingStandardsIgnoreEnd
 
     /**
      * Create this validator

library/Icinga/Web/Form/Validator/TimeFormatValidator.php

@@ -58,11 +58,9 @@ class TimeFormatValidator extends Zend_Validate_Abstract
      * @var array
      * @see Zend_Validate_Abstract::$_messageTemplates
      */
-    // @codingStandardsIgnoreStart
     protected $_messageTemplates = array(
         'INVALID_CHARACTERS' => 'Invalid time format'
     );
-    // @codingStandardsIgnoreEnd
 
     /**
      * Validate the input value

library/Icinga/Web/Form/Validator/WritablePathValidator.php

@@ -44,12 +44,10 @@ class WritablePathValidator extends Zend_Validate_Abstract
      *
      * @see Zend_Validate_Abstract::$_messageTemplates‚
      */
-    // @codingStandardsIgnoreStart
     protected $_messageTemplates = array(
         'NOT_WRITABLE'      =>  'Path is not writable',
         'DOES_NOT_EXIST'    =>  'Path does not exist'
     );
-    // @codingStandardsIgnoreEnd
 
     /**
      * When true, the file or directory must exist

library/Icinga/Web/Hook/Grapher.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -113,4 +112,3 @@ class Grapher
         throw new Exception('This backend has no images');
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Hook/Ticket.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 /**
  * Icinga Web Ticket Hook
@@ -43,4 +42,3 @@ abstract class Ticket
     abstract public function createLink($match);
 
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/JavaScript.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Web;
 
@@ -94,4 +93,3 @@ class JavaScript
         echo $out;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/LessCompiler.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -195,4 +194,3 @@ class LessCompiler
         }
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php

@@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -105,5 +103,3 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
         return $range;
     }
 }
-
-// @codingStandardsIgnoreEnd

library/Icinga/Web/Request.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -65,4 +64,3 @@ class Request extends Zend_Controller_Request_Http
         return $this->user;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Session.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -79,4 +78,3 @@ class Session
         return self::$session;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/StyleSheet.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Web;
 
@@ -69,4 +68,3 @@ class StyleSheet
 
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/View.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -172,7 +171,6 @@ class View extends Zend_View_Abstract
         }
     }
 
-    // @codingStandardsIgnoreStart
     /**
      * Use to include the view script in a scope that only allows public
      * members.
@@ -193,7 +191,6 @@ class View extends Zend_View_Abstract
             include func_get_arg(0);
         }
     }
-    // @codingStandardsIgnoreEnd
 
     /**
      * Accesses a helper object from within a script
@@ -212,4 +209,3 @@ class View extends Zend_View_Abstract
         }
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/View/helpers/format.php

@@ -11,7 +11,7 @@ $this->addHelperFunction('format', function () {
 
 $this->addHelperFunction('timeSince', function ($timestamp) {
     return sprintf(
-        '<span class="timeuntil" title="%s">%s</span>',
+        '<span class="timesince" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
         Format::timeSince($timestamp)
     );
@@ -19,7 +19,7 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
 
 $this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) {
     return sprintf(
-        '<span class="timeuntil" title="%s">%s</span>',
+        '<span class="timesince" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
         Format::prefixedTimeSince($timestamp, $ucfirst)
     );

library/Icinga/Web/Widget.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 /**
  * Web widget class
@@ -51,4 +50,3 @@ class Widget
         return $widget;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/AbstractWidget.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Web\Widget;
 
@@ -122,4 +121,3 @@ abstract class AbstractWidget
         return (string) $html;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/AlertMessageBox.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 
 namespace Icinga\Web\Widget;
 
@@ -129,4 +128,3 @@ class AlertMessageBox extends AbstractWidget
         return $html;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/Chart/HistoryColorGrid.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -344,4 +343,3 @@ class HistoryColorGrid extends AbstractWidget {
         return $this->renderVertical($grid);
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/Chart/InlinePie.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -426,4 +425,3 @@ EOD;
         }
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/SortBox.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -164,4 +163,3 @@ class SortBox extends AbstractWidget
         return $form;
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/Tabextension/BasketAction.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -59,4 +58,3 @@ class BasketAction implements Tabextension
         );
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/Tabextension/DashboardAction.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -60,4 +59,3 @@ class DashboardAction implements Tabextension
         );
     }
 }
-// @codeCoverageIgnoreEnd

library/Icinga/Web/Widget/Tabextension/OutputFormat.php

@@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -125,4 +124,3 @@ class OutputFormat implements Tabextension
         }
     }
 }
-// @codeCoverageIgnoreEnd

modules/doc/application/controllers/IndexController.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -34,4 +33,3 @@ class Doc_IndexController extends DocController
         $this->populateView();
     }
 }
-// @codingStandardsIgnoreEnd

modules/doc/application/controllers/ModuleController.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -44,4 +43,3 @@ class Doc_ModuleController extends DocController
         $this->_helper->redirector->gotoSimpleAndExit('view', null, null, array('name' => $moduleName));
     }
 }
-// @codingStandardsIgnoreEnd

modules/monitoring/application/controllers/CommandController.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -1118,4 +1117,3 @@ class Monitoring_CommandController extends Controller
         }
     }
 }
-// @codingStandardsIgnoreStop

modules/monitoring/application/controllers/ConfigController.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -285,4 +284,3 @@ class Monitoring_ConfigController extends ModuleActionController
         return $instanceCfg && $instanceCfg->get($instance);
     }
 }
-// @codingStandardsIgnoreEnd

modules/monitoring/application/controllers/ProcessController.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -103,5 +102,3 @@ class Monitoring_ProcessController extends MonitoringController
             ->getQuery()->fetchAll();
     }
 }
-
-// @codingStandardsIgnoreStop

modules/monitoring/application/controllers/ShowController.php

@@ -27,7 +27,6 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-// @codingStandardsIgnoreStart
 use Icinga\Application\Benchmark;
 use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabs;
@@ -190,4 +189,3 @@ class Monitoring_ShowController extends Controller
             ->extend(new DashboardAction());
     }
 }
-// @codingStandardsIgnoreEnd

modules/monitoring/application/views/helpers/CheckPerformance.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -75,4 +74,3 @@ class Zend_View_Helper_CheckPerformance extends Zend_View_Helper_Abstract
         return $out;
     }
 }
-// @codingStandardsIgnoreStop

modules/monitoring/application/views/helpers/CommandForm.php

@@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -204,5 +202,3 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
         return $out;
     }
 }
-
-// @codingStandardsIgnoreStop

modules/monitoring/application/views/helpers/MonitoringProperties.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -308,4 +307,3 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract
         return $type;
     }
 }
-// @codingStandardsIgnoreStop

modules/monitoring/application/views/helpers/RuntimeVariables.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -63,4 +62,3 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
         return $out;
     }
 }
-// @codingStandardsIgnoreStop

modules/monitoring/application/views/scripts/list/comments.phtml

@@ -13,6 +13,10 @@
 
 $cf = $this->getHelper('CommandForm');
 
+if (count($comments) === 0) {
+    echo t('No comments matching the filter');
+}
+
 foreach ($comments as $comment):
 
 ?>

modules/monitoring/application/views/scripts/list/contactgroups.phtml

@@ -5,6 +5,13 @@
 <?php endif ?>
 <div class="content">
     <div class="boxview" data-base-target="_next">
+
+<?php
+if (count($groupData) === 0) {
+    echo t('No contacts matching the filter');
+}
+?>
+
 <?php foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>

modules/monitoring/application/views/scripts/list/contacts.phtml

@@ -27,6 +27,11 @@ $contactHelper = $this->getHelper('ContactFlags');
 
     <table class="table table-condensed pull-left">
         <tbody>
+            <?php
+            if (count($contacts) === 0) {
+                echo t('No contacts matching the filter');
+            }
+            ?>
             <?php foreach($contacts as $contact): ?>
                 <?php $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
                 <tr>

modules/monitoring/application/views/scripts/list/downtimes.phtml

@@ -12,6 +12,11 @@ $helper = $this->getHelper('CommandForm');
 <div class="content downtimes">
 <table data-base-target="_next" class="action">
 <tbody>
+<?php
+if (count($downtimes) === 0) {
+    echo t('No downtimes matching the filter');
+}
+?>
 <?php foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>

modules/monitoring/application/views/scripts/list/eventhistory.phtml

@@ -14,6 +14,11 @@
 
 <table data-base-target="_next" class="action">
   <tbody>
+  <?php
+  if (count($history) === 0) {
+      echo t('No history events matching the filter');
+  }
+  ?>
   <?php foreach ($history as $event): ?>
       <?php
           $class = null;

modules/monitoring/application/views/scripts/list/hostgroups.phtml

@@ -5,6 +5,12 @@
 <?php endif ?>
 <div class="content">
     <div class="boxview" data-base-target="_next">
+
+<?php
+if (count($hostgroups) === 0) {
+    echo t('No host groups matching the filter');
+}
+?>
 <?php foreach($hostgroups as $h): ?>
         <div class="box hostgroup">
             <h2>

modules/monitoring/application/views/scripts/list/hosts.phtml

@@ -20,14 +20,13 @@ if (! $this->compact): ?>
 <?php
 endif;
 
-if ($hosts->count() === 0): ?>
+if ($hosts->count() === 0) {
-        <?= $this->translate('No host found') ?>
+    echo t('No hosts matching the filter');
-        <?php if (! $this->compact): ?>
+    if (! $this->compact) {
-    </div>
+        echo '</div>';
-<?php
+    }
-endif;
     return;
-endif;
+}
 ?>
 
 <table

modules/monitoring/application/views/scripts/list/notifications.phtml

@@ -22,6 +22,9 @@ if (empty($this->notifications)) {
 <tbody>
 <?php
 
+if (count($notifications) === 0) {
+    echo t('No notifications matching the filter');
+}
 foreach ($notifications as $notification):
 
   if (isset($notification->service)) {

modules/monitoring/application/views/scripts/list/servicegroups.phtml

@@ -5,6 +5,12 @@
 <?php endif ?>
 <div class="content">
     <div class="boxview" data-base-target="_next">
+
+<?php
+if (count($servicegroups) === 0) {
+    echo t('No service groups matching the filter');
+}
+?>
 <?php foreach($servicegroups as $servicegroup): ?>
         <div class="box servicegroup">
             <h2>

modules/monitoring/application/views/scripts/list/servicematrix.phtml

@@ -23,7 +23,7 @@ $hostFilter = '(' . implode('|', array_keys($pivotData)) . ')';
 ?>
 
 <?php if (count($pivotData) === 0): ?>
-    <?= $this->translate('No Service Found'); ?>
+    <?= $this->translate('No Services matching the filter'); ?>
 <?php endif ?>
 
 <?php foreach ($pivotData as $host_name => $serviceStates): ?>

modules/monitoring/application/views/scripts/list/services.phtml

@@ -29,6 +29,9 @@ if (!$this->compact): ?>
   <tbody>
 <?php
 
+if (count($services) === 0) {
+    echo t('No services matching the filter');
+}
 foreach ($services as $service):
     $serviceLink = $this->href(
       'monitoring/show/service',

modules/monitoring/application/views/scripts/list/statehistorysummary.phtml

@@ -7,6 +7,10 @@
 
 $grid->setColor('#FC0707');
 $data = array();
+
+if (count($summary) === 0) {
+    echo t('No history entry matching the filter');
+}
 foreach ($summary as $entry) {
     $day = $entry->day;
     $value = $entry->cnt_critical;

modules/monitoring/application/views/scripts/multi/host.phtml

@@ -9,8 +9,10 @@ $this->target = array('host'	=> $this->hostquery);
 </div>
 
 <div class="content">
+    <?php if (count($objects) === 0): ?>
+         <?= t('No hosts matching the filter'); ?>
+    <?php else: ?>
     <h1> Summary for <?= count($objects) ?> hosts </h1>
-
     <?= $this->render('multi/components/objectlist.phtml'); ?>
     <table class="avp">
         <tr>
@@ -47,6 +49,7 @@ $this->target = array('host'	=> $this->hostquery);
         </table>
 
     <?= $this->render('multi/components/flags.phtml') ?>
+    <?php endif ?>
 </div>
 
 <a

modules/monitoring/application/views/scripts/multi/service.phtml

@@ -13,6 +13,9 @@ $this->target = array(
 </div>
 
 <div class="content">
+  <?php if (count($objects) === 0): ?>
+      <?= t('No services matching the filter'); ?>
+  <?php else: ?>
   <h1> Summary for <?= count($objects) ?> services </h1>
 
   <table style="width: 100%; font-size: 0.8em;">
@@ -54,4 +57,5 @@ $this->target = array(
   </table>
 
   <?= $this->render('multi/components/flags.phtml') ?>
+  <?php endif ?>
 </div>

modules/monitoring/application/views/scripts/show/host.phtml

@@ -1,3 +1,4 @@
+<?php if ($object->host_name !== false): ?>
     <div class="controls">
     <?= $this->render('show/components/header.phtml') ?>
     <h1><?= $this->translate("This host's current state") ?></h1>
@@ -25,3 +26,6 @@
      </tbody>
     </table>
     </div>
+<?php else: ?>
+    <p> Host not found </p>
+<?php endif ?>

modules/monitoring/application/views/scripts/show/service.phtml

@@ -1,3 +1,4 @@
+<?php if ($object->host_name !== false): ?>
     <div class="controls">
     <?= $this->render('show/components/header.phtml') ?>
     <h1><?= $this->translate("This service's current state") ?></h1>
@@ -25,3 +26,6 @@
      </tbody>
     </table>
     </div>
+<?php else: ?>
+    <p> Service not found </p>
+<?php endif ?>

modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -103,5 +102,3 @@ class GroupSummaryQuery extends IdoQuery
         );
     }
 }
-// @codingStandardsIgnoreStop
-

modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -538,4 +537,3 @@ class StatusQuery extends IdoQuery
         );
     }
 }
-// @codingStandardsIgnoreStop

modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php

@@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
  * This file is part of Icinga Web 2.
@@ -186,4 +185,3 @@ class StatusSummaryQuery extends IdoQuery
         );
     }
 }
-// @codingStandardsIgnoreStop