Revert "Merge branch 'next'"

This reverts commit f45f925e5e1dbfec627345868d0dd56abc77c4f1, reversing
changes made to 90c07943e4173ef8e32dae5087203f5a712f8077.

This was too early, need to check for incubator

application/controllers/BasketController.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Widget\NameValueTable;
+use dipl\Html\Link;
+use dipl\Web\Widget\NameValueTable;
 use Exception;
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Director\ConfigDiff;
@@ -18,7 +18,7 @@ use Icinga\Module\Director\Forms\BasketForm;
 use Icinga\Module\Director\Forms\BasketUploadForm;
 use Icinga\Module\Director\Forms\RestoreBasketForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Module\Director\Web\Table\BasketSnapshotTable;
 
 class BasketController extends ActionController

application/controllers/BasketsController.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Table\BasketTable;
 

application/controllers/CommandController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Module\Director\Forms\IcingaCommandArgumentForm;
 use Icinga\Module\Director\Objects\IcingaCommand;
 use Icinga\Module\Director\Resolver\CommandUsage;

application/controllers/ConfigController.php

@@ -24,11 +24,11 @@ use Icinga\Module\Director\Web\Widget\ShowConfigFile;
 use Icinga\Web\Notification;
 use Exception;
 use RuntimeException;
-use ipl\Html\Html;
-use ipl\Html\HtmlString;
-use gipfl\IcingaWeb2\Icon;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Html;
+use dipl\Html\HtmlString;
+use dipl\Html\Icon;
+use dipl\Html\Link;
+use dipl\Web\Url;
 
 class ConfigController extends ActionController
 {
@@ -445,7 +445,7 @@ class ConfigController extends ActionController
     }
 
     /**
-     * @return \gipfl\IcingaWeb2\Widget\Tabs
+     * @return \dipl\Web\Widget\Tabs
      */
     protected function configTabs()
     {

application/controllers/DashboardController.php

@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
+use dipl\Html\Html;
 use Icinga\Module\Director\Web\Widget\HealthCheckPluginOutput;
 use Icinga\Module\Director\Dashboard\Dashboard;
 use Icinga\Module\Director\Health;
@@ -18,13 +19,9 @@ class DashboardController extends ActionController
     protected function addDbSelection()
     {
         if ($this->isMultiDbSetup()) {
-            $form = new DbSelectorForm(
-                $this->getResponse(),
-                $this->Window(),
-                $this->listAllowedDbResourceNames()
-            );
+            $form = new DbSelectorForm($this->Window(), $this->listAllowedDbResourceNames());
             $this->content()->add($form);
-            $form->handleRequest($this->getServerRequest());
+            $form->handleRequest($this->getRequest());
         }
     }
 

application/controllers/DataController.php

@@ -11,7 +11,7 @@ use Icinga\Module\Director\Web\Table\DatafieldTable;
 use Icinga\Module\Director\Web\Table\DatalistEntryTable;
 use Icinga\Module\Director\Web\Table\DatalistTable;
 use Icinga\Module\Director\Web\Tabs\DataTabs;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class DataController extends ActionController
 {

application/controllers/HealthController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Module\Director\Web\Widget\HealthCheckPluginOutput;
 use Icinga\Module\Director\Health;
 use Icinga\Module\Director\Web\Controller\ActionController;

application/controllers/HostController.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Url;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Web\Url;
+use dipl\Web\Widget\Tabs;
 use Exception;
 use Icinga\Module\Director\CustomVariable\CustomVariableDictionary;
 use Icinga\Module\Director\Db\AppliedServiceSetLoader;

application/controllers/HostsController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use gipfl\IcingaWeb2\Url;
+use dipl\Web\Url;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterChain;
 use Icinga\Data\Filter\FilterExpression;
@@ -11,7 +11,7 @@ use Icinga\Module\Director\Forms\IcingaAddServiceForm;
 use Icinga\Module\Director\Forms\IcingaAddServiceSetForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Web\Controller\ObjectsController;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class HostsController extends ObjectsController
 {

application/controllers/ImportsourceController.php

@@ -15,7 +15,7 @@ use Icinga\Module\Director\Web\Table\PropertymodifierTable;
 use Icinga\Module\Director\Web\Tabs\ImportsourceTabs;
 use Icinga\Module\Director\Web\Widget\ImportSourceDetails;
 use InvalidArgumentException;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class ImportsourceController extends ActionController
 {
@@ -124,7 +124,7 @@ class ImportsourceController extends ActionController
         $this->addTitle('Clone: %s', $source->get('source_name'));
         $form = new CloneImportSourceForm($source);
         $this->content()->add($form);
-        $form->handleRequest($this->getServerRequest());
+        $form->handleRequest($this->getRequest());
     }
 
     /**

application/controllers/InspectController.php

@@ -10,8 +10,8 @@ use Icinga\Module\Director\Web\Table\CoreApiObjectsTable;
 use Icinga\Module\Director\Web\Table\CoreApiPrototypesTable;
 use Icinga\Module\Director\Web\Tabs\ObjectTabs;
 use Icinga\Module\Director\Web\Tree\InspectTreeRenderer;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 use Icinga\Module\Director\Web\Widget\IcingaObjectInspection;
 
 class InspectController extends ActionController

application/controllers/JobController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 use Icinga\Module\Director\Forms\DirectorJobForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\DirectorJob;

application/controllers/SchemaController.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Controllers;
 
 use Icinga\Module\Director\Web\Controller\ActionController;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 
 class SchemaController extends ActionController
 {

application/controllers/SelfServiceController.php

@@ -12,7 +12,7 @@ use Icinga\Module\Director\Objects\IcingaZone;
 use Icinga\Module\Director\Settings;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use ipl\Html\Html;
+use dipl\Html\Html;
 
 class SelfServiceController extends ActionController
 {

application/controllers/ServiceController.php

@@ -11,8 +11,8 @@ use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Web\Table\IcingaAppliedServiceTable;
 use Icinga\Web\Widget\Tab;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Html\Link;
+use dipl\Web\Widget\Tabs;
 
 class ServiceController extends ObjectController
 {

application/controllers/ServicesController.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Url;
 use Icinga\Module\Director\DirectorObject\Automation\ExportInterface;
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 

application/controllers/ServicesetController.php

@@ -9,7 +9,7 @@ use Icinga\Module\Director\Web\Controller\ObjectController;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Web\Table\IcingaServiceSetHostTable;
 use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class ServicesetController extends ObjectController
 {

application/controllers/SettingsController.php

@@ -6,7 +6,7 @@ use Icinga\Module\Director\Forms\KickstartForm;
 use Icinga\Module\Director\Forms\SelfServiceSettingsForm;
 use Icinga\Module\Director\Settings;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use ipl\Html\Html;
+use dipl\Html\Html;
 
 class SettingsController extends ActionController
 {

application/controllers/SuggestController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Exception\NotFoundError;
 use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\IcingaHost;

application/controllers/SyncruleController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use gipfl\IcingaWeb2\Widget\UnorderedList;
+use dipl\Web\Widget\UnorderedList;
 use Icinga\Module\Director\ConfigDiff;
 use Icinga\Module\Director\Db\Cache\PrefetchCache;
 use Icinga\Module\Director\DirectorObject\Automation\ExportInterface;
@@ -24,8 +24,8 @@ use Icinga\Module\Director\Web\Table\SyncpropertyTable;
 use Icinga\Module\Director\Web\Table\SyncRunTable;
 use Icinga\Module\Director\Web\Tabs\SyncRuleTabs;
 use Icinga\Module\Director\Web\Widget\SyncRunDetails;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 
 class SyncruleController extends ActionController
 {
@@ -270,7 +270,7 @@ class SyncruleController extends ActionController
 
     /**
      * @param IcingaObject[] $objects
-     * @return \ipl\Html\HtmlElement
+     * @return \dipl\Html\HtmlElement
      * @throws \Icinga\Exception\NotFoundError
      */
     protected function objectList($objects)
@@ -499,7 +499,7 @@ class SyncruleController extends ActionController
 
         $form = new CloneSyncRuleForm($rule);
         $this->content()->add($form);
-        $form->handleRequest($this->getServerRequest());
+        $form->handleRequest($this->getRequest());
     }
 
     /**

application/forms/AddToBasketForm.php

@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Forms;
 
-use ipl\Html\Html;
-use ipl\Html\HtmlDocument;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\HtmlDocument;
+use dipl\Html\Link;
 use Icinga\Module\Director\DirectorObject\Automation\Basket;
 use Icinga\Module\Director\Web\Form\DirectorForm;
 

application/forms/DeploymentLinkForm.php

@@ -9,7 +9,7 @@ use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Deployment\DeploymentInfo;
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Web\Form\DirectorForm;
-use gipfl\IcingaWeb2\Icon;
+use dipl\Html\Icon;
 use Zend_View_Interface;
 
 class DeploymentLinkForm extends DirectorForm

application/forms/IcingaHostForm.php

@@ -6,9 +6,9 @@ use Icinga\Exception\AuthenticationException;
 use Icinga\Module\Director\Repository\IcingaTemplateRepository;
 use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Html;
+use dipl\Html\Link;
 
 class IcingaHostForm extends DirectorObjectForm
 {

application/forms/IcingaServiceForm.php

@@ -11,8 +11,8 @@ use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaService;
 use Icinga\Module\Director\Objects\IcingaServiceSet;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 use RuntimeException;
 
 class IcingaServiceForm extends DirectorObjectForm

application/forms/KickstartForm.php

@@ -10,8 +10,8 @@ use Icinga\Module\Director\Db\Migrations;
 use Icinga\Module\Director\Objects\IcingaEndpoint;
 use Icinga\Module\Director\KickstartHelper;
 use Icinga\Module\Director\Web\Form\DirectorForm;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 
 class KickstartForm extends DirectorForm
 {

application/forms/RemoveLinkForm.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Forms;
 
-use gipfl\IcingaWeb2\Icon;
+use dipl\Html\Icon;
 use Icinga\Module\Director\Web\Form\DirectorForm;
 
 class RemoveLinkForm extends DirectorForm

library/Director/ConfigDiff.php

@@ -3,7 +3,7 @@
 namespace Icinga\Module\Director;
 
 use Diff;
-use ipl\Html\ValidHtml;
+use dipl\Html\ValidHtml;
 use InvalidArgumentException;
 
 class ConfigDiff implements ValidHtml

library/Director/Dashboard/Dashboard.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Dashboard;
 
-use ipl\Html\HtmlDocument;
+use dipl\Html\HtmlDocument;
 use Exception;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
@@ -10,10 +10,10 @@ use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Dashboard\Dashlet\Dashlet;
 use Icinga\Module\Director\Db;
 use Icinga\Web\Widget\Tab;
-use ipl\Html\Html;
-use ipl\Html\HtmlString;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Html\Html;
+use dipl\Html\HtmlString;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 use Zend_Db_Select as ZfSelect;
 
 abstract class Dashboard extends HtmlDocument

library/Director/Dashboard/Dashlet/Dashlet.php

@@ -6,11 +6,11 @@ use DirectoryIterator;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\Acl;
 use Icinga\Module\Director\Dashboard\Dashboard;
-use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Icon;
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Html;
+use dipl\Html\Icon;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
 
 abstract class Dashlet extends BaseHtmlElement
 {

library/Director/Import/ImportSourceSql.php

@@ -9,7 +9,7 @@ use Icinga\Module\Director\Objects\ImportSource;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Form\Filter\QueryColumnsFromSql;
 use Icinga\Module\Director\Web\Form\QuickForm;
-use ipl\Html\Html;
+use dipl\Html\Html;
 
 class ImportSourceSql extends ImportSourceHook
 {

library/Director/Resolver/CommandUsage.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Resolver;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
 use Icinga\Module\Director\Objects\IcingaCommand;
 use InvalidArgumentException;
 

library/Director/Restriction/FilterByNameRestriction.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Restriction;
 
-use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer;
+use dipl\Db\Zf1\FilterRenderer;
 use Icinga\Authentication\Auth;
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Director\Db;

library/Director/StartupLogRenderer.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Module\Director\Objects\DirectorDeploymentLog;
-use gipfl\IcingaWeb2\Link;
-use ipl\Html\ValidHtml;
+use dipl\Html\Link;
+use dipl\Html\ValidHtml;
 
 class StartupLogRenderer implements ValidHtml
 {

library/Director/TranslationDummy.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director;
 
-use gipfl\Translation\TranslationHelper;
+use dipl\Translation\TranslationHelper;
 
 class TranslationDummy
 {

library/Director/Util.php

@@ -7,8 +7,8 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Module\Director\Web\Form\QuickForm;
 use Icinga\Exception\NotImplementedError;
 use Icinga\Exception\ProgrammingError;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Html;
+use dipl\Html\Link;
 use RuntimeException;
 use Zend_Db_Expr;
 

library/Director/Web/ActionBar/AutomationObjectActionBar.php

@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Web\ActionBar;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\ActionBar;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\ActionBar;
 use Icinga\Web\Request;
 
 class AutomationObjectActionBar extends ActionBar

library/Director/Web/ActionBar/ChoicesActionBar.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\ActionBar;
 
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class ChoicesActionBar extends DirectorBaseActionBar
 {

library/Director/Web/ActionBar/DirectorBaseActionBar.php

@@ -3,10 +3,10 @@
 namespace Icinga\Module\Director\Web\ActionBar;
 
 use Icinga\Module\Director\Dashboard\Dashboard;
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\ActionBar;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\ActionBar;
+use dipl\Web\Url;
 
 class DirectorBaseActionBar extends ActionBar
 {

library/Director/Web/ActionBar/ObjectsActionBar.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\ActionBar;
 
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class ObjectsActionBar extends DirectorBaseActionBar
 {

library/Director/Web/ActionBar/TemplateActionBar.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\ActionBar;
 
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 class TemplateActionBar extends DirectorBaseActionBar
 {

library/Director/Web/Controller/ActionController.php

@@ -13,14 +13,12 @@ use Icinga\Security\SecurityException;
 use Icinga\Web\Controller;
 use Icinga\Web\UrlParams;
 use InvalidArgumentException;
-use gipfl\IcingaWeb2\Translator;
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\ControlsAndContent;
-use gipfl\IcingaWeb2\Controller\Extension\ControlsAndContentHelper;
-use gipfl\IcingaWeb2\Zf1\SimpleViewRenderer;
-use GuzzleHttp\Psr7\ServerRequest;
-use Psr\Http\Message\ServerRequestInterface;
+use dipl\Compat\Translator;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\ControlsAndContent;
+use dipl\Web\Controller\Extension\ControlsAndContentHelper;
+use dipl\Zf1\SimpleViewRenderer;
 
 abstract class ActionController extends Controller implements ControlsAndContent
 {
@@ -120,14 +118,6 @@ abstract class ActionController extends Controller implements ControlsAndContent
         return $this;
     }
 
-    /**
-     * @return ServerRequestInterface
-     */
-    protected function getServerRequest()
-    {
-        return ServerRequest::fromGlobals();
-    }
-
     protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
     {
         $limit = $this->params->get('limit', $limit);

library/Director/Web/Controller/ObjectController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\Controller;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Exception\NotFoundError;
@@ -25,7 +25,7 @@ use Icinga\Module\Director\Web\Table\ActivityLogTable;
 use Icinga\Module\Director\Web\Table\GroupMemberTable;
 use Icinga\Module\Director\Web\Table\IcingaObjectDatafieldTable;
 use Icinga\Module\Director\Web\Tabs\ObjectTabs;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 
 abstract class ObjectController extends ActionController
 {

library/Director/Web/Controller/ObjectsController.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\Controller;
 
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Icinga\Data\Filter\FilterChain;
 use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\NotFoundError;
@@ -21,7 +21,7 @@ use Icinga\Module\Director\Web\Table\ObjectsTable;
 use Icinga\Module\Director\Web\Table\TemplatesTable;
 use Icinga\Module\Director\Web\Tabs\ObjectsTabs;
 use Icinga\Module\Director\Web\Tree\TemplateTreeRenderer;
-use gipfl\IcingaWeb2\Link;
+use dipl\Html\Link;
 use Icinga\Module\Director\Web\Widget\AdditionalTableActions;
 
 abstract class ObjectsController extends ActionController

library/Director/Web/Controller/TemplateController.php

@@ -12,11 +12,11 @@ use Icinga\Module\Director\Web\Table\ObjectsTable;
 use Icinga\Module\Director\Web\Table\TemplatesTable;
 use Icinga\Module\Director\Web\Table\TemplateUsageTable;
 use Icinga\Module\Director\Web\Tabs\ObjectTabs;
-use ipl\Html\FormattedString;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\CompatController;
-use gipfl\IcingaWeb2\Widget\UnorderedList;
+use dipl\Html\FormattedString;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Web\CompatController;
+use dipl\Web\Widget\UnorderedList;
 
 abstract class TemplateController extends CompatController
 {

library/Director/Web/Form/CloneImportSourceForm.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Web\Form;
 
-use ipl\Html\Form;
-use ipl\Html\FormDecorator\DdDtDecorator;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Form;
+use dipl\Html\FormDecorator\DdDtDecorator;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Url;
 use Icinga\Module\Director\Objects\ImportSource;
 
 class CloneImportSourceForm extends Form
@@ -26,7 +26,7 @@ class CloneImportSourceForm extends Form
 
     protected function assemble()
     {
-        $this->addElement('text', 'source_name', [
+        $this->addElement('source_name', 'text', [
             'label' => $this->translate('New name'),
             'value' => $this->source->get('source_name'),
         ]);
@@ -49,7 +49,7 @@ class CloneImportSourceForm extends Form
     public function onSuccess()
     {
         $export = $this->source->export();
-        $newName = $this->getElement('source_name')->getValue();
+        $newName = $this->getValue('source_name');
         $export->source_name = $newName;
         unset($export->originalId);
 

library/Director/Web/Form/CloneSyncRuleForm.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Web\Form;
 
-use ipl\Html\Form;
-use ipl\Html\FormDecorator\DdDtDecorator;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Form;
+use dipl\Html\FormDecorator\DdDtDecorator;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Url;
 use Icinga\Module\Director\Objects\SyncRule;
 
 class CloneSyncRuleForm extends Form

library/Director/Web/Form/DbSelectorForm.php

@@ -2,9 +2,7 @@
 
 namespace Icinga\Module\Director\Web\Form;
 
-use gipfl\IcingaWeb2\Url;
-use Icinga\Web\Response;
-use ipl\Html\Form;
+use dipl\Html\Form;
 use Icinga\Web\Window;
 
 class DbSelectorForm extends Form
@@ -18,21 +16,18 @@ class DbSelectorForm extends Form
     /** @var Window */
     protected $window;
 
-    protected $response;
-
-    public function __construct(Response $response, Window $window, $allowedNames)
+    public function __construct(Window $window, $allowedNames)
     {
-        $this->response = $response;
         $this->window = $window;
         $this->allowedNames = $allowedNames;
     }
 
     protected function assemble()
     {
-        $this->addElement('hidden', 'DbSelector', [
+        $this->addElement('DbSelector', 'hidden', [
             'value' => 'sent'
         ]);
-        $this->addElement('select', 'db_resource', [
+        $this->addElement('db_resource', 'select', [
             'options' => $this->allowedNames,
             'class'   => 'autosubmit',
             'value'   => $this->getSession()->get('db_resource')
@@ -46,35 +41,15 @@ class DbSelectorForm extends Form
      */
     public function hasBeenSubmitted()
     {
-        return $this->hasBeenSent() && $this->getRequestParam('DbSelector') === 'sent';
+        return $this->hasBeenSent() && $this->getRequest()->get('DbSelector') === 'sent';
     }
 
     public function onSuccess()
     {
-        $this->getSession()->set('db_resource', $this->getElement('db_resource')->getValue());
-        $this->response->redirectAndExit(Url::fromRequest($this->getRequest()));
+        $this->getSession()->set('db_resource', $this->getValue('db_resource'));
+        $this->redirectOnSuccess();
     }
 
-    protected function getRequestParam($name, $default = null)
-    {
-        $request = $this->getRequest();
-        if ($request === null) {
-            return $default;
-        }
-        if ($request->getMethod() === 'POST') {
-            $params = $request->getParsedBody();
-        } elseif ($this->getMethod() === 'GET') {
-            parse_str($request->getUri()->getQuery(), $params);
-        } else {
-            $params = [];
-        }
-
-        if (array_key_exists($name, $params)) {
-            return $params[$name];
-        }
-
-        return $default;
-    }
     /**
      * @return \Icinga\Web\Session\SessionNamespace
      */

library/Director/Web/Form/IplElement/ExtensibleSetElement.php

@@ -5,9 +5,9 @@ namespace Icinga\Module\Director\Web\Form\IplElement;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\IcingaConfig\ExtensibleSet as Set;
 use Icinga\Module\Director\Web\Form\IconHelper;
-use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Html;
+use dipl\Translation\TranslationHelper;
 
 class ExtensibleSetElement extends BaseHtmlElement
 {

library/Director/Web/Form/QuickBaseForm.php

@@ -4,12 +4,11 @@ namespace Icinga\Module\Director\Web\Form;
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Modules\Module;
-use ipl\Html\Html;
-use ipl\Html\ValidHtml;
-use dipl\Html\ValidHtml as DiplValidHml;
+use dipl\Html\Html;
+use dipl\Html\ValidHtml;
 use Zend_Form;
 
-abstract class QuickBaseForm extends Zend_Form implements ValidHtml, DiplValidHml
+abstract class QuickBaseForm extends Zend_Form implements ValidHtml
 {
     /**
      * The Icinga module this form belongs to. Usually only set if the

library/Director/Web/ObjectPreview.php

@@ -2,14 +2,14 @@
 
 namespace Icinga\Module\Director\Web;
 
-use ipl\Html\Text;
+use dipl\Html\Text;
 use Icinga\Module\Director\Exception\NestingError;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Web\Request;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\ControlsAndContent;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\ControlsAndContent;
 
 class ObjectPreview
 {

library/Director/Web/SelfService.php

@@ -12,11 +12,11 @@ use Icinga\Exception\NotFoundError;
 use Icinga\Module\Director\IcingaConfig\AgentWizard;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Util;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\ActionBar;
-use gipfl\IcingaWeb2\Widget\ControlsAndContent;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\ActionBar;
+use dipl\Web\Widget\ControlsAndContent;
 
 class SelfService
 {

library/Director/Web/Table/ActivityLogTable.php

@@ -3,9 +3,9 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Util;
-use ipl\Html\BaseHtmlElement;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class ActivityLogTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ApplyRulesTable.php

@@ -9,11 +9,11 @@ use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Db\IcingaObjectFilterHelper;
 use Icinga\Module\Director\IcingaConfig\AssignRenderer;
 use Icinga\Module\Director\Objects\IcingaObject;
-use gipfl\IcingaWeb2\Icon;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
-use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer;
+use dipl\Db\Zf1\FilterRenderer;
+use dipl\Html\Icon;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 use Zend_Db_Select as ZfSelect;
 
 class ApplyRulesTable extends ZfQueryBasedTable

library/Director/Web/Table/BasketSnapshotTable.php

@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Director\Core\Json;
 use Icinga\Module\Director\DirectorObject\Automation\Basket;

library/Director/Web/Table/BasketTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class BasketTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ChoicesTable.php

@@ -3,9 +3,9 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Db;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 
 class ChoicesTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ConfigFileDiffTable.php

@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Util;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class ConfigFileDiffTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/CoreApiFieldsTable.php

@@ -2,12 +2,12 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use ipl\Html\Table;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Html\Table;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Url;
 
 class CoreApiFieldsTable extends Table
 {

library/Director/Web/Table/CoreApiObjectsTable.php

@@ -3,9 +3,9 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaEndpoint;
-use gipfl\IcingaWeb2\Link;
-use ipl\Html\Table;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\Link;
+use dipl\Html\Table;
+use dipl\Translation\TranslationHelper;
 
 class CoreApiObjectsTable extends Table
 {

library/Director/Web/Table/CoreApiPrototypesTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Table;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\Table;
+use dipl\Translation\TranslationHelper;
 
 class CoreApiPrototypesTable extends Table
 {

library/Director/Web/Table/CustomvarTable.php

@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Html;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Zend_Db_Adapter_Abstract as ZfDbAdapter;
 use Zend_Db_Select as ZfDbSelect;
 

library/Director/Web/Table/CustomvarVariantsTable.php

@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\PlainObjectRenderer;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Zend_Db_Adapter_Abstract as ZfDbAdapter;
 use Zend_Db_Select as ZfDbSelect;
 

library/Director/Web/Table/DatafieldTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Zend_Db_Adapter_Abstract as ZfDbAdapter;
 use Zend_Db_Select as ZfDbSelect;
 

library/Director/Web/Table/DatalistEntryTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\DirectorDatalist;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class DatalistEntryTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/DatalistTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class DatalistTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/DeploymentLogTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 use Icinga\Date\DateFormatter;
 
 class DeploymentLogTable extends ZfQueryBasedTable

library/Director/Web/Table/GeneratedConfigFileTable.php

@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class GeneratedConfigFileTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/GroupMemberTable.php

@@ -7,9 +7,9 @@ use Icinga\Module\Director\Db;
 use Icinga\Module\Director\IcingaConfig\AssignRenderer;
 use Icinga\Module\Director\Objects\IcingaObjectGroup;
 use Exception;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 
 class GroupMemberTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaAppliedServiceTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaService;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaAppliedServiceTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaCommandArgumentTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaCommand;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaCommandArgumentTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaHostAppliedForServiceTable.php

@@ -2,12 +2,12 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Module\Director\CustomVariable\CustomVariableDictionary;
 use Icinga\Module\Director\Objects\IcingaHost;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\SimpleQueryBasedTable;
 
 class IcingaHostAppliedForServiceTable extends SimpleQueryBasedTable
 {

library/Director/Web/Table/IcingaHostAppliedServicesTable.php

@@ -2,15 +2,15 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 use Icinga\Module\Director\IcingaConfig\AssignRenderer;
 use Icinga\Module\Director\Objects\HostApplyMatches;
 use Icinga\Module\Director\Objects\IcingaHost;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\SimpleQueryBasedTable;
 
 class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
 {

library/Director/Web/Table/IcingaHostServiceTable.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
+use dipl\Html\Html;
 use Icinga\Module\Director\Objects\IcingaHost;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaHostServiceTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaObjectDatafieldTable.php

@@ -6,8 +6,8 @@ use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Web\Form\IcingaObjectFieldLoader;
 use Icinga\Web\Url;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\SimpleQueryBasedTable;
 
 class IcingaObjectDatafieldTable extends SimpleQueryBasedTable
 {

library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaScheduledDowntime;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaScheduledDowntimeRangeTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaServiceSetHostTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaServiceSet;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaServiceSetHostTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaServiceSetServiceTable.php

@@ -2,15 +2,15 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
+use dipl\Html\BaseHtmlElement;
+use dipl\Html\Html;
 use Icinga\Module\Director\Forms\RemoveLinkForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaServiceSet;
-use ipl\Html\HtmlElement;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\HtmlElement;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 
 class IcingaServiceSetServiceTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/IcingaTimePeriodRangeTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\IcingaTimePeriod;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class IcingaTimePeriodRangeTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ImportedrowsTable.php

@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
-use ipl\Html\ValidHtml;
-use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable;
+use dipl\Html\Html;
+use dipl\Html\ValidHtml;
+use dipl\Web\Table\SimpleQueryBasedTable;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Module\Director\Objects\ImportRun;
 use Icinga\Module\Director\PlainObjectRenderer;

library/Director/Web/Table/ImportrunTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\ImportSource;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class ImportrunTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ImportsourceHookTable.php

@@ -2,14 +2,14 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\ValidHtml;
+use dipl\Html\ValidHtml;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Import\SyncUtils;
 use Icinga\Module\Director\Objects\ImportSource;
 use Icinga\Module\Director\PlainObjectRenderer;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable;
+use dipl\Html\Html;
+use dipl\Web\Table\SimpleQueryBasedTable;
 
 class ImportsourceHookTable extends SimpleQueryBasedTable
 {

library/Director/Web/Table/ImportsourceTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class ImportsourceTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/JobTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class JobTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/ObjectSetTable.php

@@ -4,9 +4,9 @@ namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Db;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 use Icinga\Module\Director\Restriction\FilterByNameRestriction;
 
 class ObjectSetTable extends ZfQueryBasedTable

library/Director/Web/Table/ObjectsTable.php

@@ -9,9 +9,9 @@ use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Restriction\FilterByNameRestriction;
 use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Restriction\ObjectRestriction;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 use Zend_Db_Select as ZfSelect;
 
 class ObjectsTable extends ZfQueryBasedTable
@@ -170,11 +170,6 @@ class ObjectsTable extends ZfQueryBasedTable
         return $tr;
     }
 
-protected function getRowClasses()
-{
-return [];
-}
-
     protected function applyObjectTypeFilter(ZfSelect $query)
     {
         return $query->where(

library/Director/Web/Table/ObjectsTableEndpoint.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Icon;
+use dipl\Html\Icon;
 use Zend_Db_Select as ZfSelect;
 
 class ObjectsTableEndpoint extends ObjectsTable

library/Director/Web/Table/ObjectsTableHost.php

@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Table\Extension\MultiSelect;
+use dipl\Web\Table\Extension\MultiSelect;
 
 class ObjectsTableHost extends ObjectsTable
 {

library/Director/Web/Table/ObjectsTableService.php

@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Table\Extension\MultiSelect;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Html;
+use dipl\Web\Table\Extension\MultiSelect;
+use dipl\Html\Link;
+use dipl\Web\Url;
 
 class ObjectsTableService extends ObjectsTable
 {

library/Director/Web/Table/PropertymodifierTable.php

@@ -6,10 +6,10 @@ use Error;
 use Exception;
 use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
+use dipl\Html\Link;
+use dipl\Web\Table\Extension\ZfSortablePriority;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 
 class PropertymodifierTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/QuickTable.php

@@ -15,11 +15,11 @@ use Icinga\Exception\QueryException;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\PlainObjectRenderer;
 use Icinga\Web\Request;
-use gipfl\IcingaWeb2\Url;
+use dipl\Web\Url;
 use Icinga\Web\View;
 use Icinga\Web\Widget;
 use Icinga\Web\Widget\Paginator;
-use ipl\Html\ValidHtml;
+use dipl\Html\ValidHtml;
 use stdClass;
 use Zend_Db_Select as ZfDbSelect;
 

library/Director/Web/Table/SyncRunTable.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\SyncRule;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class SyncRunTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/SyncpropertyTable.php

@@ -3,9 +3,9 @@
 namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\SyncRule;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\Extension\ZfSortablePriority;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class SyncpropertyTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/SyncruleTable.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
 
 class SyncruleTable extends ZfQueryBasedTable
 {

library/Director/Web/Table/TemplateUsageTable.php

@@ -5,9 +5,9 @@ namespace Icinga\Module\Director\Web\Table;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Resolver\TemplateTree;
-use gipfl\IcingaWeb2\Link;
-use ipl\Html\Table;
-use gipfl\Translation\TranslationHelper;
+use dipl\Html\Link;
+use dipl\Html\Table;
+use dipl\Translation\TranslationHelper;
 
 class TemplateUsageTable extends Table
 {

library/Director/Web/Table/TemplatesTable.php

@@ -2,18 +2,18 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
+use dipl\Web\Table\Extension\MultiSelect;
 use Icinga\Authentication\Auth;
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Db\IcingaObjectFilterHelper;
 use Icinga\Module\Director\Objects\IcingaObject;
-use ipl\Html\Html;
-use gipfl\IcingaWeb2\Icon;
-use gipfl\IcingaWeb2\Link;
-use gipfl\IcingaWeb2\Table\Extension\MultiSelect;
-use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
-use gipfl\IcingaWeb2\Url;
-use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer;
+use dipl\Db\Zf1\FilterRenderer;
+use dipl\Html\Html;
+use dipl\Html\Icon;
+use dipl\Html\Link;
+use dipl\Web\Table\ZfQueryBasedTable;
+use dipl\Web\Url;
 use Zend_Db_Select as ZfSelect;
 
 class TemplatesTable extends ZfQueryBasedTable implements FilterableByUsage

library/Director/Web/Tabs/DataTabs.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Tabs;
 
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 
 class DataTabs extends Tabs
 {

library/Director/Web/Tabs/ImportTabs.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Tabs;
 
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 
 class ImportTabs extends Tabs
 {

library/Director/Web/Tabs/ImportsourceTabs.php

@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Tabs;
 
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 
 class ImportsourceTabs extends Tabs
 {

library/Director/Web/Tabs/InfraTabs.php

@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Web\Tabs;
 
 use Icinga\Authentication\Auth;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 
 class InfraTabs extends Tabs
 {

library/Director/Web/Tabs/ObjectTabs.php

@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Tabs;
 
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
-use gipfl\Translation\TranslationHelper;
-use gipfl\IcingaWeb2\Widget\Tabs;
+use dipl\Translation\TranslationHelper;
+use dipl\Web\Widget\Tabs;
 
 class ObjectTabs extends Tabs
 {