From ec2d1daa6b72b87959af9e66ef7e95820e1dfb38 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 11 Jul 2014 16:31:00 +0200
Subject: [PATCH 01/43] Perfdata plugin should also have a knowledge about
 labels

Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.

refs #6515
---
 .../application/clicommands/ListCommand.php   |   4 +-
 .../application/views/helpers/Perfdata.php    |  12 +-
 .../library/Monitoring/Plugin/Perfdata.php    |  60 +++++---
 .../library/Monitoring/Plugin/PerfdataSet.php |   2 +-
 .../Monitoring/Plugin/PerfdataSetTest.php     |  40 +++---
 .../Monitoring/Plugin/PerfdataTest.php        | 135 ++++++++++++------
 6 files changed, 161 insertions(+), 92 deletions(-)

diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 2548c138e..320e144d7 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -263,13 +263,13 @@ class ListCommand extends Command
             try {
                 $pset = PerfdataSet::fromString($row->service_perfdata);
                 $perfs = array();
-                foreach ($pset as $perfName => $p) {
+                foreach ($pset as $p) {
                     if ($percent = $p->getPercentage()) {
                         if ($percent < 0 || $percent > 100) {
                             continue;
                         }
                         $perfs[] = ' '
-                                 . $perfName
+                                 . $p->getLabel()
                                  . ': '
                                  . $this->getPercentageSign($percent)
                                  . '  '
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index a9ede94fd..68b9b1e9e 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -14,11 +14,11 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $result = '';
         $table = array();
         $pset = array_slice(PerfdataSet::fromString($perfdataStr)->asArray(), 0, ($compact ? 5 : null));
-        foreach ($pset as $label => $perfdata) {
+        foreach ($pset as $perfdata) {
             if (!$perfdata->isPercentage() && $perfdata->getMaximumValue() === null) {
                 continue;
             }
-            $pieChart = $this->createInlinePie($perfdata, $label, htmlspecialchars($label));
+            $pieChart = $this->createInlinePie($perfdata);
             if ($compact) {
                 if (! $float) {
                     $result .= $pieChart->render();
@@ -31,7 +31,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 }
                 $pieChart->setStyle('margin: 0.2em 0.5em 0.2em 0.5em;');
                 $table[] = '<tr><th>' . $pieChart->render()
-                    . htmlspecialchars($label)
+                    . htmlspecialchars($perfdata->getLabel())
                     . '</th><td> '
                     . htmlspecialchars($this->formatPerfdataValue($perfdata)) .
                     ' </td></tr>';
@@ -81,10 +81,10 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         return $perfdata->getValue();
     }
 
-    protected function createInlinePie(Perfdata $perfdata, $title, $label = '')
+    protected function createInlinePie(Perfdata $perfdata)
     {
-        $pieChart = new InlinePie($this->calculatePieChartData($perfdata), $title);
-        $pieChart->setLabel($label);
+        $pieChart = new InlinePie($this->calculatePieChartData($perfdata), $perfdata->getLabel());
+        $pieChart->setLabel(htmlspecialchars($perfdata->getLabel()));
         $pieChart->setHideEmptyLabel();
 
         //$pieChart->setHeight(32)->setWidth(32);
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index a23c60392..44d3765b8 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -4,7 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Plugin;
 
-use Icinga\Exception\ProgrammingError;
+use InvalidArgumentException;
 
 class Perfdata
 {
@@ -22,6 +22,13 @@ class Perfdata
      */
     protected $unit;
 
+    /**
+     * The label
+     *
+     * @var string
+     */
+    protected $label;
+
     /**
      * The value
      *
@@ -58,13 +65,15 @@ class Perfdata
     protected $criticalThreshold;
 
     /**
-     * Create a new Perfdata object based on the given performance data value
+     * Create a new Perfdata object based on the given performance data label and value
      *
-     * @param   string      $perfdataValue      The value to parse
+     * @param   string      $label      The perfdata label
+     * @param   string      $value      The perfdata value
      */
-    protected function __construct($perfdataValue)
+    public function __construct($label, $value)
     {
-        $this->perfdataValue = $perfdataValue;
+        $this->perfdataValue = $value;
+        $this->label = $label;
         $this->parse();
 
         if ($this->unit === '%') {
@@ -78,25 +87,30 @@ class Perfdata
     }
 
     /**
-     * Return a new Perfdata object based on the given performance data value
+     * Return a new Perfdata object based on the given performance data key=value pair
      *
-     * @param   string      $perfdataValue      The value to parse
+     * @param   string      $perfdata       The key=value pair to parse
      *
      * @return  Perfdata
      *
-     * @throws  ProgrammingError                In case the given performance data value has no content
+     * @throws  InvalidArgumentException    In case the given performance data has no content or a invalid format
      */
-    public static function fromString($perfdataValue)
+    public static function fromString($perfdata)
     {
-        if (empty($perfdataValue)) {
-            throw new ProgrammingError('Perfdata::fromString expects a string with content');
+        if (empty($perfdata)) {
+            throw new InvalidArgumentException('Perfdata::fromString expects a string with content');
+        } elseif (false === strpos($perfdata, '=')) {
+            throw new InvalidArgumentException(
+                'Perfdata::fromString expects a key=value formatted string. Got "' . $perfdata . '" instead'
+            );
         }
 
-        return new static($perfdataValue);
+        list($label, $value) = explode('=', $perfdata, 2);
+        return new static(trim($label), trim($value));
     }
 
     /**
-     * Return whether this performance data value is a number
+     * Return whether this performance data's value is a number
      *
      * @return  bool    True in case it's a number, otherwise False
      */
@@ -106,7 +120,7 @@ class Perfdata
     }
 
     /**
-     * Return whether this performance data value are seconds
+     * Return whether this performance data's value are seconds
      *
      * @return  bool    True in case it's seconds, otherwise False
      */
@@ -116,7 +130,7 @@ class Perfdata
     }
 
     /**
-     * Return whether this performance data value is in percentage
+     * Return whether this performance data's value is in percentage
      *
      * @return  bool    True in case it's in percentage, otherwise False
      */
@@ -126,7 +140,7 @@ class Perfdata
     }
 
     /**
-     * Return whether this performance data value is in bytes
+     * Return whether this performance data's value is in bytes
      *
      * @return  bool    True in case it's in bytes, otherwise False
      */
@@ -136,7 +150,7 @@ class Perfdata
     }
 
     /**
-     * Return whether this performance data value is a counter
+     * Return whether this performance data's value is a counter
      *
      * @return  bool    True in case it's a counter, otherwise False
      */
@@ -145,6 +159,14 @@ class Perfdata
         return $this->unit === 'c';
     }
 
+    /**
+     * Return this perfomance data's label
+     */
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
     /**
      * Return the value or null if it is unknown (U)
      *
@@ -176,7 +198,7 @@ class Perfdata
     }
 
     /**
-     * Return this value's warning treshold or null if it is not available
+     * Return this performance data's warning treshold or null if it is not available
      *
      * @return  null|string
      */
@@ -186,7 +208,7 @@ class Perfdata
     }
 
     /**
-     * Return this value's critical treshold or null if it is not available
+     * Return this performance data's critical treshold or null if it is not available
      *
      * @return  null|string
      */
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index 8038354a4..c62904bb3 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -85,7 +85,7 @@ class PerfdataSet implements IteratorAggregate
             $value = trim($this->readUntil(' '));
 
             if ($label && $value) {
-                $this->perfdata[$label] = Perfdata::fromString($value);
+                $this->perfdata[] = new Perfdata($label, $value);
             }
         }
     }
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
index 86c0f71a7..3edd20857 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
@@ -17,19 +17,19 @@ class PerfdataSetTest extends BaseTestCase
     public function testWhetherValidSimplePerfdataLabelsAreProperlyParsed()
     {
         $pset = PerfdataSetWithPublicData::fromString('key1=val1   key2=val2 key3  =val3');
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key1',
-            $pset->perfdata,
+            $pset->perfdata[0]->getLabel(),
             'PerfdataSet does not correctly parse valid simple labels'
         );
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key2',
-            $pset->perfdata,
+            $pset->perfdata[1]->getLabel(),
             'PerfdataSet does not correctly parse valid simple labels'
         );
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key3',
-            $pset->perfdata,
+            $pset->perfdata[2]->getLabel(),
             'PerfdataSet does not correctly parse valid simple labels'
         );
     }
@@ -37,14 +37,14 @@ class PerfdataSetTest extends BaseTestCase
     public function testWhetherNonQuotedPerfdataLablesWithSpacesAreProperlyParsed()
     {
         $pset = PerfdataSetWithPublicData::fromString('key 1=val1 key 1 + 1=val2');
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 1',
-            $pset->perfdata,
+            $pset->perfdata[0]->getLabel(),
             'PerfdataSet does not correctly parse non quoted labels with spaces'
         );
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 1 + 1',
-            $pset->perfdata,
+            $pset->perfdata[1]->getLabel(),
             'PerfdataSet does not correctly parse non quoted labels with spaces'
         );
     }
@@ -52,14 +52,14 @@ class PerfdataSetTest extends BaseTestCase
     public function testWhetherValidQuotedPerfdataLabelsAreProperlyParsed()
     {
         $pset = PerfdataSetWithPublicData::fromString('\'key 1\'=val1 "key 2"=val2');
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 1',
-            $pset->perfdata,
+            $pset->perfdata[0]->getLabel(),
             'PerfdataSet does not correctly parse valid quoted labels'
         );
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 2',
-            $pset->perfdata,
+            $pset->perfdata[1]->getLabel(),
             'PerfdataSet does not correctly parse valid quoted labels'
         );
     }
@@ -67,14 +67,14 @@ class PerfdataSetTest extends BaseTestCase
     public function testWhetherInvalidQuotedPerfdataLabelsAreProperlyParsed()
     {
         $pset = PerfdataSetWithPublicData::fromString('\'key 1=val1 key 2"=val2');
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 1',
-            $pset->perfdata,
+            $pset->perfdata[0]->getLabel(),
             'PerfdataSet does not correctly parse invalid quoted labels'
         );
-        $this->assertArrayHasKey(
+        $this->assertEquals(
             'key 2"',
-            $pset->perfdata,
+            $pset->perfdata[1]->getLabel(),
             'PerfdataSet does not correctly parse invalid quoted labels'
         );
     }
@@ -85,8 +85,8 @@ class PerfdataSetTest extends BaseTestCase
     public function testWhetherAPerfdataSetIsIterable()
     {
         $pset = PerfdataSet::fromString('key=value');
-        foreach ($pset as $label => $value) {
-            $this->assertEquals('key', $label);
+        foreach ($pset as $p) {
+            $this->assertEquals('key', $p->getLabel());
             return;
         }
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
index be1de875e..2d8a98b73 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
@@ -10,142 +10,189 @@ use Icinga\Module\Monitoring\Plugin\Perfdata;
 class PerfdataTest extends BaseTestCase
 {
     /**
-     * @expectedException   Icinga\Exception\ProgrammingError
+     * @expectedException   \InvalidArgumentException
      */
     public function testWhetherFromStringThrowsExceptionWhenGivenAnEmptyString()
     {
         Perfdata::fromString('');
     }
 
+    /**
+     * @expectedException   \InvalidArgumentException
+     */
+    public function testWhetherFromStringThrowsExceptionWhenGivenAnInvalidString()
+    {
+        Perfdata::fromString('test');
+    }
+
+    public function testWhetherFromStringParsesAGivenStringCorrectly()
+    {
+        $p = Perfdata::fromString('key=1234');
+        $this->assertEquals(
+            'key',
+            $p->getLabel(),
+            'Perfdata::fromString does not properly parse performance data labels'
+        );
+        $this->assertEquals(
+            1234,
+            $p->getValue(),
+            'Perfdata::fromString does not properly parse performance data values'
+        );
+    }
+
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetValueReturnsValidValues()
     {
         $this->assertEquals(
             1337.0,
-            Perfdata::fromString('1337')->getValue(),
+            Perfdata::fromString('test=1337')->getValue(),
             'Perfdata::getValue does not return correct values'
         );
         $this->assertEquals(
             1337.0,
-            Perfdata::fromString('1337;;;;')->getValue(),
+            Perfdata::fromString('test=1337;;;;')->getValue(),
             'Perfdata::getValue does not return correct values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherDecimalValuesAreCorrectlyParsed()
     {
         $this->assertEquals(
             1337.5,
-            Perfdata::fromString('1337.5')->getValue(),
+            Perfdata::fromString('test=1337.5')->getValue(),
             'Perfdata objects do not parse decimal values correctly'
         );
         $this->assertEquals(
             1337.5,
-            Perfdata::fromString('1337.5B')->getValue(),
+            Perfdata::fromString('test=1337.5B')->getValue(),
             'Perfdata objects do not parse decimal values correctly'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetValueReturnsNullForInvalidOrUnknownValues()
     {
         $this->assertNull(
-            Perfdata::fromString('U')->getValue(),
+            Perfdata::fromString('test=U')->getValue(),
             'Perfdata::getValue does not return null for unknown values'
         );
         $this->assertNull(
-            Perfdata::fromString('i am not a value')->getValue(),
+            Perfdata::fromString('test=i am not a value')->getValue(),
             'Perfdata::getValue does not return null for invalid values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetWarningTresholdReturnsCorrectValues()
     {
         $this->assertEquals(
             '10',
-            Perfdata::fromString('1;10')->getWarningThreshold(),
+            Perfdata::fromString('test=1;10')->getWarningThreshold(),
             'Perfdata::getWarningTreshold does not return correct values'
         );
         $this->assertEquals(
             '10:',
-            Perfdata::fromString('1;10:')->getWarningThreshold(),
+            Perfdata::fromString('test=1;10:')->getWarningThreshold(),
             'Perfdata::getWarningTreshold does not return correct values'
         );
         $this->assertEquals(
             '~:10',
-            Perfdata::fromString('1;~:10')->getWarningThreshold(),
+            Perfdata::fromString('test=1;~:10')->getWarningThreshold(),
             'Perfdata::getWarningTreshold does not return correct values'
         );
         $this->assertEquals(
             '10:20',
-            Perfdata::fromString('1;10:20')->getWarningThreshold(),
+            Perfdata::fromString('test=1;10:20')->getWarningThreshold(),
             'Perfdata::getWarningTreshold does not return correct values'
         );
         $this->assertEquals(
             '@10:20',
-            Perfdata::fromString('1;@10:20')->getWarningThreshold(),
+            Perfdata::fromString('test=1;@10:20')->getWarningThreshold(),
             'Perfdata::getWarningTreshold does not return correct values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetCriticalTresholdReturnsCorrectValues()
     {
         $this->assertEquals(
             '10',
-            Perfdata::fromString('1;;10')->getCriticalThreshold(),
+            Perfdata::fromString('test=1;;10')->getCriticalThreshold(),
             'Perfdata::getCriticalTreshold does not return correct values'
         );
         $this->assertEquals(
             '10:',
-            Perfdata::fromString('1;;10:')->getCriticalThreshold(),
+            Perfdata::fromString('test=1;;10:')->getCriticalThreshold(),
             'Perfdata::getCriticalTreshold does not return correct values'
         );
         $this->assertEquals(
             '~:10',
-            Perfdata::fromString('1;;~:10')->getCriticalThreshold(),
+            Perfdata::fromString('test=1;;~:10')->getCriticalThreshold(),
             'Perfdata::getCriticalTreshold does not return correct values'
         );
         $this->assertEquals(
             '10:20',
-            Perfdata::fromString('1;;10:20')->getCriticalThreshold(),
+            Perfdata::fromString('test=1;;10:20')->getCriticalThreshold(),
             'Perfdata::getCriticalTreshold does not return correct values'
         );
         $this->assertEquals(
             '@10:20',
-            Perfdata::fromString('1;;@10:20')->getCriticalThreshold(),
+            Perfdata::fromString('test=1;;@10:20')->getCriticalThreshold(),
             'Perfdata::getCriticalTreshold does not return correct values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetMinimumValueReturnsCorrectValues()
     {
         $this->assertEquals(
             1337.0,
-            Perfdata::fromString('1;;;1337')->getMinimumValue(),
+            Perfdata::fromString('test=1;;;1337')->getMinimumValue(),
             'Perfdata::getMinimumValue does not return correct values'
         );
         $this->assertEquals(
             1337.5,
-            Perfdata::fromString('1;;;1337.5')->getMinimumValue(),
+            Perfdata::fromString('test=1;;;1337.5')->getMinimumValue(),
             'Perfdata::getMinimumValue does not return correct values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherGetMaximumValueReturnsCorrectValues()
     {
         $this->assertEquals(
             1337.0,
-            Perfdata::fromString('1;;;;1337')->getMaximumValue(),
+            Perfdata::fromString('test=1;;;;1337')->getMaximumValue(),
             'Perfdata::getMaximumValue does not return correct values'
         );
         $this->assertEquals(
             1337.5,
-            Perfdata::fromString('1;;;;1337.5')->getMaximumValue(),
+            Perfdata::fromString('test=1;;;;1337.5')->getMaximumValue(),
             'Perfdata::getMaximumValue does not return correct values'
         );
     }
 
+    /**
+     * @depends testWhetherFromStringParsesAGivenStringCorrectly
+     */
     public function testWhetherMissingValuesAreReturnedAsNull()
     {
-        $perfdata = Perfdata::fromString('1;;3;5');
+        $perfdata = Perfdata::fromString('test=1;;3;5');
         $this->assertNull(
             $perfdata->getWarningThreshold(),
             'Perfdata objects do not return null for missing warning tresholds'
@@ -162,7 +209,7 @@ class PerfdataTest extends BaseTestCase
     public function testWhetherValuesAreIdentifiedAsNumber()
     {
         $this->assertTrue(
-            Perfdata::fromString('666')->isNumber(),
+            Perfdata::fromString('test=666')->isNumber(),
             'Perfdata objects do not identify ordinary digits as number'
         );
     }
@@ -173,15 +220,15 @@ class PerfdataTest extends BaseTestCase
     public function testWhetherValuesAreIdentifiedAsSeconds()
     {
         $this->assertTrue(
-            Perfdata::fromString('666s')->isSeconds(),
+            Perfdata::fromString('test=666s')->isSeconds(),
             'Perfdata objects do not identify seconds as seconds'
         );
         $this->assertTrue(
-            Perfdata::fromString('666us')->isSeconds(),
+            Perfdata::fromString('test=666us')->isSeconds(),
             'Perfdata objects do not identify microseconds as seconds'
         );
         $this->assertTrue(
-            Perfdata::fromString('666ms')->isSeconds(),
+            Perfdata::fromString('test=666ms')->isSeconds(),
             'Perfdata objects do not identify milliseconds as seconds'
         );
     }
@@ -192,7 +239,7 @@ class PerfdataTest extends BaseTestCase
     public function testWhetherValuesAreIdentifiedAsPercentage()
     {
         $this->assertTrue(
-            Perfdata::fromString('66%')->isPercentage(),
+            Perfdata::fromString('test=66%')->isPercentage(),
             'Perfdata objects do not identify percentages as percentages'
         );
     }
@@ -202,7 +249,7 @@ class PerfdataTest extends BaseTestCase
      */
     public function testWhetherMinAndMaxAreNotRequiredIfUnitIsInPercent()
     {
-        $perfdata = Perfdata::fromString('1%');
+        $perfdata = Perfdata::fromString('test=1%');
         $this->assertEquals(
             0.0,
             $perfdata->getMinimumValue(),
@@ -221,23 +268,23 @@ class PerfdataTest extends BaseTestCase
     public function testWhetherValuesAreIdentifiedAsBytes()
     {
         $this->assertTrue(
-            Perfdata::fromString('66666B')->isBytes(),
+            Perfdata::fromString('test=66666B')->isBytes(),
             'Perfdata objects do not identify bytes as bytes'
         );
         $this->assertTrue(
-            Perfdata::fromString('6666KB')->isBytes(),
+            Perfdata::fromString('test=6666KB')->isBytes(),
             'Perfdata objects do not identify kilobytes as bytes'
         );
         $this->assertTrue(
-            Perfdata::fromString('666MB')->isBytes(),
+            Perfdata::fromString('test=666MB')->isBytes(),
             'Perfdata objects do not identify megabytes as bytes'
         );
         $this->assertTrue(
-            Perfdata::fromString('66GB')->isBytes(),
+            Perfdata::fromString('test=66GB')->isBytes(),
             'Perfdata objects do not identify gigabytes as bytes'
         );
         $this->assertTrue(
-            Perfdata::fromString('6TB')->isBytes(),
+            Perfdata::fromString('test=6TB')->isBytes(),
             'Perfdata objects do not identify terabytes as bytes'
         );
     }
@@ -248,7 +295,7 @@ class PerfdataTest extends BaseTestCase
     public function testWhetherValuesAreIdentifiedAsCounter()
     {
         $this->assertTrue(
-            Perfdata::fromString('123c')->isCounter(),
+            Perfdata::fromString('test=123c')->isCounter(),
             'Perfdata objects do not identify counters as counters'
         );
     }
@@ -260,7 +307,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             666 / pow(10, 6),
-            Perfdata::fromString('666us')->getValue(),
+            Perfdata::fromString('test=666us')->getValue(),
             'Perfdata objects do not correctly convert microseconds to seconds'
         );
     }
@@ -272,7 +319,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             666 / pow(10, 3),
-            Perfdata::fromString('666ms')->getValue(),
+            Perfdata::fromString('test=666ms')->getValue(),
             'Perfdata objects do not correctly convert microseconds to seconds'
         );
     }
@@ -284,20 +331,20 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             66.0,
-            Perfdata::fromString('66%')->getPercentage(),
+            Perfdata::fromString('test=66%')->getPercentage(),
             'Perfdata objects do not correctly handle native percentages'
         );
         $this->assertEquals(
             50.0,
-            Perfdata::fromString('0;;;-250;250')->getPercentage(),
+            Perfdata::fromString('test=0;;;-250;250')->getPercentage(),
             'Perfdata objects do not correctly convert suitable values to percentages'
         );
         $this->assertNull(
-            Perfdata::fromString('50')->getPercentage(),
+            Perfdata::fromString('test=50')->getPercentage(),
             'Perfdata objects do return a percentage though their unit is not % and no maximum is given'
         );
         $this->assertNull(
-            Perfdata::fromString('25;;;50;100')->getPercentage(),
+            Perfdata::fromString('test=25;;;50;100')->getPercentage(),
             'Perfdata objects do return a percentage though their value is lower than it\'s allowed minimum'
         );
     }
@@ -309,7 +356,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             6666.0 * pow(2, 10),
-            Perfdata::fromString('6666KB')->getValue(),
+            Perfdata::fromString('test=6666KB')->getValue(),
             'Perfdata objects do not corretly convert kilobytes to bytes'
         );
     }
@@ -321,7 +368,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             666.0 * pow(2, 20),
-            Perfdata::fromString('666MB')->getValue(),
+            Perfdata::fromString('test=666MB')->getValue(),
             'Perfdata objects do not corretly convert megabytes to bytes'
         );
     }
@@ -333,7 +380,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             66.0 * pow(2, 30),
-            Perfdata::fromString('66GB')->getValue(),
+            Perfdata::fromString('test=66GB')->getValue(),
             'Perfdata objects do not corretly convert gigabytes to bytes'
         );
     }
@@ -345,7 +392,7 @@ class PerfdataTest extends BaseTestCase
     {
         $this->assertEquals(
             6.0 * pow(2, 40),
-            Perfdata::fromString('6TB')->getValue(),
+            Perfdata::fromString('test=6TB')->getValue(),
             'Perfdata objects do not corretly convert terabytes to bytes'
         );
     }

From 5908e9fc703b57171187a36ee20ba28a01ac1475 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 11 Jul 2014 16:32:05 +0200
Subject: [PATCH 02/43] Do not show pie charts for perfdata values when no
 percentage is available

refs #6515
---
 modules/monitoring/application/views/helpers/Perfdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 68b9b1e9e..1d5224f1f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -15,7 +15,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $table = array();
         $pset = array_slice(PerfdataSet::fromString($perfdataStr)->asArray(), 0, ($compact ? 5 : null));
         foreach ($pset as $perfdata) {
-            if (!$perfdata->isPercentage() && $perfdata->getMaximumValue() === null) {
+            if ($perfdata->getPercentage() == 0) {
                 continue;
             }
             $pieChart = $this->createInlinePie($perfdata);

From bacea36ad9577d253bb5d505588fd65ff2c38039 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 14 Jul 2014 13:48:30 +0200
Subject: [PATCH 03/43] Improve piechart limitation and show non-piechart
 perfdata as well

The perfdata helper did an improper limitation as it might have skipped
valid values due to applying the limit before the filter. When not in compact
view the helper now also shows non-piechart values by using their raw
representation.

refs #6515
---
 .../application/views/helpers/Perfdata.php    | 23 +++++++++++--------
 .../library/Monitoring/Plugin/Perfdata.php    | 10 ++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 1d5224f1f..f4cffaea7 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -11,13 +11,17 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {
     public function perfdata($perfdataStr, $compact = false, $float = false)
     {
+        $pset = PerfdataSet::fromString($perfdataStr)->asArray();
+        $onlyPieChartData = array_filter($pset, function ($e) { return $e->getPercentage() > 0; });
+        if ($compact) {
+            $onlyPieChartData = array_slice($onlyPieChartData, 0, 5);
+        } else {
+            $nonPieChartData = array_filter($pset, function ($e) { return $e->getPercentage() == 0; });
+        }
+
         $result = '';
         $table = array();
-        $pset = array_slice(PerfdataSet::fromString($perfdataStr)->asArray(), 0, ($compact ? 5 : null));
-        foreach ($pset as $perfdata) {
-            if ($perfdata->getPercentage() == 0) {
-                continue;
-            }
+        foreach ($onlyPieChartData as $perfdata) {
             $pieChart = $this->createInlinePie($perfdata);
             if ($compact) {
                 if (! $float) {
@@ -27,6 +31,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 }
             } else {
                 if (! $perfdata->isPercentage()) {
+                    // TODO: Should we trust sprintf-style placeholders in perfdata titles?
                     $pieChart->setTooltipFormat('{{label}}: {{formatted}} ({{percent}}%)');
                 }
                 $pieChart->setStyle('margin: 0.2em 0.5em 0.2em 0.5em;');
@@ -38,11 +43,11 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             }
         }
 
-        // TODO: What if we have both? And should we trust sprintf-style placeholders in perfdata titles?
-        if (empty($table)) {
-            return $compact ? $result : $perfdataStr;
+        if ($compact) {
+            return $result;
         } else {
-            return '<table class="perfdata">' . implode("\n", $table) . '</table>';
+            $pieCharts = empty($table) ? '' : '<table class="perfdata">' . implode("\n", $table) . '</table>';
+            return $pieCharts . "\n" . implode("<br>\n", $nonPieChartData);
         }
     }
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 44d3765b8..a6eaddabd 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -237,6 +237,16 @@ class Perfdata
         return $this->maxValue;
     }
 
+    /**
+     * Return this performance data as string
+     *
+     * @return  string
+     */
+    public function __toString()
+    {
+        return sprintf(strpos($this->label, ' ') === false ? '%s=%s' : "'%s'=%s", $this->label, $this->perfdataValue);
+    }
+
     /**
      * Parse the current performance data value
      *

From e567ad67c5bc3f2a4162aa7eefbc0c43aad5c91d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 14 Jul 2014 15:26:35 +0200
Subject: [PATCH 04/43] Display statehistory summary vertically

fixes #6636
---
 library/Icinga/Web/Widget/Chart/HistoryColorGrid.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index e463d5e61..0bc262ba8 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -33,7 +33,6 @@ use Icinga\Util\DateTimeFactory;
 use Icinga\Util\Color;
 use Icinga\Web\Widget\AbstractWidget;
 use DateInterval;
-use Zend_View_Abstract;
 
 /**
  * Display a colored grid that visualizes a set of values for each day
@@ -45,7 +44,7 @@ class HistoryColorGrid extends AbstractWidget {
 
     const ORIENTATION_HORIZONTAL = 'horizontal';
 
-    public $orientation = self::ORIENTATION_HORIZONTAL;
+    public $orientation = self::ORIENTATION_VERTICAL;
 
     private $maxValue = 1;
 

From d021ddebee50e5701a0a0ba7ebab3d073984d3eb Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 15 Jul 2014 10:46:13 +0200
Subject: [PATCH 05/43] Make contacts' view work like the downtimes' one

fixes #6513
---
 .../views/scripts/list/contacts.phtml         | 55 ++++++-------------
 1 file changed, 18 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index c2dfcd3ce..4d3ee0a55 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -2,53 +2,34 @@
 $viewHelper = $this->getHelper('MonitoringState');
 $contactHelper = $this->getHelper('ContactFlags');
 ?>
-<div class="row">
-  <div class="pull-left">
-    <h1>Contacts</h1>
-  </div>
-  <div class="pull-right">
-    <?= $this->tabs->render($this); ?>
-  </div>
-</div>
-<div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="none">
-
-    <div class="container pull-left">
-
-        <div class="row">
-          <div class="col-md-12">
-            <?=  $this->sortControl->render($this); ?>
-          </div>
-        </div>
-
-        <div class="row">
-            <?=  $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
-        </div>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div style="margin: 1em">
+        <?=  $this->sortControl->render($this); ?>
     </div>
+    <?=  $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
+</div>
 
-    <table class="table table-condensed pull-left">
+<div class="content contacts">
+    <table data-base-target="_next" class="action">
         <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)); ?>
+            foreach($contacts as $contact):
+                $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
                 <tr>
-                    <td> <?= $contact->contact_name ?> </td>
-                    <td> <?= $contact->contact_alias ?> </td>
-                    <td> <?= $contact->contact_email ?> </td>
-                    <td> <?= $contact->contact_pager ?> </td>
-                    <td> <?= $contactHelper->contactFlags($contact, 'service') ?> </td>
-                    <td> <?= $contactHelper->contactFlags($contact, 'host') ?> </td>
-                    <td> <?= $contact->contact_notify_service_timeperiod ?> </td>
-                    <td> <?= $contact->contact_notify_host_timeperiod ?> </td>
+                    <td><?= $contact->contact_name ?></td>
+                    <td><?= $contact->contact_alias ?></td>
+                    <td><?= $contact->contact_email ?></td>
+                    <td><?= $contact->contact_pager ?></td>
+                    <td><?= $contactHelper->contactFlags($contact, 'service') ?></td>
+                    <td><?= $contactHelper->contactFlags($contact, 'host') ?></td>
+                    <td><?= $contact->contact_notify_service_timeperiod ?></td>
+                    <td><?= $contact->contact_notify_host_timeperiod ?></td>
                 </tr>
             <?php endforeach; ?>
         </tbody>
     </table>
-
-    <div class="pull-left">
-        <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
-    </div>
 </div>

From e7a8c3bec3a8047d9da38016b7be830d8f438a54 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 15 Jul 2014 12:50:24 +0200
Subject: [PATCH 06/43] Provide a template for our license headers

refs #6309
---
 etc/license_header.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 etc/license_header.txt

diff --git a/etc/license_header.txt b/etc/license_header.txt
new file mode 100644
index 000000000..db19a8436
--- /dev/null
+++ b/etc/license_header.txt
@@ -0,0 +1,5 @@
+Icinga Web 2
+
+@link https://www.icinga.org/icingaweb2/
+@copyright Copyright (c) 2013-%(YEAR)s Icinga Development Team (https://www.icinga.org)
+@license http://www.gnu.org/licenses/gpl-2.0.txt, or any later version
\ No newline at end of file

From 39cd4a436b4d141b6593bb048934ff87c55c1f19 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 15 Jul 2014 12:50:58 +0200
Subject: [PATCH 07/43] Allow empty license headers being applied to files

refs #6309
---
 bin/license_writer.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/license_writer.py b/bin/license_writer.py
index 5357961bb..c0b68701e 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -191,6 +191,9 @@ def get_license(type):
     try:
         return __LICENSE_STORE[type]
     except(KeyError):
+        if not LICENSE_DATA:
+            __LICENSE_STORE[type] = ''
+            return ''
         config = FILE_TYPE_CONFIG[type]
         license_data = []
         license_data.extend([''] * config['linesBefore'])
@@ -239,8 +242,9 @@ def replace_text(org_data, license_data):
             test = True
         elif SECTION_MARKER.search(line) and test == True:
             test = False
-            out += license_data
-            out += '\n'
+            if license_data:
+                out += license_data
+                out += '\n'
         elif test == True:
             continue
 

From 861f9e03c51a7b3305e5381c50c1598838c68b84 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 15 Jul 2014 13:36:17 +0200
Subject: [PATCH 08/43] Drop public/css/icinga/actiontable.less as its not in
 use anywhere

---
 public/css/icinga/actiontable.less | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 public/css/icinga/actiontable.less

diff --git a/public/css/icinga/actiontable.less b/public/css/icinga/actiontable.less
deleted file mode 100644
index e69de29bb..000000000

From 3105c2059e4ef5f952dcc7ec6cf3c86156764024 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 15 Jul 2014 13:39:22 +0200
Subject: [PATCH 09/43] Remove license headers from all files

refs #6309
---
 .../files/var/www/html/icingaweb/index.php    |  2 ++
 .../clicommands/AutocompleteCommand.php       |  2 ++
 application/clicommands/HelpCommand.php       |  2 ++
 application/clicommands/ModuleCommand.php     |  2 ++
 application/clicommands/WebCommand.php        |  2 ++
 .../controllers/AuthenticationController.php  | 25 -----------------
 application/controllers/ConfigController.php  | 24 ----------------
 .../controllers/DashboardController.php       | 25 -----------------
 application/controllers/ErrorController.php   | 25 -----------------
 application/controllers/FilterController.php  | 25 -----------------
 application/controllers/IndexController.php   | 25 -----------------
 application/controllers/ListController.php    | 25 -----------------
 .../controllers/PreferenceController.php      | 25 -----------------
 application/controllers/SearchController.php  |  2 ++
 application/controllers/StaticController.php  | 25 -----------------
 .../forms/Authentication/LoginForm.php        |  2 ++
 .../Config/Authentication/BaseBackendForm.php | 25 -----------------
 .../Config/Authentication/DbBackendForm.php   | 25 -----------------
 .../Config/Authentication/LdapBackendForm.php | 25 -----------------
 .../Config/Authentication/ReorderForm.php     | 25 -----------------
 .../forms/Config/ConfirmRemovalForm.php       | 25 -----------------
 application/forms/Config/GeneralForm.php      | 25 -----------------
 application/forms/Config/LoggingForm.php      | 25 -----------------
 application/forms/Config/ResourceForm.php     | 25 -----------------
 application/forms/Dashboard/AddUrlForm.php    | 25 -----------------
 application/forms/Preference/GeneralForm.php  | 25 -----------------
 application/views/helpers/DateFormat.php      | 25 -----------------
 application/views/helpers/FormDateTime.php    | 25 -----------------
 application/views/helpers/FormNumber.php      | 25 -----------------
 .../views/helpers/FormTriStateCheckbox.php    | 25 -----------------
 application/views/helpers/Util.php            | 25 -----------------
 bin/license_writer.py                         | 23 ---------------
 .../Application/ApplicationBootstrap.php      | 25 -----------------
 library/Icinga/Application/Benchmark.php      | 25 -----------------
 library/Icinga/Application/Cli.php            | 25 -----------------
 library/Icinga/Application/Config.php         | 25 -----------------
 library/Icinga/Application/EmbeddedWeb.php    | 25 -----------------
 library/Icinga/Application/Icinga.php         | 25 -----------------
 library/Icinga/Application/LegacyWeb.php      | 25 -----------------
 .../Icinga/Application/Modules/Manager.php    | 25 -----------------
 library/Icinga/Application/Modules/Module.php |  9 ++----
 library/Icinga/Application/Platform.php       | 25 -----------------
 library/Icinga/Application/Web.php            | 25 -----------------
 library/Icinga/Application/functions.php      | 25 -----------------
 library/Icinga/Application/webrouter.php      |  2 ++
 .../Icinga/Authentication/AdmissionLoader.php | 25 -----------------
 library/Icinga/Authentication/AuthChain.php   |  2 ++
 .../Authentication/Backend/DbUserBackend.php  | 25 -----------------
 .../Backend/LdapUserBackend.php               | 25 -----------------
 library/Icinga/Authentication/Manager.php     | 25 -----------------
 library/Icinga/Authentication/Membership.php  | 25 -----------------
 library/Icinga/Authentication/UserBackend.php | 25 -----------------
 library/Icinga/Chart/Axis.php                 | 25 -----------------
 library/Icinga/Chart/Chart.php                | 25 -----------------
 library/Icinga/Chart/Format.php               | 24 ----------------
 library/Icinga/Chart/Graph/BarGraph.php       | 25 -----------------
 library/Icinga/Chart/Graph/LineGraph.php      | 25 -----------------
 library/Icinga/Chart/Graph/StackedGraph.php   | 25 -----------------
 library/Icinga/Chart/GridChart.php            | 25 -----------------
 library/Icinga/Chart/Inline/Inline.php        | 25 -----------------
 library/Icinga/Chart/Inline/PieChart.php      | 25 -----------------
 library/Icinga/Chart/Legend.php               | 25 -----------------
 library/Icinga/Chart/Palette.php              | 25 -----------------
 library/Icinga/Chart/PieChart.php             | 25 -----------------
 library/Icinga/Chart/Primitive/Animatable.php | 25 -----------------
 library/Icinga/Chart/Primitive/Animation.php  | 25 -----------------
 library/Icinga/Chart/Primitive/Canvas.php     | 25 -----------------
 library/Icinga/Chart/Primitive/Circle.php     | 25 -----------------
 library/Icinga/Chart/Primitive/Drawable.php   | 25 -----------------
 library/Icinga/Chart/Primitive/Line.php       | 25 -----------------
 library/Icinga/Chart/Primitive/Path.php       | 25 -----------------
 library/Icinga/Chart/Primitive/PieSlice.php   | 25 -----------------
 library/Icinga/Chart/Primitive/RawElement.php | 25 -----------------
 library/Icinga/Chart/Primitive/Rect.php       | 25 -----------------
 library/Icinga/Chart/Primitive/Styleable.php  | 25 -----------------
 library/Icinga/Chart/Primitive/Text.php       | 25 -----------------
 library/Icinga/Chart/Render/LayoutBox.php     | 25 -----------------
 library/Icinga/Chart/Render/RenderContext.php | 25 -----------------
 library/Icinga/Chart/SVGRenderer.php          | 25 -----------------
 library/Icinga/Chart/Unit/AxisUnit.php        | 25 -----------------
 library/Icinga/Chart/Unit/CalendarUnit.php    | 25 -----------------
 library/Icinga/Chart/Unit/LinearUnit.php      | 25 -----------------
 library/Icinga/Chart/Unit/StaticAxis.php      | 24 ----------------
 library/Icinga/Cli/AnsiScreen.php             |  2 ++
 library/Icinga/Cli/Command.php                |  2 ++
 library/Icinga/Cli/Documentation.php          |  2 ++
 .../Cli/Documentation/CommentParser.php       |  2 ++
 library/Icinga/Cli/Loader.php                 |  2 ++
 library/Icinga/Cli/Screen.php                 |  2 ++
 library/Icinga/Config/IniEditor.php           | 25 -----------------
 library/Icinga/Config/PreservingIniWriter.php | 25 -----------------
 library/Icinga/Data/Browsable.php             |  2 ++
 library/Icinga/Data/ConnectionInterface.php   |  2 ++
 .../Icinga/Data/DataArray/ArrayDatasource.php |  2 ++
 library/Icinga/Data/Db/DbConnection.php       | 25 -----------------
 library/Icinga/Data/Db/DbQuery.php            |  2 ++
 library/Icinga/Data/Fetchable.php             |  2 ++
 library/Icinga/Data/Filter/Filter.php         |  2 ++
 library/Icinga/Data/Filter/FilterAnd.php      |  2 ++
 library/Icinga/Data/Filter/FilterChain.php    |  2 ++
 library/Icinga/Data/Filter/FilterEqual.php    |  2 ++
 .../Data/Filter/FilterEqualOrGreaterThan.php  |  2 ++
 .../Data/Filter/FilterEqualOrLessThan.php     |  2 ++
 .../Icinga/Data/Filter/FilterException.php    |  2 ++
 .../Icinga/Data/Filter/FilterExpression.php   |  2 ++
 .../Icinga/Data/Filter/FilterGreaterThan.php  |  2 ++
 library/Icinga/Data/Filter/FilterLessThan.php |  2 ++
 library/Icinga/Data/Filter/FilterNot.php      |  2 ++
 library/Icinga/Data/Filter/FilterOr.php       |  2 ++
 .../Data/Filter/FilterParseException.php      |  2 ++
 .../Icinga/Data/Filter/FilterQueryString.php  |  2 ++
 library/Icinga/Data/Filterable.php            |  2 ++
 library/Icinga/Data/Limitable.php             |  2 ++
 library/Icinga/Data/QueryInterface.php        |  2 ++
 library/Icinga/Data/Queryable.php             |  2 ++
 library/Icinga/Data/ResourceFactory.php       | 25 -----------------
 library/Icinga/Data/Selectable.php            |  2 ++
 library/Icinga/Data/SimpleQuery.php           |  2 ++
 library/Icinga/Data/Sortable.php              |  2 ++
 .../Icinga/Exception/ConfigurationError.php   | 25 -----------------
 .../Exception/MissingParameterException.php   | 25 -----------------
 .../Icinga/Exception/NotImplementedError.php  | 25 -----------------
 library/Icinga/Exception/ProgrammingError.php | 25 -----------------
 .../Exception/SystemPermissionException.php   | 25 -----------------
 library/Icinga/File/Pdf.php                   |  2 ++
 .../Icinga/Protocol/Commandpipe/Command.php   | 25 -----------------
 .../Protocol/Commandpipe/CommandPipe.php      | 25 -----------------
 .../Icinga/Protocol/Commandpipe/Comment.php   | 25 -----------------
 .../Exception/InvalidCommandException.php     | 25 -----------------
 .../Protocol/Commandpipe/PropertyModifier.php | 25 -----------------
 .../Commandpipe/Transport/LocalPipe.php       | 25 -----------------
 .../Commandpipe/Transport/SecureShell.php     | 25 -----------------
 .../Commandpipe/Transport/Transport.php       | 25 -----------------
 library/Icinga/Protocol/Dns.php               | 25 -----------------
 library/Icinga/Protocol/Ldap/Connection.php   | 25 -----------------
 library/Icinga/Protocol/Ldap/Exception.php    | 25 -----------------
 library/Icinga/Protocol/Ldap/LdapUtils.php    | 25 -----------------
 library/Icinga/Protocol/Ldap/Node.php         | 25 -----------------
 library/Icinga/Protocol/Ldap/Query.php        |  2 ++
 library/Icinga/Protocol/Ldap/Root.php         | 25 -----------------
 .../Icinga/Protocol/Livestatus/Connection.php |  2 ++
 library/Icinga/Protocol/Livestatus/Query.php  |  2 ++
 library/Icinga/Protocol/Nrpe/Connection.php   |  2 ++
 library/Icinga/Protocol/Nrpe/Packet.php       |  2 ++
 .../Statusdat/Exception/ParsingException.php  | 25 -----------------
 library/Icinga/Protocol/Statusdat/IReader.php | 25 -----------------
 .../Protocol/Statusdat/ObjectContainer.php    | 25 -----------------
 library/Icinga/Protocol/Statusdat/Parser.php  | 25 -----------------
 .../Protocol/Statusdat/PrintableObject.php    | 25 -----------------
 library/Icinga/Protocol/Statusdat/Query.php   | 25 -----------------
 .../Protocol/Statusdat/Query/Expression.php   | 25 -----------------
 .../Icinga/Protocol/Statusdat/Query/Group.php | 25 -----------------
 .../Protocol/Statusdat/Query/IQueryPart.php   | 25 -----------------
 library/Icinga/Protocol/Statusdat/Reader.php  | 25 -----------------
 .../Statusdat/RuntimeStateContainer.php       | 25 -----------------
 .../Statusdat/View/AccessorStrategy.php       | 25 -----------------
 .../Statusdat/View/MonitoringObjectList.php   |  2 ++
 library/Icinga/Test/DbTest.php                | 25 -----------------
 library/Icinga/Test/FormTest.php              | 25 -----------------
 library/Icinga/User.php                       | 25 -----------------
 library/Icinga/User/Message.php               |  2 ++
 library/Icinga/User/Preferences.php           | 25 -----------------
 library/Icinga/Util/Color.php                 | 28 ++-----------------
 library/Icinga/Util/ConfigAwareFactory.php    | 25 -----------------
 library/Icinga/Util/DateTimeFactory.php       | 25 -----------------
 library/Icinga/Util/Dimension.php             | 25 -----------------
 library/Icinga/Util/Format.php                | 25 -----------------
 library/Icinga/Util/String.php                | 25 -----------------
 library/Icinga/Util/Translator.php            | 25 -----------------
 .../Web/Controller/ActionController.php       | 25 -----------------
 .../Web/Controller/BaseConfigController.php   | 25 -----------------
 .../Controller/BasePreferenceController.php   | 25 -----------------
 .../Web/Controller/ControllerTabCollector.php | 25 -----------------
 .../Web/Controller/ModuleActionController.php |  2 ++
 library/Icinga/Web/Form.php                   | 25 -----------------
 .../Web/Form/Decorator/BootstrapForm.php      | 25 -----------------
 .../Web/Form/Decorator/ConditionalHidden.php  | 25 -----------------
 .../Icinga/Web/Form/Decorator/HelpText.php    | 25 -----------------
 .../Web/Form/Element/DateTimePicker.php       | 25 -----------------
 library/Icinga/Web/Form/Element/Note.php      | 25 -----------------
 library/Icinga/Web/Form/Element/Number.php    | 25 -----------------
 .../Web/Form/Element/TriStateCheckbox.php     | 25 -----------------
 .../Web/Form/InvalidCSRFTokenException.php    | 25 -----------------
 .../Form/Validator/DateFormatValidator.php    | 25 -----------------
 .../Web/Form/Validator/DateTimeValidator.php  | 25 -----------------
 .../Form/Validator/TimeFormatValidator.php    | 25 -----------------
 .../Web/Form/Validator/TriStateValidator.php  | 25 -----------------
 .../Form/Validator/WritablePathValidator.php  | 25 -----------------
 library/Icinga/Web/Hook.php                   | 25 -----------------
 .../Hook/Configuration/ConfigurationTab.php   | 25 -----------------
 .../Configuration/ConfigurationTabBuilder.php | 25 -----------------
 .../ConfigurationTabInterface.php             | 25 -----------------
 library/Icinga/Web/Hook/Grapher.php           | 25 -----------------
 library/Icinga/Web/Hook/Ticket.php            |  5 ++--
 library/Icinga/Web/Hook/TopBar.php            | 25 -----------------
 library/Icinga/Web/JavaScript.php             |  2 ++
 library/Icinga/Web/LessCompiler.php           | 25 -----------------
 library/Icinga/Web/Notification.php           | 25 -----------------
 .../Web/Paginator/Adapter/QueryAdapter.php    | 25 -----------------
 .../ScrollingStyle/SlidingWithBorder.php      | 25 -----------------
 library/Icinga/Web/Request.php                | 25 -----------------
 library/Icinga/Web/Response.php               |  2 ++
 library/Icinga/Web/Session.php                | 25 -----------------
 library/Icinga/Web/Session/PhpSession.php     | 25 -----------------
 library/Icinga/Web/Session/Session.php        | 25 -----------------
 .../Icinga/Web/Session/SessionNamespace.php   | 25 -----------------
 library/Icinga/Web/StyleSheet.php             |  2 ++
 library/Icinga/Web/Url.php                    | 25 -----------------
 library/Icinga/Web/UrlParams.php              |  2 ++
 library/Icinga/Web/View.php                   | 25 -----------------
 library/Icinga/Web/View/helpers/format.php    |  2 ++
 library/Icinga/Web/View/helpers/generic.php   |  2 ++
 library/Icinga/Web/View/helpers/url.php       |  2 ++
 library/Icinga/Web/ViewStream.php             | 25 -----------------
 library/Icinga/Web/Widget.php                 |  5 ++--
 library/Icinga/Web/Widget/AbstractWidget.php  |  2 ++
 library/Icinga/Web/Widget/AlertMessageBox.php |  2 ++
 .../Web/Widget/Chart/HistoryColorGrid.php     | 25 -----------------
 library/Icinga/Web/Widget/Chart/InlinePie.php | 25 -----------------
 library/Icinga/Web/Widget/Dashboard.php       | 25 -----------------
 .../Icinga/Web/Widget/Dashboard/Component.php | 25 -----------------
 library/Icinga/Web/Widget/Dashboard/Pane.php  | 25 -----------------
 library/Icinga/Web/Widget/FilterEditor.php    |  2 ++
 library/Icinga/Web/Widget/FilterWidget.php    |  2 ++
 library/Icinga/Web/Widget/Limiter.php         |  2 ++
 library/Icinga/Web/Widget/SortBox.php         | 25 -----------------
 library/Icinga/Web/Widget/Tab.php             | 25 -----------------
 .../Web/Widget/Tabextension/BasketAction.php  | 25 -----------------
 .../Widget/Tabextension/DashboardAction.php   | 25 -----------------
 .../Web/Widget/Tabextension/OutputFormat.php  | 25 -----------------
 .../Web/Widget/Tabextension/Tabextension.php  | 25 -----------------
 library/Icinga/Web/Widget/Tabs.php            | 25 -----------------
 library/Icinga/Web/Widget/Widget.php          | 25 -----------------
 library/Icinga/Web/Window.php                 |  2 ++
 modules/doc/library/Doc/DocParser.php         |  2 +-
 .../doc/library/Doc/MarkdownFileIterator.php  |  2 +-
 .../clicommands/ConferenceCommand.php         |  2 ++
 .../application/clicommands/ListCommand.php   |  2 ++
 .../application/clicommands/NrpeCommand.php   |  2 ++
 .../controllers/ChartController.php           | 25 -----------------
 .../controllers/CommandController.php         | 25 -----------------
 .../controllers/ConfigController.php          | 25 -----------------
 .../controllers/ListController.php            |  2 ++
 .../controllers/MonitoringCommands.php        | 25 -----------------
 .../controllers/MultiController.php           | 25 -----------------
 .../controllers/ProcessController.php         | 25 -----------------
 .../controllers/ShowController.php            | 25 -----------------
 .../forms/Command/AcknowledgeForm.php         | 25 -----------------
 .../application/forms/Command/CommandForm.php | 25 -----------------
 .../application/forms/Command/CommentForm.php | 25 -----------------
 .../forms/Command/CustomNotificationForm.php  | 25 -----------------
 .../forms/Command/DelayNotificationForm.php   | 25 -----------------
 .../DisableNotificationWithExpireForm.php     | 25 -----------------
 .../forms/Command/MultiCommandFlagForm.php    | 25 -----------------
 .../forms/Command/RescheduleNextCheckForm.php | 25 -----------------
 .../forms/Command/ScheduleDowntimeForm.php    | 25 -----------------
 .../Command/SingleArgumentCommandForm.php     | 25 -----------------
 .../Command/SubmitPassiveCheckResultForm.php  | 25 -----------------
 .../forms/Command/WithChildrenCommandForm.php | 25 -----------------
 .../Config/Backend/CreateBackendForm.php      | 25 -----------------
 .../forms/Config/ConfirmRemovalForm.php       | 25 -----------------
 .../Config/Instance/CreateInstanceForm.php    | 25 -----------------
 .../Config/Instance/EditInstanceForm.php      | 25 -----------------
 .../views/helpers/CheckPerformance.php        | 25 -----------------
 .../application/views/helpers/CommandForm.php | 25 -----------------
 .../views/helpers/ContactFlags.php            |  2 ++
 .../views/helpers/MonitoringFlags.php         | 25 -----------------
 .../views/helpers/MonitoringProperties.php    | 25 -----------------
 .../views/helpers/MonitoringState.php         |  2 ++
 .../views/helpers/PluginOutput.php            |  2 ++
 .../views/helpers/ResolveComments.php         |  2 ++
 .../views/helpers/ResolveMacros.php           | 25 -----------------
 .../views/helpers/RuntimeVariables.php        | 25 -----------------
 .../views/helpers/SelectionToolbar.php        |  2 ++
 .../views/helpers/_RenderServicePerfdata.php  |  2 ++
 modules/monitoring/bin/action/list.inc.php    |  2 ++
 modules/monitoring/configuration.php          |  2 ++
 .../Backend/Ido/Query/AllcontactsQuery.php    |  2 ++
 .../Backend/Ido/Query/CommentQuery.php        | 25 -----------------
 .../Ido/Query/CommentdeletionhistoryQuery.php |  2 ++
 .../Backend/Ido/Query/CommenthistoryQuery.php |  2 ++
 .../Backend/Ido/Query/ContactQuery.php        |  2 ++
 .../Backend/Ido/Query/ContactgroupQuery.php   |  2 ++
 .../Backend/Ido/Query/CustomvarQuery.php      |  2 ++
 .../Backend/Ido/Query/DowntimeQuery.php       | 25 -----------------
 .../Ido/Query/DowntimeendhistoryQuery.php     |  2 ++
 .../Ido/Query/DowntimestarthistoryQuery.php   |  2 ++
 .../Backend/Ido/Query/EventHistoryQuery.php   |  2 ++
 .../Backend/Ido/Query/GroupsummaryQuery.php   | 25 -----------------
 .../Backend/Ido/Query/HostgroupQuery.php      |  2 ++
 .../Backend/Ido/Query/HoststatusQuery.php     | 25 -----------------
 .../Monitoring/Backend/Ido/Query/IdoQuery.php |  2 ++
 .../Backend/Ido/Query/NotificationQuery.php   | 25 -----------------
 .../Ido/Query/NotificationhistoryQuery.php    |  2 ++
 .../Backend/Ido/Query/ProgramstatusQuery.php  | 25 -----------------
 .../Backend/Ido/Query/RuntimesummaryQuery.php | 25 -----------------
 .../Ido/Query/RuntimevariablesQuery.php       | 25 -----------------
 .../Backend/Ido/Query/ServicegroupQuery.php   |  2 ++
 .../Ido/Query/StateHistorySummaryQuery.php    |  2 ++
 .../Backend/Ido/Query/StatehistoryQuery.php   |  2 ++
 .../Backend/Ido/Query/StatusQuery.php         | 25 -----------------
 .../Backend/Ido/Query/StatusSummaryQuery.php  | 25 -----------------
 .../Backend/Livestatus/Query/StatusQuery.php  |  2 ++
 .../Backend/Statusdat/Query/CommentQuery.php  | 25 -----------------
 .../Backend/Statusdat/Query/ContactQuery.php  |  2 ++
 .../Statusdat/Query/ContactgroupQuery.php     |  2 ++
 .../Backend/Statusdat/Query/DowntimeQuery.php | 25 -----------------
 .../Statusdat/Query/GroupsummaryQuery.php     |  2 ++
 .../Statusdat/Query/HostgroupQuery.php        | 25 -----------------
 .../Backend/Statusdat/Query/HostlistQuery.php | 25 -----------------
 .../Statusdat/Query/ServicegroupQuery.php     | 25 -----------------
 .../Query/ServicegroupsummaryQuery.php        | 25 -----------------
 .../Statusdat/Query/ServicelistQuery.php      | 25 -----------------
 .../Backend/Statusdat/Query/StatusQuery.php   |  9 ++----
 .../Statusdat/Query/StatusSummaryQuery.php    | 25 -----------------
 .../Statusdat/Query/StatusdatQuery.php        | 25 -----------------
 .../library/Monitoring/Cli/CliUtils.php       |  2 ++
 .../Monitoring/Command/AcknowledgeCommand.php | 25 -----------------
 .../Monitoring/Command/AddCommentCommand.php  | 25 -----------------
 .../Command/CustomNotificationCommand.php     | 25 -----------------
 .../Command/DelayNotificationCommand.php      | 25 -----------------
 .../DisableNotificationWithExpireCommand.php  | 25 -----------------
 .../Command/ScheduleCheckCommand.php          | 25 -----------------
 .../Command/ScheduleDowntimeCommand.php       | 25 -----------------
 .../Command/SingleArgumentCommand.php         | 25 -----------------
 .../SubmitPassiveCheckresultCommand.php       | 25 -----------------
 .../library/Monitoring/Controller.php         | 25 -----------------
 .../library/Monitoring/DataView/Comment.php   | 25 -----------------
 .../library/Monitoring/DataView/Contact.php   |  2 ++
 .../Monitoring/DataView/Contactgroup.php      |  2 ++
 .../library/Monitoring/DataView/Customvar.php | 25 -----------------
 .../library/Monitoring/DataView/DataView.php  | 25 -----------------
 .../library/Monitoring/DataView/Downtime.php  | 25 -----------------
 .../Monitoring/DataView/EventHistory.php      | 25 -----------------
 .../Monitoring/DataView/Groupsummary.php      | 25 -----------------
 .../Monitoring/DataView/HostStatus.php        | 25 -----------------
 .../library/Monitoring/DataView/Hostgroup.php | 25 -----------------
 .../Monitoring/DataView/Notification.php      |  2 ++
 .../Monitoring/DataView/Programstatus.php     | 25 -----------------
 .../Monitoring/DataView/Runtimesummary.php    | 25 -----------------
 .../Monitoring/DataView/Runtimevariables.php  | 25 -----------------
 .../Monitoring/DataView/ServiceStatus.php     | 25 -----------------
 .../Monitoring/DataView/Servicegroup.php      | 25 -----------------
 .../DataView/StateHistorySummary.php          | 25 -----------------
 .../Monitoring/DataView/StatusSummary.php     | 25 -----------------
 .../library/Monitoring/Environment.php        |  2 ++
 .../Exception/UnsupportedBackendException.php | 25 -----------------
 .../Monitoring/Object/AbstractObject.php      |  2 ++
 .../library/Monitoring/Object/Host.php        |  2 ++
 .../library/Monitoring/Object/Service.php     |  2 ++
 .../monitoring/library/Monitoring/Plugin.php  |  2 ++
 .../library/Monitoring/Web/Hook/TopBar.php    | 25 -----------------
 modules/monitoring/public/css/module.less     |  3 ++
 modules/monitoring/public/js/module.js        |  2 ++
 modules/monitoring/run.php                    |  8 ++----
 .../clicommands/CompileCommand.php            | 25 -----------------
 .../clicommands/RefreshCommand.php            | 25 -----------------
 .../Translation/Cli/TranslationCommand.php    | 25 -----------------
 .../Util/GettextTranslationHelper.php         | 25 -----------------
 packages/files/public/index.php               |  2 ++
 .../rhel/usr/share/icingaweb/public/index.php |  2 ++
 public/css/icinga/defaults.less               |  2 ++
 public/css/icinga/forms.less                  |  2 ++
 public/css/icinga/header-elements.less        |  2 ++
 public/css/icinga/layout-colors.less          |  3 ++
 public/css/icinga/layout-structure.less       |  2 ++
 public/css/icinga/login.less                  |  2 ++
 public/css/icinga/main-content.less           |  2 ++
 public/css/icinga/menu.less                   |  2 ++
 public/css/icinga/monitoring-colors.less      |  2 ++
 public/css/icinga/pagination.less             |  3 ++
 public/css/icinga/selection-toolbar.less      |  3 ++
 public/css/icinga/tabs.less                   |  2 ++
 public/css/icinga/widgets.less                |  3 ++
 public/css/pdf/pdfprint.less                  |  3 ++
 public/index.php                              |  2 ++
 public/js/helpers.js                          |  2 ++
 public/js/icinga.js                           |  3 ++
 public/js/icinga/events.js                    |  3 ++
 public/js/icinga/history.js                   |  3 ++
 public/js/icinga/loader.js                    |  3 ++
 public/js/icinga/logger.js                    |  3 ++
 public/js/icinga/module.js                    |  3 ++
 public/js/icinga/timer.js                     |  3 ++
 public/js/icinga/ui.js                        |  3 ++
 public/js/icinga/utils.js                     |  3 ++
 test/php/bootstrap.php                        |  2 ++
 .../Data/DataArray/ArrayDatasourceTest.php    |  2 ++
 .../library/Icinga/Data/Filter/FilterTest.php |  2 ++
 389 files changed, 300 insertions(+), 6198 deletions(-)

diff --git a/.vagrant-puppet/files/var/www/html/icingaweb/index.php b/.vagrant-puppet/files/var/www/html/icingaweb/index.php
index 86f99f056..9e452ac70 100644
--- a/.vagrant-puppet/files/var/www/html/icingaweb/index.php
+++ b/.vagrant-puppet/files/var/www/html/icingaweb/index.php
@@ -1,3 +1,5 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 include '/vagrant/library/Icinga/Application/webrouter.php';
diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index b41b59fd8..5a5a0e0c0 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 1d8362f8e..7c1977f59 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index c7600c9dc..e38d134c3 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php
index d064ab08c..4124cd731 100644
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index cfbbafe4d..bbb475989 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -1,30 +1,5 @@
 <?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\Application\Controllers;
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index ce87f4bf7..31739c30e 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,29 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- *
- * 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}}}
 
 use Icinga\Web\Controller\BaseConfigController;
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index c44fbfa1f..1f45eacde 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Zend_Config;
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index b4007bb6d..7d30d62e5 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,30 +1,5 @@
 <?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\Application\Controllers;
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 149dc14fe..2ffa869db 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Web\Controller\ActionController;
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 6d042eb64..83ec0dd1d 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -1,30 +1,5 @@
 <?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\Application\Controllers;
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index cc0255d2c..b790418f7 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Module\Monitoring\Controller;
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 1055451db..cc2ea4e95 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Web\Controller\BasePreferenceController;
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index 0707aa564..f2bf1ceac 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index a3d138cc0..df930c3d7 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Zend_Controller_Action_Exception as ActionException;
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index b9eb2f27d..fa39af35f 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;
 
diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index 13a30957c..7a34f236a 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 7aa417cea..2c57b82e2 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 9112f8324..ee90fa95c 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/application/forms/Config/Authentication/ReorderForm.php b/application/forms/Config/Authentication/ReorderForm.php
index b6a3b81f0..a074febea 100644
--- a/application/forms/Config/Authentication/ReorderForm.php
+++ b/application/forms/Config/Authentication/ReorderForm.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index 337fad991..65624c7b5 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index d626be5e8..ced24401c 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index 0a343a7c0..b3b4089c8 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
index 52650411f..9a48c1f56 100644
--- a/application/forms/Config/ResourceForm.php
+++ b/application/forms/Config/ResourceForm.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index 84c7791e0..09759a265 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -1,30 +1,5 @@
 <?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\Dashboard;
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 03383a708..fbc8f8d74 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -1,30 +1,5 @@
 <?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\Preference;
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index 80c6bc50a..a03316f25 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Application\Icinga;
diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index 959675afa..07d5fb930 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Zend_View_Helper_FormElement;
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 11d25679f..a8768f0b7 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index df32f8e60..695c9af56 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Zend_View_Helper_FormElement;
diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index 2ab111fcb..25b209a36 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/bin/license_writer.py b/bin/license_writer.py
index c0b68701e..532839e2e 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -1,29 +1,6 @@
 #!/usr/bin/python
 
 # {{{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}}}
 
 import sys
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 428f4c3ef..19fb48b58 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/Benchmark.php b/library/Icinga/Application/Benchmark.php
index fbe967391..c510c61bf 100644
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 31e89f3c9..58daf5f2f 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 8771faa10..e81e8062f 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 4a4620b8e..6a160017c 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/Icinga.php b/library/Icinga/Application/Icinga.php
index a3a0d3b96..1ab9c36f0 100644
--- a/library/Icinga/Application/Icinga.php
+++ b/library/Icinga/Application/Icinga.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/LegacyWeb.php b/library/Icinga/Application/LegacyWeb.php
index bf1ff3a45..a5b5beed9 100644
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index e38383188..28241adc3 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -1,30 +1,5 @@
 <?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\Application\Modules;
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index f70ab0700..8dd189097 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1,12 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Icingaweb 2
- *
- * @link https://git.icinga.org/icingaweb2.git/ for the official source repository
- * @copyright Copyright (c) 2013-2014 Icinga Development Team (https://www.icinga.org)
- * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- */
 namespace Icinga\Application\Modules;
 
 use Exception;
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 80bb6896d..30db869cf 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 8c2ce1efb..8ee18771d 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -1,30 +1,5 @@
 <?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\Application;
diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php
index 0530b6af2..cfa5620ba 100644
--- a/library/Icinga/Application/functions.php
+++ b/library/Icinga/Application/functions.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Icinga\Util\Translator;
diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index 82c630056..71b48b2c7 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php
index 6f7bb796c..f961fb87c 100644
--- a/library/Icinga/Authentication/AdmissionLoader.php
+++ b/library/Icinga/Authentication/AdmissionLoader.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 8f34ed84b..216344735 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 13a6f6879..5961028b3 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -1,30 +1,5 @@
 <?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\Authentication\Backend;
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 22995c708..fe80e900a 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -1,30 +1,5 @@
 <?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\Authentication\Backend;
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index e13526413..5b9f57e4e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication;
diff --git a/library/Icinga/Authentication/Membership.php b/library/Icinga/Authentication/Membership.php
index 2451963d9..2f6e83710 100644
--- a/library/Icinga/Authentication/Membership.php
+++ b/library/Icinga/Authentication/Membership.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index 9dcf9c641..f90eef1c7 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,30 +1,5 @@
 <?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\Authentication;
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index 83a3d08b1..db1a82a83 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index d3ce9013e..be436df2a 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Format.php b/library/Icinga/Chart/Format.php
index d55d58b26..80b48ecb5 100644
--- a/library/Icinga/Chart/Format.php
+++ b/library/Icinga/Chart/Format.php
@@ -1,29 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga 2 Web.
- *
- * Icinga 2 Web - 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\Chart;
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 675aa76d2..8bde864ce 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -1,30 +1,5 @@
 <?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\Chart\Graph;
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index cf3c9bcc1..d12d4eed9 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Graph/StackedGraph.php b/library/Icinga/Chart/Graph/StackedGraph.php
index 7a2152bab..ae4f593e2 100644
--- a/library/Icinga/Chart/Graph/StackedGraph.php
+++ b/library/Icinga/Chart/Graph/StackedGraph.php
@@ -1,30 +1,5 @@
 <?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\Chart\Graph;
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index c25cf5e65..ef1682921 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Inline/Inline.php b/library/Icinga/Chart/Inline/Inline.php
index 475f5b13f..8faa388bf 100644
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@@ -1,30 +1,5 @@
 <?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\Chart\Inline;
diff --git a/library/Icinga/Chart/Inline/PieChart.php b/library/Icinga/Chart/Inline/PieChart.php
index a77dd7015..573c5e05d 100644
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@@ -1,30 +1,5 @@
 <?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\Chart\Inline;
diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index 1ac9335c5..46ba8081c 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Palette.php b/library/Icinga/Chart/Palette.php
index 8cf49f535..ef413e73e 100644
--- a/library/Icinga/Chart/Palette.php
+++ b/library/Icinga/Chart/Palette.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index dc7066ad2..222af96bd 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Primitive/Animatable.php b/library/Icinga/Chart/Primitive/Animatable.php
index aadb80908..3d4d24f00 100644
--- a/library/Icinga/Chart/Primitive/Animatable.php
+++ b/library/Icinga/Chart/Primitive/Animatable.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Animation.php b/library/Icinga/Chart/Primitive/Animation.php
index 545f71da6..dbcdb1a2c 100644
--- a/library/Icinga/Chart/Primitive/Animation.php
+++ b/library/Icinga/Chart/Primitive/Animation.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index e33a2e20d..55159d975 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index 4d9d75a36..058211bf7 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Primitive/Drawable.php b/library/Icinga/Chart/Primitive/Drawable.php
index 69b937b7d..ea5dca077 100644
--- a/library/Icinga/Chart/Primitive/Drawable.php
+++ b/library/Icinga/Chart/Primitive/Drawable.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Line.php b/library/Icinga/Chart/Primitive/Line.php
index b3a5d7f77..150013f82 100644
--- a/library/Icinga/Chart/Primitive/Line.php
+++ b/library/Icinga/Chart/Primitive/Line.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index ea42c58f7..0969e9674 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index e930390a1..1ded01dbd 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/RawElement.php b/library/Icinga/Chart/Primitive/RawElement.php
index be0f6c3ee..459a2d1ce 100644
--- a/library/Icinga/Chart/Primitive/RawElement.php
+++ b/library/Icinga/Chart/Primitive/RawElement.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php
index 8b86b35fb..36b63912f 100644
--- a/library/Icinga/Chart/Primitive/Rect.php
+++ b/library/Icinga/Chart/Primitive/Rect.php
@@ -1,30 +1,5 @@
 <?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\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index 9b4a4f59b..248a560d3 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 5cd47e56b..5521d6e27 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Render/LayoutBox.php b/library/Icinga/Chart/Render/LayoutBox.php
index 02d99376d..00e75f3c4 100644
--- a/library/Icinga/Chart/Render/LayoutBox.php
+++ b/library/Icinga/Chart/Render/LayoutBox.php
@@ -1,30 +1,5 @@
 <?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\Chart\Render;
diff --git a/library/Icinga/Chart/Render/RenderContext.php b/library/Icinga/Chart/Render/RenderContext.php
index ea8d97332..476d36554 100644
--- a/library/Icinga/Chart/Render/RenderContext.php
+++ b/library/Icinga/Chart/Render/RenderContext.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index eca1ce99c..390e48739 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -1,30 +1,5 @@
 <?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\Chart;
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index 9e77bb8dc..dc57f99e0 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -1,30 +1,5 @@
 <?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\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index 8da617ea6..2845303c4 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index dd8c91c8e..bf27486d2 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -1,30 +1,5 @@
 <?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\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 2d776f3b8..6458ae599 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -1,29 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga 2 Web.
- *
- * Icinga 2 Web - 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}}}
 
 
diff --git a/library/Icinga/Cli/AnsiScreen.php b/library/Icinga/Cli/AnsiScreen.php
index a18b9649e..d3eeed44e 100644
--- a/library/Icinga/Cli/AnsiScreen.php
+++ b/library/Icinga/Cli/AnsiScreen.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 47bb57728..081be318c 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 02fbd6873..76b821df4 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index 90d7261d1..f8b6135e9 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli\Documentation;
 
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index b4cd27741..ab8064370 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Screen.php b/library/Icinga/Cli/Screen.php
index bd29ebb37..5b687f3ab 100644
--- a/library/Icinga/Cli/Screen.php
+++ b/library/Icinga/Cli/Screen.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Config/IniEditor.php b/library/Icinga/Config/IniEditor.php
index 318a92c1b..61639563e 100644
--- a/library/Icinga/Config/IniEditor.php
+++ b/library/Icinga/Config/IniEditor.php
@@ -1,30 +1,5 @@
 <?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\Config;
diff --git a/library/Icinga/Config/PreservingIniWriter.php b/library/Icinga/Config/PreservingIniWriter.php
index a89cf268c..67059b6d8 100644
--- a/library/Icinga/Config/PreservingIniWriter.php
+++ b/library/Icinga/Config/PreservingIniWriter.php
@@ -1,30 +1,5 @@
 <?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\Config;
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
index 852808d21..4d8d2136f 100644
--- a/library/Icinga/Data/Browsable.php
+++ b/library/Icinga/Data/Browsable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConnectionInterface.php b/library/Icinga/Data/ConnectionInterface.php
index c6521e9eb..dfdb4a6f2 100644
--- a/library/Icinga/Data/ConnectionInterface.php
+++ b/library/Icinga/Data/ConnectionInterface.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index dd5aa9d27..ecb428e59 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\DataArray;
 
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 66aecae59..af9cce05c 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -1,30 +1,5 @@
 <?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\Data\Db;
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 266f5f816..7fef56efc 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 34c21752e..249a522e3 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
index bda33c33e..dc62e206a 100644
--- a/library/Icinga/Data/Filter/Filter.php
+++ b/library/Icinga/Data/Filter/Filter.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterAnd.php b/library/Icinga/Data/Filter/FilterAnd.php
index 61fabdb0c..899f488ce 100644
--- a/library/Icinga/Data/Filter/FilterAnd.php
+++ b/library/Icinga/Data/Filter/FilterAnd.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index 47224a91b..9d32252fe 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php
index 5b16b37a1..66e4c06ad 100644
--- a/library/Icinga/Data/Filter/FilterEqual.php
+++ b/library/Icinga/Data/Filter/FilterEqual.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
index e57541e71..29c0bfad0 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
index 47b6d1906..2f8b62265 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php
index b94748142..e70ee6b77 100644
--- a/library/Icinga/Data/Filter/FilterException.php
+++ b/library/Icinga/Data/Filter/FilterException.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 850dd96da..c29414166 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterGreaterThan.php b/library/Icinga/Data/Filter/FilterGreaterThan.php
index 6fd4f2b2d..bda8665b1 100644
--- a/library/Icinga/Data/Filter/FilterGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterGreaterThan.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterLessThan.php b/library/Icinga/Data/Filter/FilterLessThan.php
index dabccc669..2ae99098f 100644
--- a/library/Icinga/Data/Filter/FilterLessThan.php
+++ b/library/Icinga/Data/Filter/FilterLessThan.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNot.php b/library/Icinga/Data/Filter/FilterNot.php
index 39131b671..a49a7ab3d 100644
--- a/library/Icinga/Data/Filter/FilterNot.php
+++ b/library/Icinga/Data/Filter/FilterNot.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterOr.php b/library/Icinga/Data/Filter/FilterOr.php
index c8cd40b70..427c17fd2 100644
--- a/library/Icinga/Data/Filter/FilterOr.php
+++ b/library/Icinga/Data/Filter/FilterOr.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php
index b56c6ba67..bb90067b8 100644
--- a/library/Icinga/Data/Filter/FilterParseException.php
+++ b/library/Icinga/Data/Filter/FilterParseException.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php
index ce39c3801..88d3f0a37 100644
--- a/library/Icinga/Data/Filter/FilterQueryString.php
+++ b/library/Icinga/Data/Filter/FilterQueryString.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index d33dcabf4..73ce5dcb4 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Limitable.php b/library/Icinga/Data/Limitable.php
index a6a5f4e56..380eae9f9 100644
--- a/library/Icinga/Data/Limitable.php
+++ b/library/Icinga/Data/Limitable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 65612b7ca..ef8c7c741 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Queryable.php b/library/Icinga/Data/Queryable.php
index 278bb04b2..47f438c4e 100644
--- a/library/Icinga/Data/Queryable.php
+++ b/library/Icinga/Data/Queryable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index e7e627b11..1db623e17 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -1,30 +1,5 @@
 <?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\Data;
diff --git a/library/Icinga/Data/Selectable.php b/library/Icinga/Data/Selectable.php
index 2b48b206b..06aa4f93c 100644
--- a/library/Icinga/Data/Selectable.php
+++ b/library/Icinga/Data/Selectable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index e7392307a..b70bc0e5d 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 5445f508e..f3b8d1c9b 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php
index b72092197..988246f5f 100644
--- a/library/Icinga/Exception/ConfigurationError.php
+++ b/library/Icinga/Exception/ConfigurationError.php
@@ -1,30 +1,5 @@
 <?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\Exception;
diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index 81df20de0..dda47aeab 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -1,30 +1,5 @@
 <?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\Exception;
diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php
index 598e01800..01131275d 100644
--- a/library/Icinga/Exception/NotImplementedError.php
+++ b/library/Icinga/Exception/NotImplementedError.php
@@ -1,30 +1,5 @@
 <?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\Exception;
diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php
index 809f6690b..282d80db0 100644
--- a/library/Icinga/Exception/ProgrammingError.php
+++ b/library/Icinga/Exception/ProgrammingError.php
@@ -1,30 +1,5 @@
 <?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\Exception;
diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php
index 77078dcfd..8202e34ac 100644
--- a/library/Icinga/Exception/SystemPermissionException.php
+++ b/library/Icinga/Exception/SystemPermissionException.php
@@ -1,30 +1,5 @@
 <?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\Exception;
diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index 304fc9bfe..2e8a97887 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/Protocol/Commandpipe/Command.php b/library/Icinga/Protocol/Commandpipe/Command.php
index 25fad71c8..b7332ce33 100644
--- a/library/Icinga/Protocol/Commandpipe/Command.php
+++ b/library/Icinga/Protocol/Commandpipe/Command.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe;
diff --git a/library/Icinga/Protocol/Commandpipe/CommandPipe.php b/library/Icinga/Protocol/Commandpipe/CommandPipe.php
index 4e14ba6d9..91be222cd 100644
--- a/library/Icinga/Protocol/Commandpipe/CommandPipe.php
+++ b/library/Icinga/Protocol/Commandpipe/CommandPipe.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe;
diff --git a/library/Icinga/Protocol/Commandpipe/Comment.php b/library/Icinga/Protocol/Commandpipe/Comment.php
index 5618203d2..2b8caf52b 100644
--- a/library/Icinga/Protocol/Commandpipe/Comment.php
+++ b/library/Icinga/Protocol/Commandpipe/Comment.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe;
diff --git a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php b/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
index d49d87f81..662a156e9 100644
--- a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
+++ b/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe\Exception;
diff --git a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php b/library/Icinga/Protocol/Commandpipe/PropertyModifier.php
index eb5a261b8..b398d73c7 100644
--- a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php
+++ b/library/Icinga/Protocol/Commandpipe/PropertyModifier.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe;
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php b/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php
index 65a3dab45..ecf1a981c 100644
--- a/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php
+++ b/library/Icinga/Protocol/Commandpipe/Transport/LocalPipe.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe\Transport;
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php b/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php
index cc51a5180..f1505c2ef 100644
--- a/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php
+++ b/library/Icinga/Protocol/Commandpipe/Transport/SecureShell.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe\Transport;
diff --git a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php b/library/Icinga/Protocol/Commandpipe/Transport/Transport.php
index d586cc53c..c5a5b3883 100644
--- a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php
+++ b/library/Icinga/Protocol/Commandpipe/Transport/Transport.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Commandpipe\Transport;
diff --git a/library/Icinga/Protocol/Dns.php b/library/Icinga/Protocol/Dns.php
index cb8681080..92e8b2a4d 100644
--- a/library/Icinga/Protocol/Dns.php
+++ b/library/Icinga/Protocol/Dns.php
@@ -1,30 +1,5 @@
 <?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\Protocol;
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f6aaa6511..edd99d021 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Ldap;
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index 7d6eb7317..41a5b782b 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Ldap;
diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php
index 1be25a2f1..8232ebf67 100644
--- a/library/Icinga/Protocol/Ldap/LdapUtils.php
+++ b/library/Icinga/Protocol/Ldap/LdapUtils.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Ldap;
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index 0332de7b3..8e9570d25 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Ldap;
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 13193885e..3d380f9c7 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 51202e64e..46062c9d6 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Ldap;
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index fe440c788..0b37f3fcf 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index 50ba112d4..73e287bd6 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Nrpe/Connection.php b/library/Icinga/Protocol/Nrpe/Connection.php
index 68550b3e5..3c06e259b 100644
--- a/library/Icinga/Protocol/Nrpe/Connection.php
+++ b/library/Icinga/Protocol/Nrpe/Connection.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php
index 6960aa0f0..0e722dbff 100644
--- a/library/Icinga/Protocol/Nrpe/Packet.php
+++ b/library/Icinga/Protocol/Nrpe/Packet.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
index 051794583..0947e65bc 100644
--- a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
+++ b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat\Exception;
diff --git a/library/Icinga/Protocol/Statusdat/IReader.php b/library/Icinga/Protocol/Statusdat/IReader.php
index adde66f80..0f9a7d73f 100644
--- a/library/Icinga/Protocol/Statusdat/IReader.php
+++ b/library/Icinga/Protocol/Statusdat/IReader.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/ObjectContainer.php b/library/Icinga/Protocol/Statusdat/ObjectContainer.php
index 42ec2f236..8fc267bf3 100644
--- a/library/Icinga/Protocol/Statusdat/ObjectContainer.php
+++ b/library/Icinga/Protocol/Statusdat/ObjectContainer.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/Parser.php b/library/Icinga/Protocol/Statusdat/Parser.php
index f53e8dd41..f2c2e7793 100644
--- a/library/Icinga/Protocol/Statusdat/Parser.php
+++ b/library/Icinga/Protocol/Statusdat/Parser.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/PrintableObject.php b/library/Icinga/Protocol/Statusdat/PrintableObject.php
index 5382fc88d..840a7aa2a 100644
--- a/library/Icinga/Protocol/Statusdat/PrintableObject.php
+++ b/library/Icinga/Protocol/Statusdat/PrintableObject.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/Query.php b/library/Icinga/Protocol/Statusdat/Query.php
index d80449a13..4ab7c3053 100644
--- a/library/Icinga/Protocol/Statusdat/Query.php
+++ b/library/Icinga/Protocol/Statusdat/Query.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/Query/Expression.php b/library/Icinga/Protocol/Statusdat/Query/Expression.php
index b3cb1c655..1a04f07ff 100644
--- a/library/Icinga/Protocol/Statusdat/Query/Expression.php
+++ b/library/Icinga/Protocol/Statusdat/Query/Expression.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat\Query;
diff --git a/library/Icinga/Protocol/Statusdat/Query/Group.php b/library/Icinga/Protocol/Statusdat/Query/Group.php
index cf091599a..51f4c2cf8 100644
--- a/library/Icinga/Protocol/Statusdat/Query/Group.php
+++ b/library/Icinga/Protocol/Statusdat/Query/Group.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat\Query;
diff --git a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php b/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
index 70c91f168..1dcd434df 100644
--- a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
+++ b/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat\Query;
diff --git a/library/Icinga/Protocol/Statusdat/Reader.php b/library/Icinga/Protocol/Statusdat/Reader.php
index 342e09af1..e9b767127 100644
--- a/library/Icinga/Protocol/Statusdat/Reader.php
+++ b/library/Icinga/Protocol/Statusdat/Reader.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php b/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
index bba702c79..b15dfe4bb 100644
--- a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
+++ b/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat;
diff --git a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php b/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
index b266e3ae6..4e4bc76a1 100644
--- a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
+++ b/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
@@ -1,30 +1,5 @@
 <?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\Protocol\Statusdat\View;
diff --git a/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php b/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php
index 8cdda5351..8c6fdf0bc 100644
--- a/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php
+++ b/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Statusdat\View;
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
index fcbae37f3..cf6887285 100644
--- a/library/Icinga/Test/DbTest.php
+++ b/library/Icinga/Test/DbTest.php
@@ -1,30 +1,5 @@
 <?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\Test;
diff --git a/library/Icinga/Test/FormTest.php b/library/Icinga/Test/FormTest.php
index 586db1f3c..e8b070483 100644
--- a/library/Icinga/Test/FormTest.php
+++ b/library/Icinga/Test/FormTest.php
@@ -1,30 +1,5 @@
 <?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\Test;
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 9a759e529..848877850 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/User/Message.php b/library/Icinga/User/Message.php
index 79d907d81..83d780563 100644
--- a/library/Icinga/User/Message.php
+++ b/library/Icinga/User/Message.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\User;
 
diff --git a/library/Icinga/User/Preferences.php b/library/Icinga/User/Preferences.php
index 25c5e15ce..b1dae867a 100644
--- a/library/Icinga/User/Preferences.php
+++ b/library/Icinga/User/Preferences.php
@@ -1,30 +1,5 @@
 <?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\User;
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index 575773fca..8058f0152 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -1,29 +1,7 @@
 <?php
-/**
- * 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}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 namespace Icinga\Util;
 
 /**
diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php
index f89c0b14e..4a40c4200 100644
--- a/library/Icinga/Util/ConfigAwareFactory.php
+++ b/library/Icinga/Util/ConfigAwareFactory.php
@@ -1,30 +1,5 @@
 <?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\Util;
diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 5f6700882..724b54770 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -1,30 +1,5 @@
 <?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\Util;
diff --git a/library/Icinga/Util/Dimension.php b/library/Icinga/Util/Dimension.php
index 16f617202..2f367483b 100644
--- a/library/Icinga/Util/Dimension.php
+++ b/library/Icinga/Util/Dimension.php
@@ -1,30 +1,5 @@
 <?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\Util;
diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 33c7ebd83..0658b2a57 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -1,30 +1,5 @@
 <?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\Util;
diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 434159578..b64d9e524 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -1,30 +1,5 @@
 <?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\Util;
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 59f5f61a3..111e414ad 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 8d8345a55..b28bddc37 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,30 +1,5 @@
 <?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\Controller;
diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php
index 332bccfce..98941686e 100644
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ b/library/Icinga/Web/Controller/BaseConfigController.php
@@ -1,30 +1,5 @@
 <?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\Controller;
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index e1c330413..a83b8e6c0 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -1,30 +1,5 @@
 <?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\Controller;
diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php
index 50c6955b3..2078d80b2 100644
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@@ -1,30 +1,5 @@
 <?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\Controller;
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 89566368e..55663123b 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 6e276b1b3..a1564fb27 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Form/Decorator/BootstrapForm.php b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
index 89ad82780..dfb60de2c 100644
--- a/library/Icinga/Web/Form/Decorator/BootstrapForm.php
+++ b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
index 305054a88..5d29caee4 100644
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Form/Decorator/HelpText.php b/library/Icinga/Web/Form/Decorator/HelpText.php
index fb89b310c..970da5cfb 100644
--- a/library/Icinga/Web/Form/Decorator/HelpText.php
+++ b/library/Icinga/Web/Form/Decorator/HelpText.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index c9b41c6b4..911e26322 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -1,30 +1,5 @@
 <?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\Element;
diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
index 3ac383c1b..5788c200d 100644
--- a/library/Icinga/Web/Form/Element/Note.php
+++ b/library/Icinga/Web/Form/Element/Note.php
@@ -1,30 +1,5 @@
 <?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\Element;
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 8749c07ea..d87a6d09f 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -1,30 +1,5 @@
 <?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\Element;
diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
index cc6d935ee..fb6ffb692 100644
--- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php
+++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
@@ -1,30 +1,5 @@
 <?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\Element;
diff --git a/library/Icinga/Web/Form/InvalidCSRFTokenException.php b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
index fedae1faf..4e1ae8ba7 100644
--- a/library/Icinga/Web/Form/InvalidCSRFTokenException.php
+++ b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
index 0e5756653..2b2a413fd 100644
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@@ -1,30 +1,5 @@
 <?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\Validator;
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index 214515810..952ac6c86 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -1,30 +1,5 @@
 <?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\Validator;
diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
index 7dd9ac573..1715f7fdb 100644
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@@ -1,30 +1,5 @@
 <?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\Validator;
diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php
index c20b87f3c..f05f35b27 100644
--- a/library/Icinga/Web/Form/Validator/TriStateValidator.php
+++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php
@@ -1,30 +1,5 @@
 <?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\Validator;
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index a9114df9e..1381da9c7 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -1,30 +1,5 @@
 <?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\Validator;
diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index 6f3ffc2f0..2b776daca 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
index a3493517b..28538687b 100644
--- a/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
+++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
@@ -1,30 +1,5 @@
 <?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\Hook\Configuration;
diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
index dad7a37f0..c84073e1e 100644
--- a/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
+++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
@@ -1,30 +1,5 @@
 <?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\Hook\Configuration;
diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
index ed2d77489..064bd8450 100644
--- a/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
+++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
@@ -1,30 +1,5 @@
 <?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\Hook\Configuration;
diff --git a/library/Icinga/Web/Hook/Grapher.php b/library/Icinga/Web/Hook/Grapher.php
index f5703ba2e..28de49604 100644
--- a/library/Icinga/Web/Hook/Grapher.php
+++ b/library/Icinga/Web/Hook/Grapher.php
@@ -1,30 +1,5 @@
 <?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\Hook;
diff --git a/library/Icinga/Web/Hook/Ticket.php b/library/Icinga/Web/Hook/Ticket.php
index 1ba1192b0..f9c1b495e 100644
--- a/library/Icinga/Web/Hook/Ticket.php
+++ b/library/Icinga/Web/Hook/Ticket.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Icinga Web Ticket Hook
- */
 namespace Icinga\Web\Hook;
 
 /**
diff --git a/library/Icinga/Web/Hook/TopBar.php b/library/Icinga/Web/Hook/TopBar.php
index 62f309925..d32f6d1fd 100644
--- a/library/Icinga/Web/Hook/TopBar.php
+++ b/library/Icinga/Web/Hook/TopBar.php
@@ -1,30 +1,5 @@
 <?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\Hook;
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 3b468993d..2f4ef0485 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index f292bbf2b..319982ee8 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index 941654277..47fb64af5 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 6aa60c58a..03f8f1cc5 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,30 +1,5 @@
 <?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\Paginator\Adapter;
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index 29a185299..d861dbe29 100644
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 95a5a2a37..8b09f68fb 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 962e670d3..33e0ea2a3 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index ef7887d61..58bfc70bd 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index df04183bd..0b8c1b866 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index a70ba6723..eccd127ed 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 39d14a159..8862d343f 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 84df2a18f..fedd8207a 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index ca492ce16..f47c8b193 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index ecb9c5230..830d1b76e 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 07b9caa71..b74bca41c 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index b229fc362..0d902acfd 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index cedf4da31..8ab934e0e 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index a74a6b41d..14b741e78 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php
index 715316201..e5dacd879 100644
--- a/library/Icinga/Web/ViewStream.php
+++ b/library/Icinga/Web/ViewStream.php
@@ -1,30 +1,5 @@
 <?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;
diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index 32547d238..4bb177341 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Web widget class
- */
 namespace Icinga\Web;
 
 use Icinga\Exception\ProgrammingError;
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 275a29a44..37fb7ad36 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/AlertMessageBox.php b/library/Icinga/Web/Widget/AlertMessageBox.php
index ec337f9a2..09016f490 100644
--- a/library/Icinga/Web/Widget/AlertMessageBox.php
+++ b/library/Icinga/Web/Widget/AlertMessageBox.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 0bc262ba8..8b46e77a0 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -1,30 +1,5 @@
 <?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\Widget\Chart;
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index c0b8820fa..e4621ba09 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -1,30 +1,5 @@
 <?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\Widget\Chart;
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index c997ada87..c87afa1ab 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -1,30 +1,5 @@
 <?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\Widget;
diff --git a/library/Icinga/Web/Widget/Dashboard/Component.php b/library/Icinga/Web/Widget/Dashboard/Component.php
index 3c2c41edb..c658d98c4 100644
--- a/library/Icinga/Web/Widget/Dashboard/Component.php
+++ b/library/Icinga/Web/Widget/Dashboard/Component.php
@@ -1,30 +1,5 @@
 <?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\Widget\Dashboard;
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index 24b43040d..5e3e8ffea 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -1,30 +1,5 @@
 <?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\Widget\Dashboard;
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 19410c78e..4ce6ac6e6 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php
index 19808a4b4..a2a125424 100644
--- a/library/Icinga/Web/Widget/FilterWidget.php
+++ b/library/Icinga/Web/Widget/FilterWidget.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 5b8564e3f..9c6a726ba 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index e35b82231..cce268a48 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -1,30 +1,5 @@
 <?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\Widget;
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index d330b6858..92a1a9954 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,30 +1,5 @@
 <?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\Widget;
diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
index 1c0e617ef..34514f834 100644
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@@ -1,30 +1,5 @@
 <?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\Widget\Tabextension;
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 361d06a29..3d1c97ed0 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -1,30 +1,5 @@
 <?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\Widget\Tabextension;
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index 863848aa8..46c55fad2 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -1,30 +1,5 @@
 <?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\Widget\Tabextension;
diff --git a/library/Icinga/Web/Widget/Tabextension/Tabextension.php b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
index 5d51379ef..881668d2e 100644
--- a/library/Icinga/Web/Widget/Tabextension/Tabextension.php
+++ b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
@@ -1,30 +1,5 @@
 <?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\Widget\Tabextension;
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 13cabee2a..cd480ba32 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,30 +1,5 @@
 <?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\Widget;
diff --git a/library/Icinga/Web/Widget/Widget.php b/library/Icinga/Web/Widget/Widget.php
index 2e61adcd1..3eda668ce 100644
--- a/library/Icinga/Web/Widget/Widget.php
+++ b/library/Icinga/Web/Widget/Widget.php
@@ -1,30 +1,5 @@
 <?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\Widget;
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index a2dc89eb7..3a541d3bb 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 0ea3ed6ff..d4e6875d1 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -1,6 +1,6 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/MarkdownFileIterator.php b/modules/doc/library/Doc/MarkdownFileIterator.php
index e8d982ba6..1a8f1c53c 100644
--- a/modules/doc/library/Doc/MarkdownFileIterator.php
+++ b/modules/doc/library/Doc/MarkdownFileIterator.php
@@ -1,6 +1,6 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index ad8343f40..7c659e8fb 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 320e144d7..42a377763 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index d196d29fd..69ee50d9b 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 6f2d6b7a4..4ccc30510 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php
index 70e9e5a25..bb1abcc74 100644
--- a/modules/monitoring/application/controllers/CommandController.php
+++ b/modules/monitoring/application/controllers/CommandController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index e3e90bd16..c06ded57f 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Exception;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3c08b5e76..ec46b8172 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
diff --git a/modules/monitoring/application/controllers/MonitoringCommands.php b/modules/monitoring/application/controllers/MonitoringCommands.php
index 3eb065d5d..0a94c17b2 100644
--- a/modules/monitoring/application/controllers/MonitoringCommands.php
+++ b/modules/monitoring/application/controllers/MonitoringCommands.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use \Icinga\Module\Monitoring\Command\Meta;
diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php
index 28661d54b..a623dd88b 100644
--- a/modules/monitoring/application/controllers/MultiController.php
+++ b/modules/monitoring/application/controllers/MultiController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Web\Form;
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 4a606aade..49f5715b1 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 4008ce318..d7d14ce15 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Application\Benchmark;
diff --git a/modules/monitoring/application/forms/Command/AcknowledgeForm.php b/modules/monitoring/application/forms/Command/AcknowledgeForm.php
index 31dc2a799..364c3c20a 100644
--- a/modules/monitoring/application/forms/Command/AcknowledgeForm.php
+++ b/modules/monitoring/application/forms/Command/AcknowledgeForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 04a1430a4..df1bed008 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/CommentForm.php b/modules/monitoring/application/forms/Command/CommentForm.php
index fa3c71a36..497c276f1 100644
--- a/modules/monitoring/application/forms/Command/CommentForm.php
+++ b/modules/monitoring/application/forms/Command/CommentForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/CustomNotificationForm.php b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
index f1c078e33..9eb75a67b 100644
--- a/modules/monitoring/application/forms/Command/CustomNotificationForm.php
+++ b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/DelayNotificationForm.php b/modules/monitoring/application/forms/Command/DelayNotificationForm.php
index e5aecf131..efb6eae0f 100644
--- a/modules/monitoring/application/forms/Command/DelayNotificationForm.php
+++ b/modules/monitoring/application/forms/Command/DelayNotificationForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php b/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
index 0dbbeb4bb..d6657dd37 100644
--- a/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
+++ b/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php b/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
index 3b30574ff..6d49580a0 100644
--- a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
+++ b/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php b/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
index c65339019..cb7ab90f1 100644
--- a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
+++ b/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
index 2e2b63c55..593654c02 100644
--- a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
+++ b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php b/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
index 68b868df1..7333ccdac 100644
--- a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
index 768282ee5..de2965565 100644
--- a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
+++ b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php b/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
index cb9bd5892..5ae69173e 100644
--- a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
+++ b/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Command;
diff --git a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
index 1c5bd25d4..513dea238 100644
--- a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Config\Backend;
diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
index 9f077bdf5..6a9e17bd5 100644
--- a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
+++ b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Config;
diff --git a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
index 3c8cc2520..705804bb9 100644
--- a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Config\Instance;
diff --git a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
index 261fbccc1..e2a091c0f 100644
--- a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Form\Config\Instance;
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index c2e50494e..19912d3d6 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/modules/monitoring/application/views/helpers/CommandForm.php b/modules/monitoring/application/views/helpers/CommandForm.php
index a5e9557d6..fd0ffd581 100644
--- a/modules/monitoring/application/views/helpers/CommandForm.php
+++ b/modules/monitoring/application/views/helpers/CommandForm.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Web\Form;
diff --git a/modules/monitoring/application/views/helpers/ContactFlags.php b/modules/monitoring/application/views/helpers/ContactFlags.php
index 367f2d47d..da2b2823a 100644
--- a/modules/monitoring/application/views/helpers/ContactFlags.php
+++ b/modules/monitoring/application/views/helpers/ContactFlags.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_ContactFlags extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
index 2b4252047..f543fac59 100644
--- a/modules/monitoring/application/views/helpers/MonitoringFlags.php
+++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /*use Icinga\Module\Monitoring\Object\AbstractObject;*/
diff --git a/modules/monitoring/application/views/helpers/MonitoringProperties.php b/modules/monitoring/application/views/helpers/MonitoringProperties.php
index e89939cb2..ed52c5a04 100644
--- a/modules/monitoring/application/views/helpers/MonitoringProperties.php
+++ b/modules/monitoring/application/views/helpers/MonitoringProperties.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 use Icinga\Module\Monitoring\Object\AbstractObject;
diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php
index 2051975b7..935578ca5 100644
--- a/modules/monitoring/application/views/helpers/MonitoringState.php
+++ b/modules/monitoring/application/views/helpers/MonitoringState.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 1b69b2c0e..3cd36c46f 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/ResolveComments.php b/modules/monitoring/application/views/helpers/ResolveComments.php
index 62f524dd9..6f62ee1d2 100644
--- a/modules/monitoring/application/views/helpers/ResolveComments.php
+++ b/modules/monitoring/application/views/helpers/ResolveComments.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 // TODO: Throw away as soon as our backends are handling things better
 class Zend_View_Helper_ResolveComments extends Zend_View_Helper_Abstract
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index e88a9e918..b0f007b19 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_View_Helper_Abstract;
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index 5e95dc792..fa9b639a8 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 /**
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
index 71ffee8ff..0b4254522 100644
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ b/modules/monitoring/application/views/helpers/SelectionToolbar.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php b/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php
index b1e7f96e2..d7612ac30 100644
--- a/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php
+++ b/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_RenderServicePerfdata extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/bin/action/list.inc.php b/modules/monitoring/bin/action/list.inc.php
index e49b6a71f..65a0ca61d 100644
--- a/modules/monitoring/bin/action/list.inc.php
+++ b/modules/monitoring/bin/action/list.inc.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Icinga\Module\Monitoring\Backend;
 use Icinga\Util\Format;
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 02849632e..ffd769482 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 // TODO: We need to define a useful permission set for this module, the
 //       list provided here is just an example
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
index 0baf39d2c..811eb7f28 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 9c9633753..7ec76d4a8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index 3d3ffdf65..8149c1c67 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index 7b3929f3e..e3231d932 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index a86505957..a868d5479 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index b267f39b7..aef50ebdb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index 4cb7ff8fe..6a3d9a987 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 19bda6ba3..324d72c4c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index 75998e3de..5d600be03 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 4dc165a60..e5a1bb8dc 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index c4f7f753e..2d5a0a2d8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 66f4faabe..914441d03 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 81712bdff..eedb2f1e9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index bab12ba39..691f2e076 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 4d4bf82dc..f0f927487 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index d9a6c641f..68a37d83c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 7abb466ca..e557f4c7b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index 9ae4a1525..e6abd4f77 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
index ba550ed54..cf3b6ea6d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
index b259562b1..479142547 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index ac3ad16e7..84ad94b86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
index 4521f59be..cdaee0697 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index fffd0d4e5..81d7e662c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index f9e83b9b8..2edd81896 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index 0338969ed..ce61c8f1b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Ido\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index cdca2e8ae..20ffe57e5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace \Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php
index 82ac36933..27b554ec8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php
index f69b18452..d4ea895e3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php
index 0f9f7806e..11b7f4b44 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php
index 9e4663ee2..d0d8e1eaa 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
index 77b833ffb..1168d6da3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php
index 315db7862..3855375c2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
index 810a87fcc..48ee82284 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php
index a08243ec7..8d3f9a4ec 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
index cf76f7744..cd712d801 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
index dabc7026e..86a7310d0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
index d17468bd3..e78942f4c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
@@ -1,11 +1,6 @@
 <?php
-/**
- * Created by JetBrains PhpStorm.
- * User: moja
- * Date: 7/17/13
- * Time: 1:29 PM
- * To change this template use File | Settings | File Templates.
- */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php
index fdfc46e20..6f1e87f89 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php
index 5e6abb4cb..33b006c86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Backend\Statusdat\Query;
diff --git a/modules/monitoring/library/Monitoring/Cli/CliUtils.php b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
index fd894aeb9..5b443c714 100644
--- a/modules/monitoring/library/Monitoring/Cli/CliUtils.php
+++ b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Cli;
 
diff --git a/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php b/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
index 8e047751b..641a2ae73 100644
--- a/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/AcknowledgeCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
index 703735c25..0464d5cb2 100644
--- a/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/AddCommentCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
index 97e55c3d3..21cf22520 100644
--- a/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/CustomNotificationCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
index 67c0823b5..7f8dcf749 100644
--- a/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/DelayNotificationCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php b/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
index 5c91f0411..d6fb6322a 100644
--- a/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/DisableNotificationWithExpireCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php b/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
index 14b8d4794..7908e637d 100644
--- a/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/ScheduleCheckCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php
index 50b55ed8a..e1d79ddce 100644
--- a/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/ScheduleDowntimeCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php b/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
index 162c8f3ef..27fecd48d 100644
--- a/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/SingleArgumentCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php b/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php
index ce79ece2f..262987de1 100644
--- a/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/SubmitPassiveCheckresultCommand.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Command;
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index fd1358c12..db7aabb92 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring;
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 1047854a0..4d62fd27c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index d095e2982..7d24d1255 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index e1f907fd0..870a5407b 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 2790d4fad..582064c16 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 5d8301749..b8ccbb852 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 73eb5c547..8bd97673a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index b1b76459b..09779b27d 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index dc1a2ed4b..a623dab45 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 9bf1f97a1..60f224264 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index fc5090b65..94fc7ac56 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index cf2882c06..6156a5f15 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Programstatus.php b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
index a5326bbdd..f42858bf8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Programstatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
index 1ea362b49..d9d15a517 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
index 2b41c3957..dbdd338c0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 108261b89..b81b56764 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index d3f65d79c..00a6f7d5f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php b/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php
index 0f2a27837..0c7ca68a5 100644
--- a/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index efba4e37d..74574bc72 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index 0213118a2..f9ad28654 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
index c1d0dc4de..b0cd1b445 100644
--- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
+++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
@@ -1,30 +1,5 @@
 <?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}}}
 
 
diff --git a/modules/monitoring/library/Monitoring/Object/AbstractObject.php b/modules/monitoring/library/Monitoring/Object/AbstractObject.php
index 17be0cacf..73314fbc9 100644
--- a/modules/monitoring/library/Monitoring/Object/AbstractObject.php
+++ b/modules/monitoring/library/Monitoring/Object/AbstractObject.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /*
 CREATE INDEX tgelf_comments ON icinga_comments (object_id, comment_type, comment_time);
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 69877c66f..8dbe1176e 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 8a48b89e0..598bb384d 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index 3f900d7a1..ad53f7756 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php b/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
index 9fa981c99..32efaca9a 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
@@ -1,30 +1,5 @@
 <?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\Module\Monitoring\Web\Hook;
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index d7e3dbe38..c11b18414 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 table.action.comments td p, table.action.downtimes td p {
   margin: 0;
   font-size: 0.8em;
diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index ea31f18d8..b3ba863ff 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga) {
 
diff --git a/modules/monitoring/run.php b/modules/monitoring/run.php
index 51ca985c7..8f4ee1b67 100644
--- a/modules/monitoring/run.php
+++ b/modules/monitoring/run.php
@@ -1,10 +1,6 @@
 <?php
-/*
- * run.php
- *
- * This file runs every request to register runtime functionality
- *
- */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 $this->registerHook(
     'TopBar',
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index be4f6b4f9..77116d74a 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Clicommands;
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 9da6cc9e5..78b58f55c 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Clicommands;
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index 08223cbbb..2cdc875ec 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Cli;
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index aa1aaa5db..895e01fa5 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -1,30 +1,5 @@
 <?php
 // {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
 // {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Util;
diff --git a/packages/files/public/index.php b/packages/files/public/index.php
index 77953b1b6..1acee9445 100644
--- a/packages/files/public/index.php
+++ b/packages/files/public/index.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 define('ICINGAWEB_APPDIR', dirname(__DIR__) . '/application');
 require_once 'Icinga/Application/webrouter.php';
diff --git a/packages/rhel/usr/share/icingaweb/public/index.php b/packages/rhel/usr/share/icingaweb/public/index.php
index 7dd0fd899..be6847bc8 100644
--- a/packages/rhel/usr/share/icingaweb/public/index.php
+++ b/packages/rhel/usr/share/icingaweb/public/index.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 require_once dirname(__DIR__). '/library/Icinga/Application/webrouter.php';
 
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index ce79911cf..34f1f110d 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /*** Base rules ***/
 * {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 54aa7937a..870d89494 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 div.config-form-buttons {
   margin-top: 5px;
diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index 2fb862ff0..e1f3a7bce 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #header div.user {
   font-size: 1.1em;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index 0c54e4a12..9399dfa09 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /* Layout colors */
 
 #sidebar {
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 78b359a70..6319e65d1 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /** Default layout **/
 html {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index dd25c67e0..9f22fa60d 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #login {
   width: 100%;
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 0e6891a4f..e626aad22 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 code {
   background-color: #eee;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index b176b05fe..1f30b4c46 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #menu {
   max-height: 100%;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 0e16a5253..c7a1c7054 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /* Special tables and states */
 
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index 899f34a2f..ac9ea9372 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 ul.pagination {
   font-size: 0.68em;
   padding: 0;
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index 91d83fbc4..81170bab9 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 div.selection-toolbar {
   float: right;
   padding-right: 20px;
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 2999a1928..ed846fc9d 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 ul.tabs {
   margin: 0;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 41221e9c2..f68925cc0 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 table.historycolorgrid {
   font-size: 1.5em;
 }
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index bb560c1f7..874a5e518 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 .controls form, .controls .pagination, .controls > .tabs, .dontprint, .inlinepie {
   display: none !important;
 }
diff --git a/public/index.php b/public/index.php
index 69b3dfce8..171581155 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,3 +1,5 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 require_once dirname(__DIR__). '/library/Icinga/Application/webrouter.php';
diff --git a/public/js/helpers.js b/public/js/helpers.js
index 849df2b63..082689e40 100644
--- a/public/js/helpers.js
+++ b/public/js/helpers.js
@@ -1,3 +1,5 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function (Object) {
 
diff --git a/public/js/icinga.js b/public/js/icinga.js
index 687520f04..b0b1977b3 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga starts here.
  *
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e56fe47d4..8dcd0f516 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.Events
  *
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 121bfbb17..dded86379 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.History
  *
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 7c04c6140..b871b4362 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.Loader
  *
diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js
index 706f57adc..1bdc2d718 100644
--- a/public/js/icinga/logger.js
+++ b/public/js/icinga/logger.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.Logger
  *
diff --git a/public/js/icinga/module.js b/public/js/icinga/module.js
index f43dfbd42..047911434 100644
--- a/public/js/icinga/module.js
+++ b/public/js/icinga/module.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * This is how we bootstrap JS code in our modules
  */
diff --git a/public/js/icinga/timer.js b/public/js/icinga/timer.js
index 07160b5d9..8d90f7c5c 100644
--- a/public/js/icinga/timer.js
+++ b/public/js/icinga/timer.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.Timer
  *
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 3169eba82..e9f3d741c 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga.UI
  *
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index c279f5508..4ce5e5917 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -1,3 +1,6 @@
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 /**
  * Icinga utility functions
  */
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index 4978a1788..fd74e49d6 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 $applicationPath = realpath(dirname(__FILE__) . '/../../application/');
 $modulePath = realpath(dirname(__FILE__) . '/../../modules/');
diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
index fc2f1cda6..bdb719f8c 100644
--- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
+++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index 9d8c3ed60..cc91522dd 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Data;
 

From c7c2ad3790c1eb62f9cf7540eaf66fbe658fdc83 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 15 Jul 2014 14:54:57 +0200
Subject: [PATCH 10/43] Improve preference changeset calculation

The calculation is still subject to the concrete writer implementation as its
parent Icinga\User\Preferences\PreferencesStore is only an abstraction
layer without any knowledge how the data is actually stored so it is not able
to determine how to handle differences.

fixes #6220
---
 library/Icinga/User/Preferences/Store/DbStore.php  | 12 ++++--------
 library/Icinga/User/Preferences/Store/IniStore.php |  7 +------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index 54d1f9380..728637a35 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -107,14 +107,10 @@ class DbStore extends PreferencesStore
             $this->insert($toBeInserted);
         }
 
-        $current = $this->preferences;
-        $toBeUpdated = array();
-        foreach (array_filter(
-            array_keys(array_intersect_key($preferences, $this->preferences)),
-            function ($k) use ($current, $preferences) { return $current[$k] == $preferences[$k] ? false : true; }
-        ) as $key) {
-            $toBeUpdated[$key] = $preferences[$key];
-        }
+        $toBeUpdated = array_intersect_key(
+            array_diff_assoc($preferences, $this->preferences),
+            array_diff_assoc($this->preferences, $preferences)
+        );
         if (!empty($toBeUpdated)) {
             $this->update($toBeUpdated);
         }
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index 7b7d58503..eb1c4cbfb 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -81,12 +81,7 @@ class IniStore extends PreferencesStore
     public function save(Preferences $preferences)
     {
         $preferences = $preferences->toArray();
-        $this->update(
-            array_merge(
-                array_diff_key($preferences, $this->preferences),
-                array_intersect_key($preferences, $this->preferences)
-            )
-        );
+        $this->update(array_diff_assoc($preferences, $this->preferences));
         $this->delete(array_keys(array_diff_key($this->preferences, $preferences)));
         $this->write();
     }

From 4c415aac5caa26effafa82aaa92a91625b30c1f8 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 15 Jul 2014 16:16:11 +0200
Subject: [PATCH 11/43] Make contacts' view look more like contactgroups' view

---
 .../views/scripts/list/contacts.phtml         | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 4d3ee0a55..0eb56f37c 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -5,31 +5,37 @@ $contactHelper = $this->getHelper('ContactFlags');
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em">
-        <?=  $this->sortControl->render($this); ?>
+        <?= $this->sortControl->render($this); ?>
     </div>
-    <?=  $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
+    <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content contacts">
-    <table data-base-target="_next" class="action">
-        <tbody>
+    <?php
+    if (count($contacts) === 0) {
+        echo t('No contacts matching the filter');
+    }
+    foreach ($contacts as $contact):
+        $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
+        <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
+            <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
+                 style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
+            <strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>)
             <?php
-            if (count($contacts) === 0) {
-                echo t('No contacts matching the filter');
-            }
-            foreach($contacts as $contact):
-                $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
-                <tr>
-                    <td><?= $contact->contact_name ?></td>
-                    <td><?= $contact->contact_alias ?></td>
-                    <td><?= $contact->contact_email ?></td>
-                    <td><?= $contact->contact_pager ?></td>
-                    <td><?= $contactHelper->contactFlags($contact, 'service') ?></td>
-                    <td><?= $contactHelper->contactFlags($contact, 'host') ?></td>
-                    <td><?= $contact->contact_notify_service_timeperiod ?></td>
-                    <td><?= $contact->contact_notify_host_timeperiod ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
+            foreach (array(
+                $contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>',
+                $contact->contact_pager => 'Pager: %s',
+                $contact->contact_notify_service_timeperiod => 'Service notification period: %s',
+                $contact->contact_notify_host_timeperiod => 'Host notification period: %s'
+            ) as $value => $format):
+                if ($value): ?>
+                    <br />
+                    <?php
+                    printf($format, $value);
+                endif;
+            endforeach;
+            ?>
+            <div class="clearfix"></div>
+        </div>
+    <?php endforeach; ?>
 </div>

From 8086292b1bd844b3a9f3377c7f0fc2521c9e197f Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Tue, 15 Jul 2014 18:00:52 +0200
Subject: [PATCH 12/43] Small fixes

---
 .../application/controllers/ListController.php  |  4 ++--
 .../views/scripts/list/contactgroups.phtml      |  7 +++----
 .../views/scripts/list/contacts.phtml           | 17 ++++++++++-------
 .../views/scripts/list/downtimes.phtml          |  7 +++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ec46b8172..21361c340 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
+            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
-            $stateType = 'soft';
         }
 
         $this->addTitleTab('hosts');
@@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
             }
         }
         $this->setAutorefreshInterval(10);
-        
+
         $columns = array_merge(array(
             'host_name',
             'host_state',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index b29a5ab15..98661f4e6 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -10,9 +10,8 @@
 if (count($groupData) === 0) {
     echo t('No contacts matching the filter');
 }
-?>
 
-<?php foreach ($groupData as $groupName => $groupInfo): ?>
+foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
@@ -31,8 +30,8 @@ if (count($groupData) === 0) {
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
-<?php endif ?>
-<?php if ($c->contact_pager): ?>
+<?php endif;
+if ($c->contact_pager): ?>
                         <br />
                         <?= $c->contact_pager; ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 0eb56f37c..55d164d04 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -10,7 +10,7 @@ $contactHelper = $this->getHelper('ContactFlags');
     <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
-<div class="content contacts">
+<div data-base-target="_next" class="content contacts">
     <?php
     if (count($contacts) === 0) {
         echo t('No contacts matching the filter');
@@ -20,14 +20,17 @@ $contactHelper = $this->getHelper('ContactFlags');
         <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
             <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
                  style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
-            <strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>)
+            <a href="<?= $this->href(
+                'monitoring/show/contact',
+                array('contact' => $contact->contact_name)
+            ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
             <?php
             foreach (array(
-                $contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>',
-                $contact->contact_pager => 'Pager: %s',
-                $contact->contact_notify_service_timeperiod => 'Service notification period: %s',
-                $contact->contact_notify_host_timeperiod => 'Host notification period: %s'
-            ) as $value => $format):
+                'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
+                'Pager: %s'                             => $contact->contact_pager,
+                'Service notification period: %s'       => $contact->contact_notify_service_timeperiod,
+                'Host notification period: %s'          => $contact->contact_notify_host_timeperiod
+            ) as $format => $value):
                 if ($value): ?>
                     <br />
                     <?php
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 6a6e7a3f6..995a66001 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em">
-<?=  $this->sortControl->render($this); ?>
+<?= $this->sortControl->render($this); ?>
 </div>
-<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content downtimes">
@@ -16,8 +16,7 @@ $helper = $this->getHelper('CommandForm');
 if (count($downtimes) === 0) {
     echo t('No downtimes matching the filter');
 }
-?>
-<?php foreach ($this->downtimes as $downtime): ?>
+foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>
     <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -

From 19f05256a07bc70f0145371dbf46002ca60cba40 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 09:33:49 +0200
Subject: [PATCH 13/43] Only call session_start() when reading from session

fixes #6383
---
 library/Icinga/Authentication/Manager.php | 13 ++++++------
 library/Icinga/Web/Notification.php       |  7 ++++--
 library/Icinga/Web/Session/PhpSession.php | 26 +++++++++++++++++------
 library/Icinga/Web/Session/Session.php    |  7 ++++++
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 5b9f57e4e..642efa3c4 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -27,7 +27,7 @@ class Manager
      * Authenticated user
      *
      * @var User
-     **/
+     */
     private $user;
 
     /**
@@ -96,25 +96,24 @@ class Manager
         );
         $this->user = $user;
         if ($persist == true) {
-            $session = Session::getSession();
-            $session->refreshId();
             $this->persistCurrentUser();
         }
     }
 
     /**
      * Writes the current user to the session
-     **/
+     */
     public function persistCurrentUser()
     {
         $session = Session::getSession();
         $session->set('user', $this->user);
         $session->write();
+        $session->refreshId();
     }
 
     /**
      * Tries to authenticate the user with the current session
-     **/
+     */
     public function authenticateFromSession()
     {
         $this->user = Session::getSession()->get('user');
@@ -189,7 +188,7 @@ class Manager
      * Returns the current user or null if no user is authenticated
      *
      * @return User
-     **/
+     */
     public function getUser()
     {
         return $this->user;
@@ -200,7 +199,7 @@ class Manager
      *
      * @return  array
      * @see     User::getGroups
-     **/
+     */
     public function getGroups()
     {
         return $this->user->getGroups();
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index 47fb64af5..3dd04c615 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -100,8 +100,11 @@ class Notification
     {
         $session = Session::getSession();
         $msgs = $session->messages;
-        $session->messages = array();
-        $session->write();
+        if (false === empty($msgs)) {
+            $session->messages = array();
+            $session->write();
+        }
+
         return $msgs;
     }
 
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 0b8c1b866..729710bce 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -5,7 +5,7 @@
 namespace Icinga\Web\Session;
 
 use Icinga\Logger\Logger;
-use \Icinga\Exception\ConfigurationError;
+use Icinga\Exception\ConfigurationError;
 
 /**
  * Session implementation in PHP
@@ -24,21 +24,21 @@ class PhpSession extends Session
      *
      * @var bool
      */
-    private $hasBeenTouched = false;
+    protected $hasBeenTouched = false;
 
     /**
      * Name of the session
      *
      * @var string
      */
-    private $sessionName = 'Icingaweb2';
+    protected $sessionName = 'Icingaweb2';
 
     /**
      * Configuration for cookie options
      *
      * @var array
      */
-    private static $defaultCookieOptions = array(
+    protected static $defaultCookieOptions = array(
         'use_trans_sid'             => false,
         'use_cookies'               => true,
         'cookie_httponly'           => true,
@@ -82,13 +82,16 @@ class PhpSession extends Session
             throw new ConfigurationError('Can\'t save session');
         }
 
-        $this->read();
+        if ($this->exists()) {
+            // We do not want to start a new session here if there is not any
+            $this->read();
+        }
     }
 
     /**
      * Open a PHP session
      */
-    private function open()
+    protected function open()
     {
         session_name($this->sessionName);
 
@@ -171,7 +174,7 @@ class PhpSession extends Session
     /**
      * Remove session cookies
      */
-    private function clearCookies()
+    protected function clearCookies()
     {
         if (ini_get('session.use_cookies')) {
             Logger::debug('Clear session cookie');
@@ -196,5 +199,14 @@ class PhpSession extends Session
         $this->open();
         session_regenerate_id();
         session_write_close();
+        $this->hasBeenTouched = true;
+    }
+
+    /**
+     * @see Session::exists()
+     */
+    public function exists()
+    {
+        return isset($_COOKIE[$this->sessionName]);
     }
 }
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index eccd127ed..8ae45755e 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -37,6 +37,13 @@ abstract class Session extends SessionNamespace
         throw new NotImplementedError('You are required to implement write() in your session implementation');
     }
 
+    /**
+     * Return whether a session exists
+     *
+     * @return  bool
+     */
+    abstract public function exists();
+
     /**
      * Purge session
      */

From b40027b6c750da49ce8ef3e3ee9a69325f3cdb4e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 09:35:32 +0200
Subject: [PATCH 14/43] Purge session when logging out

fixes #6739
---
 library/Icinga/Authentication/Manager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 642efa3c4..01964ef00 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -176,12 +176,12 @@ class Manager
     }
 
     /**
-     * Purges the current authorization information and removes the user from the session
-     **/
+     * Purges the current authorization information and session
+     */
     public function removeAuthorization()
     {
         $this->user = null;
-        $this->persistCurrentUser();
+        Session::getSession()->purge();
     }
 
     /**

From e6dee9fe89d171acee17733813e90029abaf4eb0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 09:54:58 +0200
Subject: [PATCH 15/43] Protect login against CSRF

refs #5626
---
 application/forms/Authentication/LoginForm.php | 6 ------
 library/Icinga/Web/Form.php                    | 3 ++-
 library/Icinga/Web/Session/PhpSession.php      | 9 +++++++++
 library/Icinga/Web/Session/Session.php         | 7 +++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index fa39af35f..9955c92d1 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -11,12 +11,6 @@ use Icinga\Web\Form;
  */
 class LoginForm extends Form
 {
-    /**
-     * Disable CSRF protection
-     * @var bool
-     */
-    protected $tokenDisabled = true;
-
     /**
      * Interface how the form should be created
      */
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index a1564fb27..d6f07cd3a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -10,6 +10,7 @@ use Zend_Config;
 use Zend_Form_Element_Submit;
 use Zend_Form_Element_Reset;
 use Zend_View_Interface;
+use Icinga\Web\Session;
 use Icinga\Web\Form\Element\Note;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Form\Decorator\HelpText;
@@ -112,7 +113,7 @@ class Form extends Zend_Form
     public function getSessionId()
     {
         if (!$this->sessionId) {
-            $this->sessionId = session_id();
+            $this->sessionId = Session::getSession()->getId();
         }
 
         return $this->sessionId;
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 729710bce..355d31186 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -191,6 +191,15 @@ class PhpSession extends Session
         }
     }
 
+    /**
+     * @see Session::getId()
+     */
+    public function getId()
+    {
+        $this->open(); // Make sure we actually get a id
+        return session_id();
+    }
+
     /**
      * Assign a new sessionId to the currently active session
      */
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index 8ae45755e..0c60d7f98 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -54,6 +54,13 @@ abstract class Session extends SessionNamespace
      */
     abstract public function refreshId();
 
+    /**
+     * Return the id of this session
+     *
+     * @return  string
+     */
+    abstract public function getId();
+
     /**
      * Get or create a new session namespace
      *

From e5fdf78c98d8ab1053a4e5ffeea3d7385e6c8a8f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 10:18:00 +0200
Subject: [PATCH 16/43] Fix testing errors due to accessing the session id by
 using our container

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

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 50f7bc1b9..b72bdee62 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -317,6 +317,7 @@ namespace Icinga\Test {
             $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->setSessionId('1234');
             $form->initCsrfToken();
             $token = $form->getValue($form->getTokenElementName());
             if ($token !== null) {

From cb04c42bab5538c1d07413f09cf66b15153fba45 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Wed, 16 Jul 2014 13:10:28 +0200
Subject: [PATCH 17/43] Use htmlspecialchars to prevent attacks

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

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 55d164d04..642fd7b57 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -34,7 +34,7 @@ $contactHelper = $this->getHelper('ContactFlags');
                 if ($value): ?>
                     <br />
                     <?php
-                    printf($format, $value);
+                    printf($format, htmlspecialchars($value));
                 endif;
             endforeach;
             ?>

From f1d7cd8b505dc066f3660621a72934a0c65f766e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 13:59:43 +0200
Subject: [PATCH 18/43] Remove forgotten coding standards annotation

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

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index db7aabb92..32bafb8b2 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -61,4 +61,4 @@ class Controller extends ModuleActionController
         }
     }
 }
-// @codingStandardsIgnoreEnd
+

From eb977b7a5544427b3f3b77cdd8c91332b2c7c1c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 15:17:14 +0200
Subject: [PATCH 19/43] Fix wrong variable assignment causing preferred
 languages not being set

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

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 8ee18771d..2b45ad683 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -322,7 +322,7 @@ class Web extends ApplicationBootstrap
     {
         parent::setupInternationalization();
         if ($this->user !== null && $this->user->getPreferences() !== null
-            && ($locale = $this->user->getPreferences()->get('app.language') !== null)
+            && (($locale = $this->user->getPreferences()->get('app.language')) !== null)
         ) {
             try {
                 Translator::setupLocale($locale);

From 1ad263170e7e316ed9d56990fb3dae4a6d45b434 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Wed, 16 Jul 2014 15:30:20 +0200
Subject: [PATCH 20/43] Revert "Small fixes"

This reverts commit 8086292b1bd844b3a9f3377c7f0fc2521c9e197f.

The commit included too many changes.
---
 .../application/controllers/ListController.php  |  4 ++--
 .../views/scripts/list/contactgroups.phtml      |  7 ++++---
 .../views/scripts/list/contacts.phtml           | 17 +++++++----------
 .../views/scripts/list/downtimes.phtml          |  7 ++++---
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 21361c340..ec46b8172 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
-            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
+            $stateType = 'soft';
         }
 
         $this->addTitleTab('hosts');
@@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
             }
         }
         $this->setAutorefreshInterval(10);
-
+        
         $columns = array_merge(array(
             'host_name',
             'host_state',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 98661f4e6..b29a5ab15 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -10,8 +10,9 @@
 if (count($groupData) === 0) {
     echo t('No contacts matching the filter');
 }
+?>
 
-foreach ($groupData as $groupName => $groupInfo): ?>
+<?php foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
@@ -30,8 +31,8 @@ foreach ($groupData as $groupName => $groupInfo): ?>
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
-<?php endif;
-if ($c->contact_pager): ?>
+<?php endif ?>
+<?php if ($c->contact_pager): ?>
                         <br />
                         <?= $c->contact_pager; ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 642fd7b57..fff475cc4 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -10,7 +10,7 @@ $contactHelper = $this->getHelper('ContactFlags');
     <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
-<div data-base-target="_next" class="content contacts">
+<div class="content contacts">
     <?php
     if (count($contacts) === 0) {
         echo t('No contacts matching the filter');
@@ -20,17 +20,14 @@ $contactHelper = $this->getHelper('ContactFlags');
         <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
             <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
                  style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
-            <a href="<?= $this->href(
-                'monitoring/show/contact',
-                array('contact' => $contact->contact_name)
-            ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
+            <strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>)
             <?php
             foreach (array(
-                'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
-                'Pager: %s'                             => $contact->contact_pager,
-                'Service notification period: %s'       => $contact->contact_notify_service_timeperiod,
-                'Host notification period: %s'          => $contact->contact_notify_host_timeperiod
-            ) as $format => $value):
+                $contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>',
+                $contact->contact_pager => 'Pager: %s',
+                $contact->contact_notify_service_timeperiod => 'Service notification period: %s',
+                $contact->contact_notify_host_timeperiod => 'Host notification period: %s'
+            ) as $value => $format):
                 if ($value): ?>
                     <br />
                     <?php
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 995a66001..6a6e7a3f6 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em">
-<?= $this->sortControl->render($this); ?>
+<?=  $this->sortControl->render($this); ?>
 </div>
-<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content downtimes">
@@ -16,7 +16,8 @@ $helper = $this->getHelper('CommandForm');
 if (count($downtimes) === 0) {
     echo t('No downtimes matching the filter');
 }
-foreach ($this->downtimes as $downtime): ?>
+?>
+<?php foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>
     <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -

From 5c507d5d912b01141c014ab07d0a5d3d5929732b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 16 Jul 2014 15:38:39 +0200
Subject: [PATCH 21/43] Fix notice that the session has been already started
 after retrieving its id

---
 library/Icinga/Web/Session/PhpSession.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 355d31186..65f940a13 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -196,8 +196,15 @@ class PhpSession extends Session
      */
     public function getId()
     {
-        $this->open(); // Make sure we actually get a id
-        return session_id();
+        if (($id = session_id()) === '') {
+            // Make sure we actually get a id
+            $this->open();
+            session_write_close();
+            $this->hasBeenTouched = true;
+            $id = session_id();
+        }
+
+        return $id;
     }
 
     /**

From bfc54b7e32fc1e0bb9ddcc8dd0a3ea16bd0d4d6f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Wed, 16 Jul 2014 15:16:05 +0200
Subject: [PATCH 22/43] Fix array conversion of the Dashboard and its
 Components

Do not omit the parameters when converting the dashboard components to
an array. Add an array conversion to the UrlParams class.

refs #6691
---
 library/Icinga/Web/Url.php                        | 4 ++--
 library/Icinga/Web/UrlParams.php                  | 5 +++++
 library/Icinga/Web/Widget/Dashboard/Component.php | 5 ++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index f47c8b193..c9da962be 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -22,7 +22,7 @@ class Url
     /**
      * An array of all parameters stored in this Url
      *
-     * @var array
+     * @var UrlParams
      */
     protected $params;
 
@@ -335,7 +335,7 @@ class Url
      */
     public function getParams()
     {
-        return $this->params;
+        return $this->params->asArray();
     }
 
     /**
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 830d1b76e..9a8b60929 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -310,6 +310,11 @@ class UrlParams
         }
     }
 
+    public function asArray()
+    {
+        return $this->params;
+    }
+
     public function __toString()
     {
         $parts = array();
diff --git a/library/Icinga/Web/Widget/Dashboard/Component.php b/library/Icinga/Web/Widget/Dashboard/Component.php
index c658d98c4..8bac34359 100644
--- a/library/Icinga/Web/Widget/Dashboard/Component.php
+++ b/library/Icinga/Web/Widget/Dashboard/Component.php
@@ -126,10 +126,9 @@ EOD;
     public function toArray()
     {
         $array = array('url' => $this->url->getPath());
-        foreach ($this->url->getParams() as $key => $value) {
-            $array[$key] = $value;
+        foreach ($this->url->getParams() as $param) {
+            $array[$param[0]] = $param[1];
         }
-
         return $array;
     }
 

From 62da942159f20bb1a61fdaaa5ec6974c81b0ca61 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Wed, 16 Jul 2014 17:49:25 +0200
Subject: [PATCH 23/43] Don't close and re-open php tags, remove unneeded
 spaces

To close and re-open php tags makes no sense if there's nothing between them
---
 .../monitoring/application/controllers/ListController.php  | 4 ++--
 .../application/views/scripts/list/contactgroups.phtml     | 7 +++----
 .../application/views/scripts/list/downtimes.phtml         | 7 +++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ec46b8172..21361c340 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
+            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
-            $stateType = 'soft';
         }
 
         $this->addTitleTab('hosts');
@@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
             }
         }
         $this->setAutorefreshInterval(10);
-        
+
         $columns = array_merge(array(
             'host_name',
             'host_state',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index b29a5ab15..98661f4e6 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -10,9 +10,8 @@
 if (count($groupData) === 0) {
     echo t('No contacts matching the filter');
 }
-?>
 
-<?php foreach ($groupData as $groupName => $groupInfo): ?>
+foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
@@ -31,8 +30,8 @@ if (count($groupData) === 0) {
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
-<?php endif ?>
-<?php if ($c->contact_pager): ?>
+<?php endif;
+if ($c->contact_pager): ?>
                         <br />
                         <?= $c->contact_pager; ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 6a6e7a3f6..995a66001 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em">
-<?=  $this->sortControl->render($this); ?>
+<?= $this->sortControl->render($this); ?>
 </div>
-<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content downtimes">
@@ -16,8 +16,7 @@ $helper = $this->getHelper('CommandForm');
 if (count($downtimes) === 0) {
     echo t('No downtimes matching the filter');
 }
-?>
-<?php foreach ($this->downtimes as $downtime): ?>
+foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>
     <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -

From b23e36aa1a0ce3bb25f46609b7f91df685970b76 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Wed, 16 Jul 2014 17:53:20 +0200
Subject: [PATCH 24/43] Swap array keys and values

Non-hardcoded keys may be not unique
---
 .../views/scripts/list/contacts.phtml           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index fff475cc4..642fd7b57 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -10,7 +10,7 @@ $contactHelper = $this->getHelper('ContactFlags');
     <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
-<div class="content contacts">
+<div data-base-target="_next" class="content contacts">
     <?php
     if (count($contacts) === 0) {
         echo t('No contacts matching the filter');
@@ -20,14 +20,17 @@ $contactHelper = $this->getHelper('ContactFlags');
         <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
             <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
                  style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
-            <strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>)
+            <a href="<?= $this->href(
+                'monitoring/show/contact',
+                array('contact' => $contact->contact_name)
+            ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
             <?php
             foreach (array(
-                $contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>',
-                $contact->contact_pager => 'Pager: %s',
-                $contact->contact_notify_service_timeperiod => 'Service notification period: %s',
-                $contact->contact_notify_host_timeperiod => 'Host notification period: %s'
-            ) as $value => $format):
+                'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
+                'Pager: %s'                             => $contact->contact_pager,
+                'Service notification period: %s'       => $contact->contact_notify_service_timeperiod,
+                'Host notification period: %s'          => $contact->contact_notify_host_timeperiod
+            ) as $format => $value):
                 if ($value): ?>
                     <br />
                     <?php

From b7f5c8a84df2160e49a17124615b9229bc6c1814 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 17 Jul 2014 09:17:20 +0200
Subject: [PATCH 25/43] Fix that the default sort order of a view is not being
 applied

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 21361c340..23fe815a3 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -530,9 +530,7 @@ class Monitoring_ListController extends Controller
             $query->applyFilter($filter);
         }
         $this->view->filter = $filter;
-        if ($sort) {
-            $query->order($sort, $dir);
-        }
+        $query->order($sort, $dir);
         $this->applyRestrictions($query);
         $this->handleFormatRequest($query);
         return $query;

From 4d199180b31d37afaaf6eb609e83d8e69be6be70 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 17 Jul 2014 09:26:15 +0200
Subject: [PATCH 26/43] We do not want to access $_POST directly if it is
 possible to avoid it

---
 application/forms/Authentication/LoginForm.php                | 2 +-
 modules/monitoring/application/controllers/ListController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 9955c92d1..cbe25b623 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -29,7 +29,7 @@ class LoginForm extends Form
             'required'    => true
         ));
         // TODO: We need a place to intercept filled forms before rendering
-        if (isset($_POST['username'])) {
+        if ($this->getRequest()->getPost('username') !== null) {
             $this->getElement('password')->setAttrib('class', 'autofocus');
         } else {
             $this->getElement('username')->setAttrib('class', 'autofocus');
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 23fe815a3..f0cdb2767 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -518,7 +518,7 @@ class Monitoring_ListController extends Controller
 
         if ($modifyFilter) {
             if ($this->_request->isPost()) {
-                $filter = $filter->applyChanges($_POST);
+                $filter = $filter->applyChanges($this->_request->getPost());
                 $this->redirectNow($this->url->without('page')->setQueryString($filter->toQueryString()));
             }
             $this->view->filterEditor = Widget::create('filterEditor', array(

From eca0d50baed1521633bf7c416cb79a0388c3875b Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Thu, 17 Jul 2014 11:26:18 +0200
Subject: [PATCH 27/43] Don't use printf format strings as array keys

An array with printf format strings as keys looks pretty ugly
---
 .../views/scripts/list/contacts.phtml         | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 642fd7b57..fb53fef55 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -26,15 +26,26 @@ $contactHelper = $this->getHelper('ContactFlags');
             ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
             <?php
             foreach (array(
-                'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
-                'Pager: %s'                             => $contact->contact_pager,
-                'Service notification period: %s'       => $contact->contact_notify_service_timeperiod,
-                'Host notification period: %s'          => $contact->contact_notify_host_timeperiod
-            ) as $format => $value):
+                'eMail' => array(
+                    $contact->contact_email, '<a href="mailto:%1$s">%1$s</a>'
+                ),
+                'Pager'                       => $contact->contact_pager,
+                'Service notification period' => $contact->contact_notify_service_timeperiod,
+                'Host notification period'    => $contact->contact_notify_host_timeperiod
+            ) as $key => $value):
+                if (is_string($value)) {
+                    $format = '%s';
+                } else {
+                    $format = $value[1];
+                    $value = $value[0];
+                }
                 if ($value): ?>
                     <br />
                     <?php
-                    printf($format, htmlspecialchars($value));
+                    printf(
+                        '%s: %s', $key,
+                        sprintf($format, htmlspecialchars($value))
+                    );
                 endif;
             endforeach;
             ?>

From 882699201d1baf8bc6506a89c3872a9475364394 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Thu, 17 Jul 2014 17:33:45 +0200
Subject: [PATCH 28/43] Contacts: replace foreach loop with hardcoded HTML and
 move the styles to a CSS file

---
 .../views/scripts/list/contacts.phtml         | 63 +++++++++----------
 modules/monitoring/public/css/module.less     | 21 +++++++
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index fb53fef55..81a061973 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,42 +14,41 @@ $contactHelper = $this->getHelper('ContactFlags');
     <?php
     if (count($contacts) === 0) {
         echo t('No contacts matching the filter');
+        return;
     }
-    foreach ($contacts as $contact):
-        $periodLink = $this->href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?>
-        <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
-            <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
-                 style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
+    foreach ($contacts as $contact): ?>
+        <div class="contact">
+            <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" />
             <a href="<?= $this->href(
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name)
             ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
-            <?php
-            foreach (array(
-                'eMail' => array(
-                    $contact->contact_email, '<a href="mailto:%1$s">%1$s</a>'
-                ),
-                'Pager'                       => $contact->contact_pager,
-                'Service notification period' => $contact->contact_notify_service_timeperiod,
-                'Host notification period'    => $contact->contact_notify_host_timeperiod
-            ) as $key => $value):
-                if (is_string($value)) {
-                    $format = '%s';
-                } else {
-                    $format = $value[1];
-                    $value = $value[0];
-                }
-                if ($value): ?>
-                    <br />
-                    <?php
-                    printf(
-                        '%s: %s', $key,
-                        sprintf($format, htmlspecialchars($value))
-                    );
-                endif;
-            endforeach;
-            ?>
-            <div class="clearfix"></div>
+            <div><?= sprintf(
+                '%1$s: <a href="mailto:%2$s">%2$s</a>',
+                t('Email'),
+                htmlspecialchars($contact->contact_email)
+            ) ?></div>
+            <?php if ($contact->contact_pager): ?>
+            <div>
+                <?= t('Pager') ?>:
+                <?= htmlspecialchars($contact->contact_pager) ?>
+            </div>
+            <?php endif; ?>
+            <div style="clear: both;"></div>
+            <div class="notification-periods">
+                <div>
+                    <?= t('Service notification period') ?>:
+                    <?= htmlspecialchars($contact->contact_notify_service_timeperiod) ?>
+                </div>
+                <div>
+                    <?= t('Host notification period') ?>:
+                    <?= htmlspecialchars($contact->contact_notify_host_timeperiod) ?>
+                </div>
+            </div>
         </div>
-    <?php endforeach; ?>
+    <?php
+    endforeach;
+    if (true): /* The following piece of HTML MUST be nested in <?php */ ?>
+    <div style="clear: both;"></div>
+    <?php endif; ?>
 </div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index c11b18414..1d60b75c7 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -32,3 +32,24 @@ table.objectstate td.state {
   padding-top: 0.5em;
   padding-bottom: 0.5em;
 }
+
+div.contacts div.contact {
+  background-color: lightgray;
+  padding: 0.5em;
+  border-radius: 0.5em;
+  overflow: hidden;
+  margin: 0.125em;
+  float: left;
+}
+
+div.contacts div.contact > img {
+  width: 60px;
+  border: 4px solid white;
+  border-radius: 8px;
+  margin-right: 8px;
+  float: left;
+}
+
+div.contacts div.notification-periods {
+  margin-top: 0.5em;
+}

From 96d34064463ae2dd1e3356f231d491ae730ffea1 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Thu, 17 Jul 2014 17:46:28 +0200
Subject: [PATCH 29/43] Prefer style="clear: both;" rather than Bootstrap's
 class="clearfix"

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

diff --git a/modules/monitoring/application/controllers/MonitoringCommands.php b/modules/monitoring/application/controllers/MonitoringCommands.php
index 0a94c17b2..faa04114e 100644
--- a/modules/monitoring/application/controllers/MonitoringCommands.php
+++ b/modules/monitoring/application/controllers/MonitoringCommands.php
@@ -64,7 +64,7 @@ class Zend_View_Helper_MonitoringCommands extends Zend_View_Helper_Abstract
 
         $out .= '</div>';
 
-        $out .= '<div class="clearfix"></div>';
+        $out .= '<div style="clear: both;"></div>';
 
         if ($type === Meta::TYPE_FULL) {
             return '<div>'. $out. '</div>';

From f9513cc14b7f81552cbdddb5ea51854cccf60db4 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 17 Jul 2014 19:07:35 +0200
Subject: [PATCH 30/43] Fix comment prefix in config/authentication.ini

---
 config/authentication.ini.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/authentication.ini.in b/config/authentication.ini.in
index 554356492..71d9e4402 100644
--- a/config/authentication.ini.in
+++ b/config/authentication.ini.in
@@ -1,7 +1,7 @@
 ; authentication.ini
 ;
 ; Each section listed in this configuration represents a backend used to authenticate users. The backend configurations
-: must define a resource referring to a configured database or LDAP connection in the INI file resources.ini.
+; must define a resource referring to a configured database or LDAP connection in the INI file resources.ini.
 ;
 ; The backends will be processed from top to bottom using the first backend for authentication which reports that
 ; the user trying to log in is available.

From 209894d85726bb95cf15a26d73a685da34cf3548 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 18 Jul 2014 16:30:14 +0200
Subject: [PATCH 31/43] DbQuery: add dummy isTimestamp function

Not the best solution, but helps for now.

fixes #6675
---
 library/Icinga/Data/Db/DbQuery.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 7fef56efc..f064c4df6 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -192,6 +192,24 @@ class DbQuery extends SimpleQuery
         return $this->escapeForSql(date('Y-m-d H:i:s', $value));
     }
 
+    /**
+     * Return true if an field contains an explicit timestamp
+     *
+     * TODO: This is not here to do automagic timestamp stuff. One may
+     *       override this function for custom voodoo, IdoQuery right now
+     *       does. IMO we need to split whereToSql functionality, however
+     *       I'd prefer to wait with this unless we understood how other
+     *       backends will work. We probably should also rename this
+     *       function to isTimestampColumn().
+     *
+     * @param  string $field Field Field name to checked
+     * @return bool          Whether this field expects timestamps
+     */
+    public function isTimestamp($field)
+    {
+        return $this;
+    }
+
     public function whereToSql($col, $sign, $expression)
     {
         if ($this->isTimestamp($col)) {

From 2a204897b49c404a318f4f9c6b7324053b7fe874 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 18 Jul 2014 16:48:52 +0200
Subject: [PATCH 32/43] DbQuery: improve method description

Not English mine this was, copy paste did I ;)
---
 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 f064c4df6..3fb74a656 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -193,7 +193,7 @@ class DbQuery extends SimpleQuery
     }
 
     /**
-     * Return true if an field contains an explicit timestamp
+     * Check for timestamp fields
      *
      * TODO: This is not here to do automagic timestamp stuff. One may
      *       override this function for custom voodoo, IdoQuery right now

From f9a274d0790a5c8abfba38457794c08d08081013 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 18 Jul 2014 11:48:26 +0200
Subject: [PATCH 33/43] Add contact detail view

refs #4804
refs #6514
---
 .../controllers/ShowController.php            | 34 +++++++++++
 .../views/scripts/show/contact.phtml          | 56 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 modules/monitoring/application/views/scripts/show/contact.phtml

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index d7d14ce15..d503ba512 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -103,6 +103,40 @@ class Monitoring_ShowController extends Controller
         ));
     }
 
+    public function contactAction()
+    {
+        $contact = $this->getParam('contact');
+        if (! $contact) {
+            throw new Zend_Controller_Action_Exception(
+                $this->translate('The parameter `contact\' is required'),
+                404
+            );
+        }
+        $query = $this->backend->select()->from('contact', array(
+            'contact_name',
+            'contact_id',
+            'contact_alias',
+            'contact_email',
+            'contact_pager',
+            'contact_notify_service_timeperiod',
+            'contact_notify_service_recovery',
+            'contact_notify_service_warning',
+            'contact_notify_service_critical',
+            'contact_notify_service_unknown',
+            'contact_notify_service_flapping',
+            'contact_notify_service_downtime',
+            'contact_notify_host_timeperiod',
+            'contact_notify_host_recovery',
+            'contact_notify_host_down',
+            'contact_notify_host_unreachable',
+            'contact_notify_host_flapping',
+            'contact_notify_host_downtime',
+        ));
+        $query->where('contact_name', $contact);
+        $this->view->contacts = $query->paginate();
+        $this->view->contact_name = $contact;
+    }
+
     /**
      * Creating tabs for this controller
      * @return Tabs
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
new file mode 100644
index 000000000..609bbbc69
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -0,0 +1,56 @@
+<?php
+$contactHelper = $this->getHelper('ContactFlags');
+?>
+<div style="margin-top: 0.5em;">
+    <?php foreach ($contacts as $contact): ?>
+        <table style="border-spacing: 0.25em; border-collapse: separate;">
+            <thead>
+            <tr>
+                <th colspan="2" style="text-align: left">
+                    <?= htmlspecialchars($contact->contact_name) ?><span style="font-weight: normal;"> (<?=
+                        htmlspecialchars($contact->contact_alias)
+                        ?>)</span>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td><?= t('Email') ?></td>
+                <td><?php printf(
+                        '<a href="mailto:%1$s">%1$s</a>',
+                        htmlspecialchars($contact->contact_email)
+                    ); ?></td>
+            </tr>
+            <?php if ($contact->contact_pager): ?>
+                <tr>
+                    <td><?= t('Pager') ?></td>
+                    <td><?= htmlspecialchars($contact->contact_pager) ?></td>
+                </tr>
+            <?php endif; ?>
+            <tr>
+                <td><?= t('Flags (service)') ?></td>
+                <td><?= htmlspecialchars($contactHelper->contactFlags($contact, 'service')) ?></td>
+            </tr>
+            <tr>
+                <td><?= t('Flags (host)') ?></td>
+                <td><?= htmlspecialchars($contactHelper->contactFlags($contact, 'host')) ?></td>
+            </tr>
+            <tr>
+                <td><?= t('Service notification period') ?></td>
+                <td><?= htmlspecialchars($contact->contact_notify_service_timeperiod) ?></td>
+            </tr>
+            <tr>
+                <td><?= t('Host notification period') ?></td>
+                <td><?= htmlspecialchars($contact->contact_notify_host_timeperiod) ?></td>
+            </tr>
+            </tbody>
+        </table>
+        <?php
+        return;
+    endforeach;
+    printf(
+        '%s: `%s\'',
+        t('No such contact'), $contact_name
+    );
+    ?>
+</div>

From 5ea02b41eab3b6e4b697695b80df77799526556c Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 18 Jul 2014 12:30:39 +0200
Subject: [PATCH 34/43] Optimize variable names and positions, cast array
 direct to object

---
 library/Icinga/Protocol/File/Reader.php | 64 ++++++++++++-------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/library/Icinga/Protocol/File/Reader.php b/library/Icinga/Protocol/File/Reader.php
index f5677e855..fcefdfc06 100644
--- a/library/Icinga/Protocol/File/Reader.php
+++ b/library/Icinga/Protocol/File/Reader.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Protocol\File;
 
+use Exception;
 use Icinga\Data\DatasourceInterface;
 
 /**
@@ -15,6 +16,8 @@ use Icinga\Data\DatasourceInterface;
  */
 class Reader implements DatasourceInterface
 {
+    private static $EOLLen = null;
+
     /**
      * Name of the file to read
      *
@@ -34,6 +37,9 @@ class Reader implements DatasourceInterface
      */
     public function __construct($config)
     {
+        if (self::$EOLLen === null) {
+            self::$EOLLen = strlen(PHP_EOL);
+        }
         $this->config = $config;
         $this->filename = $config->filename;
     }
@@ -57,10 +63,7 @@ class Reader implements DatasourceInterface
     {
         $all = array();
         foreach ($this->fetchPairs($query) as $index => $value) {
-            $all[$index] = new \stdClass();
-            foreach ($value as $key => $value_2) {
-                $all[$index]->{$key} = $value_2;
-            }
+            $all[$index] = (object) $value;
         }
         return $all;
     }
@@ -87,9 +90,9 @@ class Reader implements DatasourceInterface
     public function fetchColumn(Query $query)
     {
         $column = array();
-        foreach ($this->fetchPairs($query) as $value) {
-            foreach ($value as $value_2) {
-                $column[] = $value_2;
+        foreach ($this->fetchPairs($query) as $pair) {
+            foreach ($pair as $value) {
+                $column[] = $value;
                 break;
             }
         }
@@ -139,10 +142,10 @@ class Reader implements DatasourceInterface
     public function validateLine($line, Query $query)
     {
         $data = array();
-        $PCRE_result = @preg_match($this->config->fields, $line, $data);
-        if ($PCRE_result === false) {
-            throw new \Exception('Failed parsing regular expression!');
-        } else if ($PCRE_result === 1) {
+        $PCREResult = @preg_match($this->config->fields, $line, $data);
+        if ($PCREResult === false) {
+            throw new Exception('Failed parsing regular expression!');
+        } else if ($PCREResult === 1) {
             foreach ($query->getFilters() as $filter) {
                 if (strpos($line, $filter) === false) {
                     return false;
@@ -167,21 +170,20 @@ class Reader implements DatasourceInterface
      */
     public function read(Query $query)
     {
-        $skip_lines = $query->getOffset();
-        $read_lines = $query->getLimit();
-        if ($skip_lines === null) {
-            $skip_lines = 0;
+        $skipLines = $query->getOffset();
+        $readLines = $query->getLimit();
+        if ($skipLines === null) {
+            $skipLines = 0;
         }
-        return $this->{$query->sortDesc() ? 'readFromEnd' : 'readFromStart'}($skip_lines, $read_lines, $query);
+        return $this->{$query->sortDesc() ? 'readFromEnd' : 'readFromStart'}($skipLines, $readLines, $query);
     }
 
     /**
      * Backend for $this->read
      * Direction: LIFO
      */
-    public function readFromEnd($skip_lines, $read_lines, Query $query)
+    public function readFromEnd($skipLines, $readLines, Query $query)
     {
-        $PHP_EOL_len = strlen(PHP_EOL);
         $lines = array();
         $s = '';
         $f = @fopen($this->filename, 'rb');
@@ -191,21 +193,21 @@ class Reader implements DatasourceInterface
             if (ftell($f) === 0) {
                 return array();
             }
-            while ($read_lines === null || count($lines) < $read_lines) {
+            while ($readLines === null || count($lines) < $readLines) {
                 $c = $this->fgetc($f, $buffer);
                 if ($c === false) {
                     $l = $this->validateLine($s, $query);
-                    if (!($l === false || $skip_lines)) {
+                    if (!($l === false || $skipLines)) {
                         $lines[] = $l;
                     }
                     break;
                 }
                 $s = $c . $s;
                 if (strpos($s, PHP_EOL) === 0) {
-                    $l = $this->validateLine((string)substr($s, $PHP_EOL_len), $query);
+                    $l = $this->validateLine((string)substr($s, self::$EOLLen), $query);
                     if ($l !== false) {
-                        if ($skip_lines) {
-                            $skip_lines--;
+                        if ($skipLines) {
+                            $skipLines--;
                         } else {
                             $lines[] = $l;
                         }
@@ -249,20 +251,19 @@ class Reader implements DatasourceInterface
      * Backend for $this->read
      * Direction: FIFO
      */
-    public function readFromStart($skip_lines, $read_lines, Query $query)
+    public function readFromStart($skipLines, $readLines, Query $query)
     {
-        $PHP_EOL_len = strlen(PHP_EOL);
         $lines = array();
         $s = '';
         $f = @fopen($this->filename, 'rb');
         if ($f !== false) {
             $buffer = '';
-            while ($read_lines === null || count($lines) < $read_lines) {
+            while ($readLines === null || count($lines) < $readLines) {
                 if (strlen($buffer) === 0) {
                     $buffer = fread($f, 4096);
                     if (strlen($buffer) === 0) {
                         $l = $this->validateLine($s, $query);
-                        if (!($l === false || $skip_lines)) {
+                        if (!($l === false || $skipLines)) {
                             $lines[] = $l;
                         }
                         break;
@@ -271,10 +272,10 @@ class Reader implements DatasourceInterface
                 $s .= substr($buffer, 0, 1);
                 $buffer = substr($buffer, 1);
                 if (strpos($s, PHP_EOL) !== false) {
-                    $l = $this->validateLine((string)substr($s, 0, strlen($s) - $PHP_EOL_len), $query);
+                    $l = $this->validateLine((string)substr($s, 0, strlen($s) - self::$EOLLen), $query);
                     if ($l !== false) {
-                        if ($skip_lines) {
-                            $skip_lines--;
+                        if ($skipLines) {
+                            $skipLines--;
                         } else {
                             $lines[] = $l;
                         }
@@ -294,7 +295,6 @@ class Reader implements DatasourceInterface
      * @return int
      */
     public function count(Query $query) {
-        $PHP_EOL_len = strlen(PHP_EOL);
         $lines = 0;
         $s = '';
         $f = @fopen($this->filename, 'rb');
@@ -313,7 +313,7 @@ class Reader implements DatasourceInterface
                 $s .= substr($buffer, 0, 1);
                 $buffer = substr($buffer, 1);
                 if (strpos($s, PHP_EOL) !== false) {
-                    if ($this->validateLine((string)substr($s, 0, strlen($s) - $PHP_EOL_len), $query) !== false) {
+                    if ($this->validateLine((string)substr($s, 0, strlen($s) - self::$EOLLen), $query) !== false) {
                         $lines++;
                     }
                     $s = '';

From 091ddbe5529d39b96d373de4ef3e5fea13d144db Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Mon, 21 Jul 2014 09:19:44 +0200
Subject: [PATCH 35/43] Partiall revert bfc54b7e

Refactor Url->getParams() to return an instance of UrlParam instead of an array.

fixes #6760
---
 library/Icinga/Web/Url.php                        | 4 ++--
 library/Icinga/Web/UrlParams.php                  | 2 +-
 library/Icinga/Web/Widget/Dashboard/Component.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index c9da962be..c705b68d7 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -331,11 +331,11 @@ class Url
     /**
      * Return all parameters that will be used in the query part
      *
-     * @return  array   An associative key => value array containing all parameters
+     * @return  UrlParams   An instance of UrlParam containing all parameters
      */
     public function getParams()
     {
-        return $this->params->asArray();
+        return $this->params;
     }
 
     /**
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 9a8b60929..11fed8333 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -310,7 +310,7 @@ class UrlParams
         }
     }
 
-    public function asArray()
+    public function toArray()
     {
         return $this->params;
     }
diff --git a/library/Icinga/Web/Widget/Dashboard/Component.php b/library/Icinga/Web/Widget/Dashboard/Component.php
index 8bac34359..2d8517526 100644
--- a/library/Icinga/Web/Widget/Dashboard/Component.php
+++ b/library/Icinga/Web/Widget/Dashboard/Component.php
@@ -126,7 +126,7 @@ EOD;
     public function toArray()
     {
         $array = array('url' => $this->url->getPath());
-        foreach ($this->url->getParams() as $param) {
+        foreach ($this->url->getParams()->toArray() as $param) {
             $array[$param[0]] = $param[1];
         }
         return $array;

From 53c9292b41e943472b7d82b8c144d871ad2b6dca Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Mon, 21 Jul 2014 13:06:35 +0200
Subject: [PATCH 36/43] Fix BarChart padding in Dashboard

Use max-width instead of width in the chart layout to make better use of the available space, but prevent the charts from growing too big. Use a bigger weight and height in the default dashboard configuration.

fixes #6744
---
 config/dashboard/dashboard.ini                   | 16 ++++++++++++----
 .../application/controllers/ChartController.php  |  8 ++++----
 .../views/scripts/chart/hostgroup.phtml          |  2 +-
 .../views/scripts/chart/servicegroup.phtml       |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/config/dashboard/dashboard.ini b/config/dashboard/dashboard.ini
index 50e5a6373..8d500f341 100644
--- a/config/dashboard/dashboard.ini
+++ b/config/dashboard/dashboard.ini
@@ -23,13 +23,21 @@ sort = host_severity
 title = "Landing page"
 
 [Landing.Hostgroups]
-url = "monitoring/chart/hostgroup?height=400&width=500"
+url = "monitoring/chart/hostgroup"
+height = 540
+width = 540
 
 [Landing.Servicegroups]
-url = "monitoring/chart/servicegroup?height=360&width=450"
+url = "monitoring/chart/servicegroup"
+height = 540
+width = 540
 
 [Landing.Unhandled Problem Services]
-url = "monitoring/list/services?service_handled=0&service_problem=1"
+url = "monitoring/list/services"
+service_handled = 0
+service_problem = 1
 
 [Landing.Unhandled Problem Hosts]
-url = "monitoring/list/hosts?host_handled=0&host_problem=1"
+url = "monitoring/list/hosts"
+host_handled = 0
+host_problem = 1
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 4ccc30510..3cfb4ef71 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -94,8 +94,8 @@ class Monitoring_ChartController extends Controller
                 'services_pending'
             )
         )->getQuery()->fetchAll();
-        $this->view->height = intval($this->getParam('height', 220));
-        $this->view->width = intval($this->getParam('width', 520));
+        $this->view->height = intval($this->getParam('height', 500));
+        $this->view->width = intval($this->getParam('width', 500));
         if (count($query) === 1) {
             $this->drawGroupPie($query[0]);
         } else {
@@ -119,8 +119,8 @@ class Monitoring_ChartController extends Controller
                 'services_pending'
             )
         )->getQuery()->fetchAll();
-        $this->view->height = intval($this->getParam('height', 220));
-        $this->view->width = intval($this->getParam('width', 520));
+        $this->view->height = intval($this->getParam('height', 500));
+        $this->view->width = intval($this->getParam('width', 500));
 
         $this->drawServiceGroupChart($query);
 
diff --git a/modules/monitoring/application/views/scripts/chart/hostgroup.phtml b/modules/monitoring/application/views/scripts/chart/hostgroup.phtml
index 4ad5f61dc..2bdbe428c 100644
--- a/modules/monitoring/application/views/scripts/chart/hostgroup.phtml
+++ b/modules/monitoring/application/views/scripts/chart/hostgroup.phtml
@@ -1,5 +1,5 @@
 
-<div style="width:<?= $this->width; ?>px;height:<?= $this->height; ?>px;margin:auto;">
+<div style="max-width:<?= $this->width; ?>px;max-height:<?= $this->height; ?>px;margin:auto;">
 <?=
 $chart->render();
 ?>
diff --git a/modules/monitoring/application/views/scripts/chart/servicegroup.phtml b/modules/monitoring/application/views/scripts/chart/servicegroup.phtml
index ad8a21ab0..2bdbe428c 100644
--- a/modules/monitoring/application/views/scripts/chart/servicegroup.phtml
+++ b/modules/monitoring/application/views/scripts/chart/servicegroup.phtml
@@ -1,5 +1,5 @@
 
-<div style="width:<?= $this->width; ?>px;height:<?= $this->height; ?>px">
+<div style="max-width:<?= $this->width; ?>px;max-height:<?= $this->height; ?>px;margin:auto;">
 <?=
 $chart->render();
 ?>

From da784456868b35bc0d1302f92852c8d92af0ad1e Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 21 Jul 2014 13:38:19 +0200
Subject: [PATCH 37/43] Add apache 2.4 example for 'Require all granted'

fixes #6771
---
 etc/apache/icingaweb.conf.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/apache/icingaweb.conf.in b/etc/apache/icingaweb.conf.in
index 69335368e..0451abf5b 100644
--- a/etc/apache/icingaweb.conf.in
+++ b/etc/apache/icingaweb.conf.in
@@ -5,6 +5,8 @@ Alias @web_path@ "@prefix@/public"
     AllowOverride None
     Order allow,deny
     Allow from all
+    # new directive needed in Apache 2.4.3+
+    #Require all granted
 
     SetEnv ICINGAWEB_CONFIGDIR @icingaweb_config_path@
 

From 6df7be7ee55a99c1ee91dbf72499925d89c94c89 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Mon, 21 Jul 2014 14:09:40 +0200
Subject: [PATCH 38/43] File/Query: Fix `applyFilter' and `order' not matching
 SimpleQuery's interfaces

refs #6722
---
 library/Icinga/Protocol/File/Query.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Protocol/File/Query.php b/library/Icinga/Protocol/File/Query.php
index d8806b2bc..f88426bca 100644
--- a/library/Icinga/Protocol/File/Query.php
+++ b/library/Icinga/Protocol/File/Query.php
@@ -5,6 +5,7 @@
 namespace Icinga\Protocol\File;
 
 use Icinga\Data\SimpleQuery;
+use Icinga\Data\Filter\Filter;
 
 /**
  * Class Query
@@ -32,7 +33,7 @@ class Query extends SimpleQuery
     /**
      * Nothing to do here
      */
-    public function applyFilter()
+    public function applyFilter(Filter $filter)
     {}
 
     /**
@@ -42,9 +43,11 @@ class Query extends SimpleQuery
      *
      * @return Query
      */
-    public function order($dir)
+    public function order($field, $direction = null)
     {
-        $this->sortDir = ($dir === null || strtoupper(trim($dir)) === 'DESC') ? self::SORT_DESC : self::SORT_ASC;
+        $this->sortDir = (
+            $direction === null || strtoupper(trim($direction)) === 'DESC'
+        ) ? self::SORT_DESC : self::SORT_ASC;
         return $this;
     }
 
@@ -80,4 +83,4 @@ class Query extends SimpleQuery
     {
         return $this->filters;
     }
-}
\ No newline at end of file
+}

From c5ecbf250d8e91b2e36fa33fede1bc7cb3244b9c Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Mon, 21 Jul 2014 14:11:08 +0200
Subject: [PATCH 39/43] lib: add FileReaderException for file reader specific
 errors

refs #6722
---
 .../Protocol/File/Exception/FileReaderException.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 library/Icinga/Protocol/File/Exception/FileReaderException.php

diff --git a/library/Icinga/Protocol/File/Exception/FileReaderException.php b/library/Icinga/Protocol/File/Exception/FileReaderException.php
new file mode 100644
index 000000000..3e0890a57
--- /dev/null
+++ b/library/Icinga/Protocol/File/Exception/FileReaderException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Icinga\Protocol\File;
+
+use RuntimeException;
+
+/**
+ * Exception thrown if a file reader specific error occurs
+ */
+class FileReaderException extends RuntimeException {}

From cebd71b2ffa04860a022fb038467d8c8b431e0d2 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Mon, 21 Jul 2014 14:14:13 +0200
Subject: [PATCH 40/43] Fix "Fatal error: Interface
 'Icinga\Data\DatasourceInterface' not found in Icinga\Protocol\File\Reader"

fixes #6722
---
 library/Icinga/Protocol/File/Reader.php | 362 +++++++++---------------
 1 file changed, 130 insertions(+), 232 deletions(-)

diff --git a/library/Icinga/Protocol/File/Reader.php b/library/Icinga/Protocol/File/Reader.php
index fcefdfc06..50842bc4a 100644
--- a/library/Icinga/Protocol/File/Reader.php
+++ b/library/Icinga/Protocol/File/Reader.php
@@ -4,44 +4,92 @@
 
 namespace Icinga\Protocol\File;
 
-use Exception;
-use Icinga\Data\DatasourceInterface;
+use FilterIterator;
+use Iterator;
+use Zend_Config;
+use Icinga\Protocol\File\FileReaderException;
+use Icinga\Util\File;
 
 /**
- * Class Reader
- *
  * Read file line by line
- *
- * @package Icinga\Protocol\File
  */
-class Reader implements DatasourceInterface
+class Reader extends FilterIterator
 {
-    private static $EOLLen = null;
-
     /**
-     * Name of the file to read
+     * A PCRE string with the fields to extract from the file's lines as named subpatterns
      *
      * @var string
      */
-    private $filename;
+    protected $fields;
 
     /**
-     * Configuration for this Datasource
+     * An associative array of the current line's fields ($field => $value)
      *
-     * @var \Zend_Config
+     * @var array
      */
-    private $config;
+    protected $currentData;
 
     /**
-     * @param \Zend_Config $config
+     * Create a new reader
+     *
+     * @param   Zend_Config $config
+     *
+     * @throws  FileReaderException If a required $config directive (filename or fields) is missing
      */
-    public function __construct($config)
+    public function __construct(Zend_Config $config)
     {
-        if (self::$EOLLen === null) {
-            self::$EOLLen = strlen(PHP_EOL);
+        foreach (array('filename', 'fields') as $key) {
+            if (! isset($config->{$key})) {
+                throw new FileReaderException('The directive `' . $key . '\' is required');
+            }
         }
-        $this->config = $config;
-        $this->filename = $config->filename;
+        $this->fields = $config->fields;
+        $f = new File($config->filename);
+        $f->setFlags(
+            File::DROP_NEW_LINE |
+            File::READ_AHEAD |
+            File::SKIP_EMPTY
+        );
+        parent::__construct($f);
+    }
+
+    /**
+     * Return the current data
+     *
+     * @return array
+     */
+    public function current()
+    {
+        return $this->currentData;
+    }
+
+    /**
+     * Accept lines matching the given PCRE pattern
+     *
+     * @return bool
+     *
+     * @throws FileReaderException  If PHP failed parsing the PCRE pattern
+     */
+    public function accept()
+    {
+        $data = array();
+        $matched = @preg_match(
+            $this->fields,
+            $this->getInnerIterator()->current(),
+            $data
+        );
+        if ($matched === false) {
+            throw new FileReaderException('Failed parsing regular expression!');
+        } else if ($matched === 1) {
+            foreach ($data as $key) {
+                if (is_int($key)) {
+                    unset($data[$key]);
+                }
+            }
+            $this->currentData = $data;
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -54,10 +102,22 @@ class Reader implements DatasourceInterface
         return new Query($this);
     }
 
+    /**
+     * Return the number of available valid lines.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return iterator_count($this);
+    }
+
     /**
      * Fetch result as an array of objects
      *
-     * @return array
+     * @param   Query $query
+     *
+     * @return  array
      */
     public function fetchAll(Query $query)
     {
@@ -68,10 +128,52 @@ class Reader implements DatasourceInterface
         return $all;
     }
 
+    /**
+     * Fetch result as a key/value pair array
+     *
+     * @param   Query $query
+     *
+     * @return  array
+     */
+    public function fetchPairs(Query $query)
+    {
+        $skipLines = $query->getOffset();
+        $readLines = $query->getLimit();
+        if ($skipLines === null) {
+            $skipLines = 0;
+        }
+        $lines = array();
+        if ($query->sortDesc()) {
+            $count = $this->count($query);
+            if ($count <= $skipLines) {
+                return $lines;
+            } else if ($count < ($skipLines + $readLines)) {
+                $readLines = $count - $skipLines;
+                $skipLines = 0;
+            } else {
+                $skipLines = $count - ($skipLines + $readLines);
+            }
+        }
+        foreach ($this as $index => $line) {
+            if ($index >= $skipLines) {
+                if ($index >= $skipLines + $readLines) {
+                    break;
+                }
+                $lines[] = $line;
+            }
+        }
+        if ($query->sortDesc()) {
+            $lines = array_reverse($lines);
+        }
+        return $lines;
+    }
+
     /**
      * Fetch first result row
      *
-     * @return object
+     * @param   Query $query
+     *
+     * @return  object
      */
     public function fetchRow(Query $query)
     {
@@ -85,7 +187,9 @@ class Reader implements DatasourceInterface
     /**
      * Fetch first result column
      *
-     * @return array
+     * @param   Query $query
+     *
+     * @return  array
      */
     public function fetchColumn(Query $query)
     {
@@ -102,7 +206,9 @@ class Reader implements DatasourceInterface
     /**
      * Fetch first column value from first result row
      *
-     * @return mixed
+     * @param   Query $query
+     *
+     * @return  mixed
      */
     public function fetchOne(Query $query)
     {
@@ -114,212 +220,4 @@ class Reader implements DatasourceInterface
         }
         return null;
     }
-
-    /**
-     * Fetch result as a key/value pair array
-     *
-     * @return array
-     */
-    public function fetchPairs(Query $query)
-    {
-        return $this->read($query);
-    }
-
-    /**
-     * If given $line matches the $query's PCRE pattern and contains all the strings in the $query's filters array,
-     * return an associative array of the matches of the PCRE pattern.
-     * Otherwise, return false.
-     * If preg_match returns false, it failed parsing the PCRE pattern.
-     * In that case, throw an exception.
-     *
-     * @param string $line
-     * @param Query $query
-     *
-     * @return array|bool
-     *
-     * @throws \Exception
-     */
-    public function validateLine($line, Query $query)
-    {
-        $data = array();
-        $PCREResult = @preg_match($this->config->fields, $line, $data);
-        if ($PCREResult === false) {
-            throw new Exception('Failed parsing regular expression!');
-        } else if ($PCREResult === 1) {
-            foreach ($query->getFilters() as $filter) {
-                if (strpos($line, $filter) === false) {
-                    return false;
-                }
-            }
-            foreach ($data as $key => $value) {
-                if (is_int($key)) {
-                    unset($data[$key]);
-                }
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-     * Skip and read as many lines as needed according to given $query.
-     *
-     * @param Query $query
-     *
-     * @return array  result
-     */
-    public function read(Query $query)
-    {
-        $skipLines = $query->getOffset();
-        $readLines = $query->getLimit();
-        if ($skipLines === null) {
-            $skipLines = 0;
-        }
-        return $this->{$query->sortDesc() ? 'readFromEnd' : 'readFromStart'}($skipLines, $readLines, $query);
-    }
-
-    /**
-     * Backend for $this->read
-     * Direction: LIFO
-     */
-    public function readFromEnd($skipLines, $readLines, Query $query)
-    {
-        $lines = array();
-        $s = '';
-        $f = @fopen($this->filename, 'rb');
-        if ($f !== false) {
-            $buffer = '';
-            fseek($f, 0, SEEK_END);
-            if (ftell($f) === 0) {
-                return array();
-            }
-            while ($readLines === null || count($lines) < $readLines) {
-                $c = $this->fgetc($f, $buffer);
-                if ($c === false) {
-                    $l = $this->validateLine($s, $query);
-                    if (!($l === false || $skipLines)) {
-                        $lines[] = $l;
-                    }
-                    break;
-                }
-                $s = $c . $s;
-                if (strpos($s, PHP_EOL) === 0) {
-                    $l = $this->validateLine((string)substr($s, self::$EOLLen), $query);
-                    if ($l !== false) {
-                        if ($skipLines) {
-                            $skipLines--;
-                        } else {
-                            $lines[] = $l;
-                        }
-                    }
-                    $s = '';
-                }
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Backend for $this->readFromEnd
-     */
-    public function fgetc($file, &$buffer)
-    {
-        $strlen = strlen($buffer);
-        if ($strlen === 0) {
-            $pos = ftell($file);
-            if ($pos === 0) {
-                return false;
-            }
-            if ($pos < 4096) {
-                fseek($file, 0);
-                $buffer = fread($file, $pos);
-                fseek($file, 0);
-            } else {
-                fseek($file, -4096, SEEK_CUR);
-                $buffer = fread($file, 4096);
-                fseek($file, -4096, SEEK_CUR);
-            }
-            return $this->fgetc($file, $buffer);
-        } else {
-            $char = substr($buffer, -1);
-            $buffer = substr($buffer, 0, $strlen - 1);
-            return $char;
-        }
-    }
-
-    /**
-     * Backend for $this->read
-     * Direction: FIFO
-     */
-    public function readFromStart($skipLines, $readLines, Query $query)
-    {
-        $lines = array();
-        $s = '';
-        $f = @fopen($this->filename, 'rb');
-        if ($f !== false) {
-            $buffer = '';
-            while ($readLines === null || count($lines) < $readLines) {
-                if (strlen($buffer) === 0) {
-                    $buffer = fread($f, 4096);
-                    if (strlen($buffer) === 0) {
-                        $l = $this->validateLine($s, $query);
-                        if (!($l === false || $skipLines)) {
-                            $lines[] = $l;
-                        }
-                        break;
-                    }
-                }
-                $s .= substr($buffer, 0, 1);
-                $buffer = substr($buffer, 1);
-                if (strpos($s, PHP_EOL) !== false) {
-                    $l = $this->validateLine((string)substr($s, 0, strlen($s) - self::$EOLLen), $query);
-                    if ($l !== false) {
-                        if ($skipLines) {
-                            $skipLines--;
-                        } else {
-                            $lines[] = $l;
-                        }
-                    }
-                    $s = '';
-                }
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Return the number of available valid lines.
-     *
-     * @param Query $query
-     *
-     * @return int
-     */
-    public function count(Query $query) {
-        $lines = 0;
-        $s = '';
-        $f = @fopen($this->filename, 'rb');
-        if ($f !== false) {
-            $buffer = '';
-            while (true) {
-                if (strlen($buffer) === 0) {
-                    $buffer = fread($f, 4096);
-                    if (strlen($buffer) === 0) {
-                        if ($this->validateLine($s, $query) !== false) {
-                            $lines++;
-                        }
-                        break;
-                    }
-                }
-                $s .= substr($buffer, 0, 1);
-                $buffer = substr($buffer, 1);
-                if (strpos($s, PHP_EOL) !== false) {
-                    if ($this->validateLine((string)substr($s, 0, strlen($s) - self::$EOLLen), $query) !== false) {
-                        $lines++;
-                    }
-                    $s = '';
-                }
-            }
-        }
-        return $lines;
-    }
 }

From 0a500efd8a3375ac4c02a80a181cc6bc53a25e11 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Mon, 21 Jul 2014 17:17:09 +0200
Subject: [PATCH 41/43] Determine the max value in LinearUnit dynamically

The range between min and max should always be divisable by the amount of
ticks, to ensure that the vertical lines are always at a full discrete value.

fixes #6769
---
 library/Icinga/Chart/Unit/LinearUnit.php      | 43 +++++++++++++++++--
 .../controllers/ChartController.php           |  7 ++-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index bf27486d2..d776fe304 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -90,17 +90,52 @@ class LinearUnit implements AxisUnit
         }
         sort($datapoints);
         if (!$this->staticMax) {
-            $this->max = max($this->max, $datapoints[count($datapoints)-1]);
+            $this->max = max($this->max, $datapoints[count($datapoints) - 1]);
         }
         if (!$this->staticMin) {
             $this->min = min($this->min, $datapoints[0]);
         }
-
+        if (!$this->staticMin || !$this->staticMax) {
+            $this->updateMaxValue();
+        }
         $this->currentTick = 0;
         $this->currentValue = $this->min;
         return $this;
     }
 
+    /**
+     * Refresh the range depending on the current values of min, max and nrOfTicks
+     */
+    private function updateMaxValue()
+    {
+        $this->max = $this->calculateTickRange($this->max - $this->min, $this->nrOfTicks) *
+             $this->nrOfTicks + $this->min;
+    }
+
+    /**
+     * Determine the minimum tick range that is necessary to display the given value range
+     * correctly
+     *
+     * @param   int range   The range to display
+     * @param   int ticks   The amount of ticks to use
+     *
+     * @return  int         The value for each tick
+     */
+    private function calculateTickRange($range, $ticks)
+    {
+        $factor = 1;
+        $steps = array(1, 2, 5);
+        $step = 0;
+        while ($range / ($factor * $steps[$step]) > $ticks) {
+            $step++;
+            if ($step === count($steps)) {
+                $step = 0;
+                $factor *= 10;
+            }
+        }
+        return $steps[$step] * $factor;
+    }
+
     /**
      * Transform the absolute value to an axis relative value
      *
@@ -114,7 +149,7 @@ class LinearUnit implements AxisUnit
         } elseif ($value > $this->max) {
             return 100;
         } else {
-            return 100 * ($value - $this->min) / ($this->max - $this->min);
+            return 100 * ($value - $this->min) / $this->max - $this->min;
         }
     }
 
@@ -176,6 +211,7 @@ class LinearUnit implements AxisUnit
         if ($max !== null) {
             $this->max = $max;
             $this->staticMax = true;
+            $this->updateMaxValue();
         }
     }
 
@@ -189,6 +225,7 @@ class LinearUnit implements AxisUnit
         if ($min !== null) {
             $this->min = $min;
             $this->staticMin = true;
+            $this->updateMaxValue();
         }
     }
 
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 3cfb4ef71..31bea79af 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -140,7 +140,8 @@ class Monitoring_ChartController extends Controller
         }
         $this->view->chart = new GridChart();
         $this->view->chart->setAxisLabel('', t('Services'))
-            ->setXAxis(new \Icinga\Chart\Unit\StaticAxis());
+            ->setXAxis(new \Icinga\Chart\Unit\StaticAxis())
+            ->setAxisMin(null, 0);
 
         $this->view->chart->drawBars(
             array(
@@ -190,7 +191,9 @@ class Monitoring_ChartController extends Controller
             );
         }
         $this->view->chart = new GridChart();
-        $this->view->chart->setAxisLabel('', t('Hosts'))->setXAxis(new StaticAxis());
+        $this->view->chart->setAxisLabel('', t('Hosts'))
+            ->setXAxis(new StaticAxis())
+            ->setAxisMin(null, 0);
         $this->view->chart->drawBars(
             array(
                 'label' => t('Up'),

From 4b8bb99fa1afcc69b14c526f0abcdfc502fc51e1 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Tue, 22 Jul 2014 11:26:35 +0200
Subject: [PATCH 42/43] Fix svg text rotation in firefox

Use the SVG transform attribute instead of the writing-mode attribute to support firefox.
---
 library/Icinga/Chart/Axis.php           | 37 ++---------
 library/Icinga/Chart/Primitive/Text.php | 10 ---
 library/Icinga/Chart/Render/Rotator.php | 86 +++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 42 deletions(-)
 create mode 100644 library/Icinga/Chart/Render/Rotator.php

diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index db1a82a83..00a5f5679 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -9,6 +9,7 @@ use Icinga\Chart\Primitive\Drawable;
 use Icinga\Chart\Primitive\Line;
 use Icinga\Chart\Primitive\Text;
 use Icinga\Chart\Render\RenderContext;
+use Icinga\Chart\Render\Rotator;
 use Icinga\Chart\Unit\AxisUnit;
 use Icinga\Chart\Unit\CalendarUnit;
 use Icinga\Chart\Unit\LinearUnit;
@@ -188,11 +189,11 @@ class Axis implements Drawable
                 $labelField->setFontSize('2.5em');
             }
 
+            if ($this->labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
+                $labelField = new Rotator($labelField, 45);
+            }
             $labelField = $labelField->toSvg($ctx);
 
-            if ($this->labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
-                $labelField = $this->rotate($ctx, $labelField, 45);
-            }
             $group->appendChild($labelField);
 
             if ($this->drawYGrid) {
@@ -214,34 +215,6 @@ class Axis implements Drawable
         }
     }
 
-    /**
-     * Rotate the given element.
-     *
-     * @param RenderContext $ctx        The rendering context
-     * @param DOMElement    $el         The element to rotate
-     * @param               $degrees    The rotation degrees
-     *
-     * @return DOMElement
-     */
-    private function rotate(RenderContext $ctx, DOMElement $el, $degrees)
-    {
-        // Create a box containing the rotated element relative to the original text position
-        $container = $ctx->getDocument()->createElement('g');
-        $x = $el->getAttribute('x');
-        $y = $el->getAttribute('y');
-        $container->setAttribute('transform', 'translate(' . $x . ',' . $y . ')');
-        $el->removeAttribute('x');
-        $el->removeAttribute('y');
-
-        // Create a rotated box containing the text
-        $rotate = $ctx->getDocument()->createElement('g');
-        $rotate->setAttribute('transform', 'rotate(' . $degrees . ')');
-        $rotate->appendChild($el);
-
-        $container->appendChild($rotate);
-        return $container;
-    }
-
     /**
      * Render the vertical axis
      *
@@ -275,9 +248,9 @@ class Axis implements Drawable
         if ($this->yLabel) {
             $axisLabel = new Text(-8, 50, $this->yLabel);
             $axisLabel->setFontSize('2em')
-                ->setAdditionalStyle(Text::ORIENTATION_VERTICAL)
                 ->setFontWeight('bold')
                 ->setAlignment(Text::ALIGN_MIDDLE);
+            $axisLabel = new Rotator($axisLabel, 90);
 
             $group->appendChild($axisLabel->toSvg($ctx));
         }
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 5521d6e27..72bed552b 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -30,16 +30,6 @@ class Text extends Styleable implements Drawable
      */
     const ALIGN_MIDDLE  = 'middle';
 
-    /**
-     * Normal left to right orientation
-     */
-    const ORIENTATION_HORIZONTAL = "";
-
-    /**
-     * Top down orientation (rotated by 90°)
-     */
-    const ORIENTATION_VERTICAL = "writing-mode: tb;";
-
     /**
      * The x position of the Text
      *
diff --git a/library/Icinga/Chart/Render/Rotator.php b/library/Icinga/Chart/Render/Rotator.php
new file mode 100644
index 000000000..934b784b6
--- /dev/null
+++ b/library/Icinga/Chart/Render/Rotator.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mjentsch
+ * Date: 22.07.14
+ * Time: 10:17
+ */
+
+namespace Icinga\Chart\Render;
+
+
+use Icinga\Chart\Render\RenderContext;
+use Icinga\Chart\Primitive\Drawable;
+use DOMElement;
+
+/**
+ * Class Rotator
+ * @package Icinga\Chart\Render
+ */
+class Rotator implements Drawable
+{
+    /**
+     * The drawable element to rotate
+     *
+     * @var Drawable
+     */
+    private $element;
+
+    /**
+     * @var int
+     */
+    private $degrees;
+
+    /**
+     * Wrap an element into a new instance of Rotator
+     *
+     * @param Drawable      $element    The element to rotate
+     * @param int           $degrees    The amount of degrees
+     */
+    public function __construct(Drawable $element, $degrees)
+    {
+        $this->element = $element;
+        $this->degrees = $degrees;
+    }
+
+    /**
+     * Rotate the given element.
+     *
+     * @param RenderContext $ctx        The rendering context
+     * @param DOMElement    $el         The element to rotate
+     * @param               $degrees    The amount of degrees
+     *
+     * @return DOMElement   The rotated DOMElement
+     */
+    private function rotate(RenderContext $ctx, DOMElement $el, $degrees)
+    {
+        // Create a box containing the rotated element relative to the original element position
+        $container = $ctx->getDocument()->createElement('g');
+        $x = $el->getAttribute('x');
+        $y = $el->getAttribute('y');
+        $container->setAttribute('transform', 'translate(' . $x . ',' . $y . ')');
+        $el->removeAttribute('x');
+        $el->removeAttribute('y');
+
+        // Put the element into a rotated group
+        //$rotate = $ctx->getDocument()->createElement('g');
+        $el->setAttribute('transform', 'rotate(' . $degrees . ')');
+        //$rotate->appendChild($el);
+
+        $container->appendChild($el);
+        return $container;
+    }
+
+    /**
+     * Create the SVG representation from this Drawable
+     *
+     * @param   RenderContext $ctx The context to use for rendering
+     *
+     * @return  DOMElement         The SVG Element
+     */
+    public function toSvg(RenderContext $ctx)
+    {
+        $el = $this->element->toSvg($ctx);
+        return $this->rotate($ctx, $el, $this->degrees);
+    }
+} 
\ No newline at end of file

From 0eaaaf2f29617337cf49cdae304ff41ff05d9e8e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <mjentsch@localhost.int.netways.de>
Date: Tue, 22 Jul 2014 11:32:52 +0200
Subject: [PATCH 43/43] Make bar charts thicker

---
 library/Icinga/Chart/Graph/BarGraph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 8bde864ce..968e4c0f7 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -69,7 +69,7 @@ class BarGraph extends Styleable implements Drawable
         $group = $doc->createElement('g');
         $idx = 0;
         foreach ($this->dataSet as $point) {
-            $rect = new Rect($point[0] - 1, $point[1], 2, 100 - $point[1]);
+            $rect = new Rect($point[0] - 2, $point[1], 4, 100 - $point[1]);
             $rect->setFill($this->fill);
             $rect->setStrokeWidth($this->strokeWidth);
             $rect->setStrokeColor('black');