Use ipl, try to keep dipl compatibility

Icinga · Sep 11, 2019 · 606d715 · 606d715
1 parent 9c62ea2
commit 606d715
Show file tree

Hide file tree

Showing 116 changed files with 369 additions and 328 deletions.
diff --git a/application/controllers/BasketController.php b/application/controllers/BasketController.php
@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Link;
-use dipl\Web\Widget\NameValueTable;
+use gipfl\IcingaWeb2\Link;
+use gipfl\IcingaWeb2\Widget\NameValueTable;
 use Exception;
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Director\ConfigDiff;
@@ -18,7 +18,7 @@
 use Icinga\Module\Director\Forms\BasketUploadForm;
 use Icinga\Module\Director\Forms\RestoreBasketForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use dipl\Html\Html;
+use ipl\Html\Html;
 use Icinga\Module\Director\Web\Table\BasketSnapshotTable;
 
 class BasketController extends ActionController

diff --git a/application/controllers/BasketsController.php b/application/controllers/BasketsController.php
@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Table\BasketTable;
 

diff --git a/application/controllers/CommandController.php b/application/controllers/CommandController.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Html;
+use ipl\Html\Html;
 use Icinga\Module\Director\Forms\IcingaCommandArgumentForm;
 use Icinga\Module\Director\Objects\IcingaCommand;
 use Icinga\Module\Director\Resolver\CommandUsage;

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -24,11 +24,11 @@
 use Icinga\Web\Notification;
 use Exception;
 use RuntimeException;
-use dipl\Html\Html;
-use dipl\Html\HtmlString;
-use dipl\Html\Icon;
-use dipl\Html\Link;
-use dipl\Web\Url;
+use ipl\Html\Html;
+use ipl\Html\HtmlString;
+use gipfl\IcingaWeb2\Icon;
+use gipfl\IcingaWeb2\Link;
+use gipfl\IcingaWeb2\Url;
 
 class ConfigController extends ActionController
 {
@@ -445,7 +445,7 @@ protected function deploymentFailed($checksum, $error = null)
     }
 
     /**
-     * @return \dipl\Web\Widget\Tabs
+     * @return \gipfl\IcingaWeb2\Widget\Tabs
      */
     protected function configTabs()
     {

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
@@ -2,7 +2,6 @@
 
 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;
@@ -19,9 +18,13 @@ protected function checkDirectorPermissions()
     protected function addDbSelection()
     {
         if ($this->isMultiDbSetup()) {
-            $form = new DbSelectorForm($this->Window(), $this->listAllowedDbResourceNames());
+            $form = new DbSelectorForm(
+                $this->getResponse(),
+                $this->Window(),
+                $this->listAllowedDbResourceNames()
+            );
             $this->content()->add($form);
-            $form->handleRequest($this->getRequest());
+            $form->handleRequest($this->getServerRequest());
         }
     }
 

diff --git a/application/controllers/DataController.php b/application/controllers/DataController.php
@@ -11,7 +11,7 @@
 use Icinga\Module\Director\Web\Table\DatalistEntryTable;
 use Icinga\Module\Director\Web\Table\DatalistTable;
 use Icinga\Module\Director\Web\Tabs\DataTabs;
-use dipl\Html\Link;
+use gipfl\IcingaWeb2\Link;
 
 class DataController extends ActionController
 {

diff --git a/application/controllers/HealthController.php b/application/controllers/HealthController.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Html;
+use ipl\Html\Html;
 use Icinga\Module\Director\Web\Widget\HealthCheckPluginOutput;
 use Icinga\Module\Director\Health;
 use Icinga\Module\Director\Web\Controller\ActionController;

diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Html;
-use dipl\Html\Link;
-use dipl\Web\Url;
-use dipl\Web\Widget\Tabs;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
+use gipfl\IcingaWeb2\Url;
+use gipfl\IcingaWeb2\Widget\Tabs;
 use Exception;
 use Icinga\Module\Director\CustomVariable\CustomVariableDictionary;
 use Icinga\Module\Director\Db\AppliedServiceSetLoader;

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Web\Url;
+use gipfl\IcingaWeb2\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\IcingaAddServiceSetForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Web\Controller\ObjectsController;
-use dipl\Html\Link;
+use gipfl\IcingaWeb2\Link;
 
 class HostsController extends ObjectsController
 {

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

diff --git a/application/controllers/InspectController.php b/application/controllers/InspectController.php
@@ -10,8 +10,8 @@
 use Icinga\Module\Director\Web\Table\CoreApiPrototypesTable;
 use Icinga\Module\Director\Web\Tabs\ObjectTabs;
 use Icinga\Module\Director\Web\Tree\InspectTreeRenderer;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 use Icinga\Module\Director\Web\Widget\IcingaObjectInspection;
 
 class InspectController extends ActionController

diff --git a/application/controllers/JobController.php b/application/controllers/JobController.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Link;
+use gipfl\IcingaWeb2\Link;
 use Icinga\Module\Director\Forms\DirectorJobForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\DirectorJob;

diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php
@@ -3,8 +3,8 @@
 namespace Icinga\Module\Director\Controllers;
 
 use Icinga\Module\Director\Web\Controller\ActionController;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 
 class SchemaController extends ActionController
 {

diff --git a/application/controllers/SelfServiceController.php b/application/controllers/SelfServiceController.php
@@ -12,7 +12,7 @@
 use Icinga\Module\Director\Settings;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use dipl\Html\Html;
+use ipl\Html\Html;
 
 class SelfServiceController extends ActionController
 {

diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
@@ -11,8 +11,8 @@
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Web\Table\IcingaAppliedServiceTable;
 use Icinga\Web\Widget\Tab;
-use dipl\Html\Link;
-use dipl\Web\Widget\Tabs;
+use gipfl\IcingaWeb2\Link;
+use gipfl\IcingaWeb2\Widget\Tabs;
 
 class ServiceController extends ObjectController
 {

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -2,8 +2,8 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Link;
-use dipl\Web\Url;
+use gipfl\IcingaWeb2\Link;
+use gipfl\IcingaWeb2\Url;
 use Icinga\Module\Director\DirectorObject\Automation\ExportInterface;
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 

diff --git a/application/controllers/ServicesetController.php b/application/controllers/ServicesetController.php
@@ -9,7 +9,7 @@
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Web\Table\IcingaServiceSetHostTable;
 use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
-use dipl\Html\Link;
+use gipfl\IcingaWeb2\Link;
 
 class ServicesetController extends ObjectController
 {

diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php
@@ -6,7 +6,7 @@
 use Icinga\Module\Director\Forms\SelfServiceSettingsForm;
 use Icinga\Module\Director\Settings;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use dipl\Html\Html;
+use ipl\Html\Html;
 
 class SettingsController extends ActionController
 {

diff --git a/application/controllers/SuggestController.php b/application/controllers/SuggestController.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use dipl\Html\Html;
+use ipl\Html\Html;
 use Icinga\Exception\NotFoundError;
 use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\IcingaHost;

diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
@@ -24,8 +24,8 @@
 use Icinga\Module\Director\Web\Table\SyncRunTable;
 use Icinga\Module\Director\Web\Tabs\SyncRuleTabs;
 use Icinga\Module\Director\Web\Widget\SyncRunDetails;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 
 class SyncruleController extends ActionController
 {
@@ -270,7 +270,7 @@ public function previewAction()
 
     /**
      * @param IcingaObject[] $objects
-     * @return \dipl\Html\HtmlElement
+     * @return \ipl\Html\HtmlElement
      * @throws \Icinga\Exception\NotFoundError
      */
     protected function objectList($objects)
@@ -499,7 +499,7 @@ public function cloneAction()
 
         $form = new CloneSyncRuleForm($rule);
         $this->content()->add($form);
-        $form->handleRequest($this->getRequest());
+        $form->handleRequest($this->getServerRequest());
     }
 
     /**

diff --git a/application/forms/AddToBasketForm.php b/application/forms/AddToBasketForm.php
@@ -2,9 +2,9 @@
 
 namespace Icinga\Module\Director\Forms;
 
-use dipl\Html\Html;
-use dipl\Html\HtmlDocument;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use ipl\Html\HtmlDocument;
+use gipfl\IcingaWeb2\Link;
 use Icinga\Module\Director\DirectorObject\Automation\Basket;
 use Icinga\Module\Director\Web\Form\DirectorForm;
 

diff --git a/application/forms/DeploymentLinkForm.php b/application/forms/DeploymentLinkForm.php
@@ -9,7 +9,7 @@
 use Icinga\Module\Director\Deployment\DeploymentInfo;
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Web\Form\DirectorForm;
-use dipl\Html\Icon;
+use gipfl\IcingaWeb2\Icon;
 use Zend_View_Interface;
 
 class DeploymentLinkForm extends DirectorForm

diff --git a/application/forms/IcingaHostForm.php b/application/forms/IcingaHostForm.php
@@ -6,9 +6,9 @@
 use Icinga\Module\Director\Repository\IcingaTemplateRepository;
 use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use dipl\Html\BaseHtmlElement;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 
 class IcingaHostForm extends DirectorObjectForm
 {

diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php
@@ -11,8 +11,8 @@
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaService;
 use Icinga\Module\Director\Objects\IcingaServiceSet;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 use RuntimeException;
 
 class IcingaServiceForm extends DirectorObjectForm

diff --git a/application/forms/KickstartForm.php b/application/forms/KickstartForm.php
@@ -10,8 +10,8 @@
 use Icinga\Module\Director\Objects\IcingaEndpoint;
 use Icinga\Module\Director\KickstartHelper;
 use Icinga\Module\Director\Web\Form\DirectorForm;
-use dipl\Html\Html;
-use dipl\Html\Link;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Link;
 
 class KickstartForm extends DirectorForm
 {

diff --git a/application/forms/RemoveLinkForm.php b/application/forms/RemoveLinkForm.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Forms;
 
-use dipl\Html\Icon;
+use gipfl\IcingaWeb2\Icon;
 use Icinga\Module\Director\Web\Form\DirectorForm;
 
 class RemoveLinkForm extends DirectorForm

diff --git a/library/Director/ConfigDiff.php b/library/Director/ConfigDiff.php
@@ -3,7 +3,7 @@
 namespace Icinga\Module\Director;
 
 use Diff;
-use dipl\Html\ValidHtml;
+use ipl\Html\ValidHtml;
 use InvalidArgumentException;
 
 class ConfigDiff implements ValidHtml

diff --git a/library/Director/Dashboard/Dashboard.php b/library/Director/Dashboard/Dashboard.php
@@ -2,18 +2,18 @@
 
 namespace Icinga\Module\Director\Dashboard;
 
-use dipl\Html\HtmlDocument;
+use ipl\Html\HtmlDocument;
 use Exception;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Dashboard\Dashlet\Dashlet;
 use Icinga\Module\Director\Db;
 use Icinga\Web\Widget\Tab;
-use dipl\Html\Html;
-use dipl\Html\HtmlString;
-use dipl\Translation\TranslationHelper;
-use dipl\Web\Widget\Tabs;
+use ipl\Html\Html;
+use ipl\Html\HtmlString;
+use gipfl\Translation\TranslationHelper;
+use gipfl\IcingaWeb2\Widget\Tabs;
 use Zend_Db_Select as ZfSelect;
 
 abstract class Dashboard extends HtmlDocument

diff --git a/library/Director/Dashboard/Dashlet/Dashlet.php b/library/Director/Dashboard/Dashlet/Dashlet.php
@@ -6,11 +6,11 @@
 use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\Acl;
 use Icinga\Module\Director\Dashboard\Dashboard;
-use dipl\Html\BaseHtmlElement;
-use dipl\Html\Html;
-use dipl\Html\Icon;
-use dipl\Html\Link;
-use dipl\Translation\TranslationHelper;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\Html;
+use gipfl\IcingaWeb2\Icon;
+use gipfl\IcingaWeb2\Link;
+use gipfl\Translation\TranslationHelper;
 
 abstract class Dashlet extends BaseHtmlElement
 {