From 606d71501ef1486a4aac847ccd2a52f8a380736e Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 2 May 2019 13:23:06 +0200 Subject: [PATCH] Use ipl, try to keep dipl compatibility --- application/controllers/BasketController.php | 6 +-- application/controllers/BasketsController.php | 4 +- application/controllers/CommandController.php | 2 +- application/controllers/ConfigController.php | 12 +++--- .../controllers/DashboardController.php | 9 +++-- application/controllers/DataController.php | 2 +- application/controllers/HealthController.php | 2 +- application/controllers/HostController.php | 8 ++-- application/controllers/HostsController.php | 4 +- .../controllers/ImportsourceController.php | 4 +- application/controllers/InspectController.php | 4 +- application/controllers/JobController.php | 2 +- application/controllers/SchemaController.php | 4 +- .../controllers/SelfServiceController.php | 2 +- application/controllers/ServiceController.php | 4 +- .../controllers/ServicesController.php | 4 +- .../controllers/ServicesetController.php | 2 +- .../controllers/SettingsController.php | 2 +- application/controllers/SuggestController.php | 2 +- .../controllers/SyncruleController.php | 8 ++-- application/forms/AddToBasketForm.php | 6 +-- application/forms/DeploymentLinkForm.php | 2 +- application/forms/IcingaHostForm.php | 6 +-- application/forms/IcingaServiceForm.php | 4 +- application/forms/KickstartForm.php | 4 +- application/forms/RemoveLinkForm.php | 2 +- library/Director/ConfigDiff.php | 2 +- library/Director/Dashboard/Dashboard.php | 10 ++--- .../Director/Dashboard/Dashlet/Dashlet.php | 10 ++--- library/Director/Import/ImportSourceSql.php | 2 +- library/Director/Resolver/CommandUsage.php | 4 +- .../Restriction/FilterByNameRestriction.php | 2 +- library/Director/StartupLogRenderer.php | 6 +-- library/Director/TranslationDummy.php | 2 +- library/Director/Util.php | 4 +- .../ActionBar/AutomationObjectActionBar.php | 6 +-- .../Web/ActionBar/ChoicesActionBar.php | 2 +- .../Web/ActionBar/DirectorBaseActionBar.php | 8 ++-- .../Web/ActionBar/ObjectsActionBar.php | 2 +- .../Web/ActionBar/TemplateActionBar.php | 2 +- .../Web/Controller/ActionController.php | 22 ++++++++--- .../Web/Controller/ObjectController.php | 4 +- .../Web/Controller/ObjectsController.php | 4 +- .../Web/Form/CloneImportSourceForm.php | 12 +++--- .../Director/Web/Form/CloneSyncRuleForm.php | 8 ++-- library/Director/Web/Form/DbSelectorForm.php | 39 +++++++++++++++---- .../Form/IplElement/ExtensibleSetElement.php | 6 +-- library/Director/Web/Form/QuickBaseForm.php | 7 ++-- library/Director/Web/ObjectPreview.php | 10 ++--- library/Director/Web/SelfService.php | 10 ++--- .../Director/Web/Table/ActivityLogTable.php | 6 +-- .../Director/Web/Table/ApplyRulesTable.php | 10 ++--- .../Web/Table/BasketSnapshotTable.php | 6 +-- library/Director/Web/Table/BasketTable.php | 4 +- library/Director/Web/Table/ChoicesTable.php | 6 +-- .../Web/Table/ConfigFileDiffTable.php | 4 +- .../Director/Web/Table/CoreApiFieldsTable.php | 12 +++--- .../Web/Table/CoreApiObjectsTable.php | 6 +-- .../Web/Table/CoreApiPrototypesTable.php | 4 +- library/Director/Web/Table/CustomvarTable.php | 6 +-- .../Web/Table/CustomvarVariantsTable.php | 4 +- library/Director/Web/Table/DatafieldTable.php | 4 +- .../Director/Web/Table/DatalistEntryTable.php | 4 +- library/Director/Web/Table/DatalistTable.php | 4 +- .../Director/Web/Table/DeploymentLogTable.php | 4 +- .../Web/Table/GeneratedConfigFileTable.php | 4 +- .../Director/Web/Table/GroupMemberTable.php | 6 +-- .../Web/Table/IcingaAppliedServiceTable.php | 4 +- .../Web/Table/IcingaCommandArgumentTable.php | 4 +- .../IcingaHostAppliedForServiceTable.php | 6 +-- .../Table/IcingaHostAppliedServicesTable.php | 6 +-- .../Web/Table/IcingaHostServiceTable.php | 6 +-- .../Web/Table/IcingaObjectDatafieldTable.php | 4 +- .../IcingaScheduledDowntimeRangeTable.php | 4 +- .../Web/Table/IcingaServiceSetHostTable.php | 4 +- .../Table/IcingaServiceSetServiceTable.php | 12 +++--- .../Web/Table/IcingaTimePeriodRangeTable.php | 4 +- .../Director/Web/Table/ImportedrowsTable.php | 6 +-- library/Director/Web/Table/ImportrunTable.php | 4 +- .../Web/Table/ImportsourceHookTable.php | 6 +-- .../Director/Web/Table/ImportsourceTable.php | 4 +- library/Director/Web/Table/JobTable.php | 4 +- library/Director/Web/Table/ObjectSetTable.php | 6 +-- library/Director/Web/Table/ObjectsTable.php | 6 +-- .../Web/Table/ObjectsTableEndpoint.php | 2 +- .../Director/Web/Table/ObjectsTableHost.php | 2 +- .../Web/Table/ObjectsTableService.php | 8 ++-- .../Web/Table/PropertymodifierTable.php | 8 ++-- library/Director/Web/Table/QuickTable.php | 4 +- library/Director/Web/Table/SyncRunTable.php | 4 +- .../Director/Web/Table/SyncpropertyTable.php | 6 +-- library/Director/Web/Table/SyncruleTable.php | 4 +- .../Director/Web/Table/TemplateUsageTable.php | 6 +-- library/Director/Web/Table/TemplatesTable.php | 14 +++---- library/Director/Web/Tabs/DataTabs.php | 4 +- library/Director/Web/Tabs/ImportTabs.php | 4 +- .../Director/Web/Tabs/ImportsourceTabs.php | 4 +- library/Director/Web/Tabs/InfraTabs.php | 4 +- library/Director/Web/Tabs/ObjectTabs.php | 4 +- library/Director/Web/Tabs/ObjectsTabs.php | 4 +- library/Director/Web/Tabs/SyncRuleTabs.php | 4 +- .../Director/Web/Tree/InspectTreeRenderer.php | 8 ++-- .../Web/Tree/TemplateTreeRenderer.php | 10 ++--- .../Director/Web/Widget/ActivityLogInfo.php | 18 ++++----- .../Web/Widget/AdditionalTableActions.php | 14 +++---- .../Web/Widget/DeployedConfigInfoHeader.php | 10 ++--- .../Director/Web/Widget/DeploymentInfo.php | 14 +++---- .../Web/Widget/HealthCheckPluginOutput.php | 8 ++-- .../Web/Widget/HostServiceRedirector.php | 2 +- .../Web/Widget/IcingaObjectInspection.php | 10 ++--- .../Web/Widget/ImportSourceDetails.php | 6 +-- library/Director/Web/Widget/JobDetails.php | 6 +-- .../Director/Web/Widget/ShowConfigFile.php | 10 ++--- .../Director/Web/Widget/SyncRunDetails.php | 10 ++--- library/vendor/ipl/Db/Zf1/FilterRenderer.php | 2 +- library/vendor/ipl/Html/ValidHtml.php | 4 +- 116 files changed, 369 insertions(+), 328 deletions(-) diff --git a/application/controllers/BasketController.php b/application/controllers/BasketController.php index 74daf67c6..48c0c9dd5 100644 --- 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 index 2f2ec9f92..7d13fee8a 100644 --- 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 index 53b0196e7..6d250eac4 100644 --- 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 index a05922ae3..792d55618 100644 --- 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 index 0bde42643..38d84ec22 100644 --- 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 index 983ac59fc..d3d10345c 100644 --- 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 index 987062ef6..87c30606d 100644 --- 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 index cb1594c39..e0ea63eb1 100644 --- 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 index 6a2e6ecd8..03320729e 100644 --- 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 index d7e7a2cfb..f51524f58 100644 --- 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 index 9dbe8dccd..9aec3da6f 100644 --- 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 index 68fd0277d..3164ee553 100644 --- 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 index a8b014229..b0ca24e42 100644 --- 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 index b9d82b978..bce9785b8 100644 --- 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 index 78a3542bd..1cd7db444 100644 --- 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 index 45db5eead..8d178c200 100644 --- 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 index fce542567..dec7de436 100644 --- 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 index 4eea1d254..c4709e6b8 100644 --- 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 index 54d6911df..665e2ad9f 100644 --- 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 index eb5467a63..2d6c35abc 100644 --- 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 index 61053ddbb..28b151e57 100644 --- 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 index 6d158fc2e..55902733e 100644 --- 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 index 7b68ffa31..09131aae1 100644 --- 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 index 0ed2daeac..d802c7672 100644 --- 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 index bbf4f4aa5..7fe8db52a 100644 --- 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 index 75fc654f3..6f0c7cc95 100644 --- 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 index d439a2da5..b350fd468 100644 --- 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 index c77029e3e..99e4fba32 100644 --- a/library/Director/Dashboard/Dashboard.php +++ b/library/Director/Dashboard/Dashboard.php @@ -2,7 +2,7 @@ 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; @@ -10,10 +10,10 @@ 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 index cfa35d8c8..984abfc4d 100644 --- 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 { diff --git a/library/Director/Import/ImportSourceSql.php b/library/Director/Import/ImportSourceSql.php index 5c44fcac0..8711c7b58 100644 --- a/library/Director/Import/ImportSourceSql.php +++ b/library/Director/Import/ImportSourceSql.php @@ -9,7 +9,7 @@ use Icinga\Module\Director\Util; use Icinga\Module\Director\Web\Form\Filter\QueryColumnsFromSql; use Icinga\Module\Director\Web\Form\QuickForm; -use dipl\Html\Html; +use ipl\Html\Html; class ImportSourceSql extends ImportSourceHook { diff --git a/library/Director/Resolver/CommandUsage.php b/library/Director/Resolver/CommandUsage.php index e9a3b7cdc..7e3e0c5a5 100644 --- a/library/Director/Resolver/CommandUsage.php +++ b/library/Director/Resolver/CommandUsage.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Resolver; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; use Icinga\Module\Director\Objects\IcingaCommand; use InvalidArgumentException; diff --git a/library/Director/Restriction/FilterByNameRestriction.php b/library/Director/Restriction/FilterByNameRestriction.php index fcf180220..8c3b25696 100644 --- a/library/Director/Restriction/FilterByNameRestriction.php +++ b/library/Director/Restriction/FilterByNameRestriction.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Restriction; -use dipl\Db\Zf1\FilterRenderer; +use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer; use Icinga\Authentication\Auth; use Icinga\Data\Filter\Filter; use Icinga\Module\Director\Db; diff --git a/library/Director/StartupLogRenderer.php b/library/Director/StartupLogRenderer.php index 1d22b39df..bc7b3ea45 100644 --- a/library/Director/StartupLogRenderer.php +++ b/library/Director/StartupLogRenderer.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director; -use dipl\Html\Html; +use ipl\Html\Html; use Icinga\Module\Director\Objects\DirectorDeploymentLog; -use dipl\Html\Link; -use dipl\Html\ValidHtml; +use gipfl\IcingaWeb2\Link; +use ipl\Html\ValidHtml; class StartupLogRenderer implements ValidHtml { diff --git a/library/Director/TranslationDummy.php b/library/Director/TranslationDummy.php index ff1bda02b..937cc0b2b 100644 --- a/library/Director/TranslationDummy.php +++ b/library/Director/TranslationDummy.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director; -use dipl\Translation\TranslationHelper; +use gipfl\Translation\TranslationHelper; class TranslationDummy { diff --git a/library/Director/Util.php b/library/Director/Util.php index 489a1b728..aac2e30a8 100644 --- a/library/Director/Util.php +++ b/library/Director/Util.php @@ -7,8 +7,8 @@ use Icinga\Module\Director\Web\Form\QuickForm; use Icinga\Exception\NotImplementedError; use Icinga\Exception\ProgrammingError; -use dipl\Html\Html; -use dipl\Html\Link; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; use RuntimeException; use Zend_Db_Expr; diff --git a/library/Director/Web/ActionBar/AutomationObjectActionBar.php b/library/Director/Web/ActionBar/AutomationObjectActionBar.php index 49d162b51..247677fd0 100644 --- a/library/Director/Web/ActionBar/AutomationObjectActionBar.php +++ b/library/Director/Web/ActionBar/AutomationObjectActionBar.php @@ -2,9 +2,9 @@ namespace Icinga\Module\Director\Web\ActionBar; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\ActionBar; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\ActionBar; use Icinga\Web\Request; class AutomationObjectActionBar extends ActionBar diff --git a/library/Director/Web/ActionBar/ChoicesActionBar.php b/library/Director/Web/ActionBar/ChoicesActionBar.php index 1c77ea4a4..7b59d2cfa 100644 --- a/library/Director/Web/ActionBar/ChoicesActionBar.php +++ b/library/Director/Web/ActionBar/ChoicesActionBar.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\ActionBar; -use dipl\Html\Link; +use gipfl\IcingaWeb2\Link; class ChoicesActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/ActionBar/DirectorBaseActionBar.php b/library/Director/Web/ActionBar/DirectorBaseActionBar.php index 222f5ff96..8612a0d30 100644 --- a/library/Director/Web/ActionBar/DirectorBaseActionBar.php +++ b/library/Director/Web/ActionBar/DirectorBaseActionBar.php @@ -3,10 +3,10 @@ namespace Icinga\Module\Director\Web\ActionBar; use Icinga\Module\Director\Dashboard\Dashboard; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\ActionBar; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\ActionBar; +use gipfl\IcingaWeb2\Url; class DirectorBaseActionBar extends ActionBar { diff --git a/library/Director/Web/ActionBar/ObjectsActionBar.php b/library/Director/Web/ActionBar/ObjectsActionBar.php index 56395a3c9..5f86949af 100644 --- a/library/Director/Web/ActionBar/ObjectsActionBar.php +++ b/library/Director/Web/ActionBar/ObjectsActionBar.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\ActionBar; -use dipl\Html\Link; +use gipfl\IcingaWeb2\Link; class ObjectsActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/ActionBar/TemplateActionBar.php b/library/Director/Web/ActionBar/TemplateActionBar.php index 5364c16e6..53e65ed6b 100644 --- a/library/Director/Web/ActionBar/TemplateActionBar.php +++ b/library/Director/Web/ActionBar/TemplateActionBar.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\ActionBar; -use dipl\Html\Link; +use gipfl\IcingaWeb2\Link; class TemplateActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/Controller/ActionController.php b/library/Director/Web/Controller/ActionController.php index 48a78a041..129befa3e 100644 --- a/library/Director/Web/Controller/ActionController.php +++ b/library/Director/Web/Controller/ActionController.php @@ -13,12 +13,14 @@ use Icinga\Web\Controller; use Icinga\Web\UrlParams; use InvalidArgumentException; -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; +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; abstract class ActionController extends Controller implements ControlsAndContent { @@ -118,6 +120,14 @@ public function setAutorefreshInterval($interval) 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); diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php index 188c4e3db..60a835f55 100644 --- a/library/Director/Web/Controller/ObjectController.php +++ b/library/Director/Web/Controller/ObjectController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Controller; -use dipl\Html\Html; +use ipl\Html\Html; use Icinga\Exception\IcingaException; use Icinga\Exception\InvalidPropertyException; use Icinga\Exception\NotFoundError; @@ -25,7 +25,7 @@ use Icinga\Module\Director\Web\Table\GroupMemberTable; use Icinga\Module\Director\Web\Table\IcingaObjectDatafieldTable; use Icinga\Module\Director\Web\Tabs\ObjectTabs; -use dipl\Html\Link; +use gipfl\IcingaWeb2\Link; abstract class ObjectController extends ActionController { diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php index 69cd8e3d3..3a1c7c792 100644 --- a/library/Director/Web/Controller/ObjectsController.php +++ b/library/Director/Web/Controller/ObjectsController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Controller; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\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\TemplatesTable; use Icinga\Module\Director\Web\Tabs\ObjectsTabs; use Icinga\Module\Director\Web\Tree\TemplateTreeRenderer; -use dipl\Html\Link; +use gipfl\IcingaWeb2\Link; use Icinga\Module\Director\Web\Widget\AdditionalTableActions; abstract class ObjectsController extends ActionController diff --git a/library/Director/Web/Form/CloneImportSourceForm.php b/library/Director/Web/Form/CloneImportSourceForm.php index fb3e649e2..415ba611d 100644 --- a/library/Director/Web/Form/CloneImportSourceForm.php +++ b/library/Director/Web/Form/CloneImportSourceForm.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Form; -use dipl\Html\Form; -use dipl\Html\FormDecorator\DdDtDecorator; -use dipl\Translation\TranslationHelper; -use dipl\Web\Url; +use ipl\Html\Form; +use ipl\Html\FormDecorator\DdDtDecorator; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Url; use Icinga\Module\Director\Objects\ImportSource; class CloneImportSourceForm extends Form @@ -26,7 +26,7 @@ public function __construct(ImportSource $source) protected function assemble() { - $this->addElement('source_name', 'text', [ + $this->addElement('text', 'source_name', [ 'label' => $this->translate('New name'), 'value' => $this->source->get('source_name'), ]); @@ -49,7 +49,7 @@ protected function getTargetDb() public function onSuccess() { $export = $this->source->export(); - $newName = $this->getValue('source_name'); + $newName = $this->getElement('source_name')->getValue(); $export->source_name = $newName; unset($export->originalId); diff --git a/library/Director/Web/Form/CloneSyncRuleForm.php b/library/Director/Web/Form/CloneSyncRuleForm.php index 2077135b5..bb6f1bf95 100644 --- a/library/Director/Web/Form/CloneSyncRuleForm.php +++ b/library/Director/Web/Form/CloneSyncRuleForm.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Form; -use dipl\Html\Form; -use dipl\Html\FormDecorator\DdDtDecorator; -use dipl\Translation\TranslationHelper; -use dipl\Web\Url; +use ipl\Html\Form; +use ipl\Html\FormDecorator\DdDtDecorator; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Url; use Icinga\Module\Director\Objects\SyncRule; class CloneSyncRuleForm extends Form diff --git a/library/Director/Web/Form/DbSelectorForm.php b/library/Director/Web/Form/DbSelectorForm.php index 54df00811..52fe5ea34 100644 --- a/library/Director/Web/Form/DbSelectorForm.php +++ b/library/Director/Web/Form/DbSelectorForm.php @@ -2,7 +2,9 @@ namespace Icinga\Module\Director\Web\Form; -use dipl\Html\Form; +use gipfl\IcingaWeb2\Url; +use Icinga\Web\Response; +use ipl\Html\Form; use Icinga\Web\Window; class DbSelectorForm extends Form @@ -16,18 +18,21 @@ class DbSelectorForm extends Form /** @var Window */ protected $window; - public function __construct(Window $window, $allowedNames) + protected $response; + + public function __construct(Response $response, Window $window, $allowedNames) { + $this->response = $response; $this->window = $window; $this->allowedNames = $allowedNames; } protected function assemble() { - $this->addElement('DbSelector', 'hidden', [ + $this->addElement('hidden', 'DbSelector', [ 'value' => 'sent' ]); - $this->addElement('db_resource', 'select', [ + $this->addElement('select', 'db_resource', [ 'options' => $this->allowedNames, 'class' => 'autosubmit', 'value' => $this->getSession()->get('db_resource') @@ -41,15 +46,35 @@ protected function assemble() */ public function hasBeenSubmitted() { - return $this->hasBeenSent() && $this->getRequest()->get('DbSelector') === 'sent'; + return $this->hasBeenSent() && $this->getRequestParam('DbSelector') === 'sent'; } public function onSuccess() { - $this->getSession()->set('db_resource', $this->getValue('db_resource')); - $this->redirectOnSuccess(); + $this->getSession()->set('db_resource', $this->getElement('db_resource')->getValue()); + $this->response->redirectAndExit(Url::fromRequest($this->getRequest())); } + 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 */ diff --git a/library/Director/Web/Form/IplElement/ExtensibleSetElement.php b/library/Director/Web/Form/IplElement/ExtensibleSetElement.php index 96c21012e..8c440cda8 100644 --- a/library/Director/Web/Form/IplElement/ExtensibleSetElement.php +++ b/library/Director/Web/Form/IplElement/ExtensibleSetElement.php @@ -5,9 +5,9 @@ use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\IcingaConfig\ExtensibleSet as Set; use Icinga\Module\Director\Web\Form\IconHelper; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; -use dipl\Translation\TranslationHelper; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; +use gipfl\Translation\TranslationHelper; class ExtensibleSetElement extends BaseHtmlElement { diff --git a/library/Director/Web/Form/QuickBaseForm.php b/library/Director/Web/Form/QuickBaseForm.php index ed8ef7a4a..43ce82a94 100644 --- a/library/Director/Web/Form/QuickBaseForm.php +++ b/library/Director/Web/Form/QuickBaseForm.php @@ -4,11 +4,12 @@ use Icinga\Application\Icinga; use Icinga\Application\Modules\Module; -use dipl\Html\Html; -use dipl\Html\ValidHtml; +use ipl\Html\Html; +use ipl\Html\ValidHtml; +use dipl\Html\ValidHtml as DiplValidHml; use Zend_Form; -abstract class QuickBaseForm extends Zend_Form implements ValidHtml +abstract class QuickBaseForm extends Zend_Form implements ValidHtml, DiplValidHml { /** * The Icinga module this form belongs to. Usually only set if the diff --git a/library/Director/Web/ObjectPreview.php b/library/Director/Web/ObjectPreview.php index f54009a25..ca1387c46 100644 --- a/library/Director/Web/ObjectPreview.php +++ b/library/Director/Web/ObjectPreview.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Director\Web; -use dipl\Html\Text; +use ipl\Html\Text; use Icinga\Module\Director\Exception\NestingError; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Web\Request; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\ControlsAndContent; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\ControlsAndContent; class ObjectPreview { diff --git a/library/Director/Web/SelfService.php b/library/Director/Web/SelfService.php index a58ce24c0..8b513d223 100644 --- a/library/Director/Web/SelfService.php +++ b/library/Director/Web/SelfService.php @@ -12,11 +12,11 @@ use Icinga\Module\Director\IcingaConfig\AgentWizard; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Util; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\ActionBar; -use dipl\Web\Widget\ControlsAndContent; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\ActionBar; +use gipfl\IcingaWeb2\Widget\ControlsAndContent; class SelfService { diff --git a/library/Director/Web/Table/ActivityLogTable.php b/library/Director/Web/Table/ActivityLogTable.php index 74cdabb6f..90e85d9c9 100644 --- a/library/Director/Web/Table/ActivityLogTable.php +++ b/library/Director/Web/Table/ActivityLogTable.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Util; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use ipl\Html\BaseHtmlElement; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class ActivityLogTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ApplyRulesTable.php b/library/Director/Web/Table/ApplyRulesTable.php index 148dda3e5..2be27cc27 100644 --- a/library/Director/Web/Table/ApplyRulesTable.php +++ b/library/Director/Web/Table/ApplyRulesTable.php @@ -9,11 +9,11 @@ use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\IcingaConfig\AssignRenderer; use Icinga\Module\Director\Objects\IcingaObject; -use dipl\Db\Zf1\FilterRenderer; -use dipl\Html\Icon; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Icon; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; +use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer; use Zend_Db_Select as ZfSelect; class ApplyRulesTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/BasketSnapshotTable.php b/library/Director/Web/Table/BasketSnapshotTable.php index b7b6bd574..08f808ab0 100644 --- a/library/Director/Web/Table/BasketSnapshotTable.php +++ b/library/Director/Web/Table/BasketSnapshotTable.php @@ -2,9 +2,9 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use Icinga\Date\DateFormatter; use Icinga\Module\Director\Core\Json; use Icinga\Module\Director\DirectorObject\Automation\Basket; diff --git a/library/Director/Web/Table/BasketTable.php b/library/Director/Web/Table/BasketTable.php index 4c3815933..022fb480b 100644 --- a/library/Director/Web/Table/BasketTable.php +++ b/library/Director/Web/Table/BasketTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class BasketTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ChoicesTable.php b/library/Director/Web/Table/ChoicesTable.php index 6bca31433..4ba24602c 100644 --- a/library/Director/Web/Table/ChoicesTable.php +++ b/library/Director/Web/Table/ChoicesTable.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; class ChoicesTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ConfigFileDiffTable.php b/library/Director/Web/Table/ConfigFileDiffTable.php index 0bc00f9e1..1d14d5e0a 100644 --- a/library/Director/Web/Table/ConfigFileDiffTable.php +++ b/library/Director/Web/Table/ConfigFileDiffTable.php @@ -4,8 +4,8 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Util; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class ConfigFileDiffTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/CoreApiFieldsTable.php b/library/Director/Web/Table/CoreApiFieldsTable.php index 25e73d346..90c3e5eb3 100644 --- a/library/Director/Web/Table/CoreApiFieldsTable.php +++ b/library/Director/Web/Table/CoreApiFieldsTable.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Html\Table; -use dipl\Translation\TranslationHelper; -use dipl\Web\Url; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use ipl\Html\Table; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Url; class CoreApiFieldsTable extends Table { diff --git a/library/Director/Web/Table/CoreApiObjectsTable.php b/library/Director/Web/Table/CoreApiObjectsTable.php index 411064fff..0dd223d55 100644 --- a/library/Director/Web/Table/CoreApiObjectsTable.php +++ b/library/Director/Web/Table/CoreApiObjectsTable.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaEndpoint; -use dipl\Html\Link; -use dipl\Html\Table; -use dipl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Link; +use ipl\Html\Table; +use gipfl\Translation\TranslationHelper; class CoreApiObjectsTable extends Table { diff --git a/library/Director/Web/Table/CoreApiPrototypesTable.php b/library/Director/Web/Table/CoreApiPrototypesTable.php index 73fec13e9..ecc62bda3 100644 --- a/library/Director/Web/Table/CoreApiPrototypesTable.php +++ b/library/Director/Web/Table/CoreApiPrototypesTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Table; -use dipl\Translation\TranslationHelper; +use ipl\Html\Table; +use gipfl\Translation\TranslationHelper; class CoreApiPrototypesTable extends Table { diff --git a/library/Director/Web/Table/CustomvarTable.php b/library/Director/Web/Table/CustomvarTable.php index 012a47ea6..f9a384471 100644 --- a/library/Director/Web/Table/CustomvarTable.php +++ b/library/Director/Web/Table/CustomvarTable.php @@ -2,9 +2,9 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/CustomvarVariantsTable.php b/library/Director/Web/Table/CustomvarVariantsTable.php index f29a89c62..80fca7050 100644 --- a/library/Director/Web/Table/CustomvarVariantsTable.php +++ b/library/Director/Web/Table/CustomvarVariantsTable.php @@ -4,8 +4,8 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\PlainObjectRenderer; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/DatafieldTable.php b/library/Director/Web/Table/DatafieldTable.php index c967cca8d..d78d918eb 100644 --- a/library/Director/Web/Table/DatafieldTable.php +++ b/library/Director/Web/Table/DatafieldTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/DatalistEntryTable.php b/library/Director/Web/Table/DatalistEntryTable.php index 42909d479..70167c754 100644 --- a/library/Director/Web/Table/DatalistEntryTable.php +++ b/library/Director/Web/Table/DatalistEntryTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\DirectorDatalist; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class DatalistEntryTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/DatalistTable.php b/library/Director/Web/Table/DatalistTable.php index 8fbdec76b..7b35fe019 100644 --- a/library/Director/Web/Table/DatalistTable.php +++ b/library/Director/Web/Table/DatalistTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class DatalistTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/DeploymentLogTable.php b/library/Director/Web/Table/DeploymentLogTable.php index 9c24e4161..2d5cb9478 100644 --- a/library/Director/Web/Table/DeploymentLogTable.php +++ b/library/Director/Web/Table/DeploymentLogTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use Icinga\Date\DateFormatter; class DeploymentLogTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/GeneratedConfigFileTable.php b/library/Director/Web/Table/GeneratedConfigFileTable.php index e845220a3..97f7091ae 100644 --- a/library/Director/Web/Table/GeneratedConfigFileTable.php +++ b/library/Director/Web/Table/GeneratedConfigFileTable.php @@ -4,8 +4,8 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\IcingaConfig\IcingaConfig; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class GeneratedConfigFileTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/GroupMemberTable.php b/library/Director/Web/Table/GroupMemberTable.php index e51a62d4a..98e9fc1ba 100644 --- a/library/Director/Web/Table/GroupMemberTable.php +++ b/library/Director/Web/Table/GroupMemberTable.php @@ -7,9 +7,9 @@ use Icinga\Module\Director\IcingaConfig\AssignRenderer; use Icinga\Module\Director\Objects\IcingaObjectGroup; use Exception; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; class GroupMemberTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaAppliedServiceTable.php b/library/Director/Web/Table/IcingaAppliedServiceTable.php index ae13d68c5..b669296d8 100644 --- a/library/Director/Web/Table/IcingaAppliedServiceTable.php +++ b/library/Director/Web/Table/IcingaAppliedServiceTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaService; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaAppliedServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaCommandArgumentTable.php b/library/Director/Web/Table/IcingaCommandArgumentTable.php index c1b859e5c..977d7f4d3 100644 --- a/library/Director/Web/Table/IcingaCommandArgumentTable.php +++ b/library/Director/Web/Table/IcingaCommandArgumentTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaCommand; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaCommandArgumentTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php b/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php index a2e26eb4d..0d2f8e883 100644 --- a/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php +++ b/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; +use ipl\Html\Html; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\CustomVariable\CustomVariableDictionary; use Icinga\Module\Director\Objects\IcingaHost; -use dipl\Html\Link; -use dipl\Web\Table\SimpleQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; class IcingaHostAppliedForServiceTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php index 5f02eb7ed..297b672e0 100644 --- a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php +++ b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php @@ -2,15 +2,15 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; +use ipl\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 dipl\Html\Link; -use dipl\Web\Table\SimpleQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostServiceTable.php b/library/Director/Web/Table/IcingaHostServiceTable.php index 3dda12ef3..7e8fb0210 100644 --- a/library/Director/Web/Table/IcingaHostServiceTable.php +++ b/library/Director/Web/Table/IcingaHostServiceTable.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; +use ipl\Html\Html; use Icinga\Module\Director\Objects\IcingaHost; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaHostServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaObjectDatafieldTable.php b/library/Director/Web/Table/IcingaObjectDatafieldTable.php index 2bd9d06b5..f97692e14 100644 --- a/library/Director/Web/Table/IcingaObjectDatafieldTable.php +++ b/library/Director/Web/Table/IcingaObjectDatafieldTable.php @@ -6,8 +6,8 @@ use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Web\Form\IcingaObjectFieldLoader; use Icinga\Web\Url; -use dipl\Html\Link; -use dipl\Web\Table\SimpleQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; class IcingaObjectDatafieldTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php b/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php index 5edd5d875..cd8f8b1c0 100644 --- a/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php +++ b/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaScheduledDowntime; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaScheduledDowntimeRangeTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaServiceSetHostTable.php b/library/Director/Web/Table/IcingaServiceSetHostTable.php index a241166f0..9fc3c61b8 100644 --- a/library/Director/Web/Table/IcingaServiceSetHostTable.php +++ b/library/Director/Web/Table/IcingaServiceSetHostTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaServiceSet; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaServiceSetHostTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaServiceSetServiceTable.php b/library/Director/Web/Table/IcingaServiceSetServiceTable.php index 18e81bf27..e928218ec 100644 --- a/library/Director/Web/Table/IcingaServiceSetServiceTable.php +++ b/library/Director/Web/Table/IcingaServiceSetServiceTable.php @@ -2,15 +2,15 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; use Icinga\Module\Director\Forms\RemoveLinkForm; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaServiceSet; -use dipl\Html\HtmlElement; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use ipl\Html\HtmlElement; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; class IcingaServiceSetServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaTimePeriodRangeTable.php b/library/Director/Web/Table/IcingaTimePeriodRangeTable.php index 42dce307f..5870e67e4 100644 --- a/library/Director/Web/Table/IcingaTimePeriodRangeTable.php +++ b/library/Director/Web/Table/IcingaTimePeriodRangeTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaTimePeriod; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class IcingaTimePeriodRangeTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ImportedrowsTable.php b/library/Director/Web/Table/ImportedrowsTable.php index a7646c00d..34c4704d5 100644 --- a/library/Director/Web/Table/ImportedrowsTable.php +++ b/library/Director/Web/Table/ImportedrowsTable.php @@ -2,9 +2,9 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; -use dipl\Html\ValidHtml; -use dipl\Web\Table\SimpleQueryBasedTable; +use ipl\Html\Html; +use ipl\Html\ValidHtml; +use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\Objects\ImportRun; use Icinga\Module\Director\PlainObjectRenderer; diff --git a/library/Director/Web/Table/ImportrunTable.php b/library/Director/Web/Table/ImportrunTable.php index c21dd9d7d..e6c8a380c 100644 --- a/library/Director/Web/Table/ImportrunTable.php +++ b/library/Director/Web/Table/ImportrunTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\ImportSource; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class ImportrunTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ImportsourceHookTable.php b/library/Director/Web/Table/ImportsourceHookTable.php index c21978921..40cbc8ff7 100644 --- a/library/Director/Web/Table/ImportsourceHookTable.php +++ b/library/Director/Web/Table/ImportsourceHookTable.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\ValidHtml; +use ipl\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 dipl\Html\Html; -use dipl\Web\Table\SimpleQueryBasedTable; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; class ImportsourceHookTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/ImportsourceTable.php b/library/Director/Web/Table/ImportsourceTable.php index 29683e807..1a93ef55b 100644 --- a/library/Director/Web/Table/ImportsourceTable.php +++ b/library/Director/Web/Table/ImportsourceTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class ImportsourceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/JobTable.php b/library/Director/Web/Table/JobTable.php index 7d71efaa2..81ba07b83 100644 --- a/library/Director/Web/Table/JobTable.php +++ b/library/Director/Web/Table/JobTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class JobTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ObjectSetTable.php b/library/Director/Web/Table/ObjectSetTable.php index 79f5afc6f..2c98c42b8 100644 --- a/library/Director/Web/Table/ObjectSetTable.php +++ b/library/Director/Web/Table/ObjectSetTable.php @@ -4,9 +4,9 @@ use Icinga\Authentication\Auth; use Icinga\Module\Director\Db; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; use Icinga\Module\Director\Restriction\FilterByNameRestriction; class ObjectSetTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php index e62db1e6d..f8b98be3e 100644 --- a/library/Director/Web/Table/ObjectsTable.php +++ b/library/Director/Web/Table/ObjectsTable.php @@ -9,9 +9,9 @@ use Icinga\Module\Director\Restriction\FilterByNameRestriction; use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Restriction\ObjectRestriction; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; use Zend_Db_Select as ZfSelect; class ObjectsTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/ObjectsTableEndpoint.php b/library/Director/Web/Table/ObjectsTableEndpoint.php index 46d94f608..aedc45265 100644 --- a/library/Director/Web/Table/ObjectsTableEndpoint.php +++ b/library/Director/Web/Table/ObjectsTableEndpoint.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Icon; +use gipfl\IcingaWeb2\Icon; use Zend_Db_Select as ZfSelect; class ObjectsTableEndpoint extends ObjectsTable diff --git a/library/Director/Web/Table/ObjectsTableHost.php b/library/Director/Web/Table/ObjectsTableHost.php index a85a285f9..68b7e463c 100644 --- a/library/Director/Web/Table/ObjectsTableHost.php +++ b/library/Director/Web/Table/ObjectsTableHost.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Web\Table\Extension\MultiSelect; +use gipfl\IcingaWeb2\Table\Extension\MultiSelect; class ObjectsTableHost extends ObjectsTable { diff --git a/library/Director/Web/Table/ObjectsTableService.php b/library/Director/Web/Table/ObjectsTableService.php index 192638b58..c9be7b88a 100644 --- a/library/Director/Web/Table/ObjectsTableService.php +++ b/library/Director/Web/Table/ObjectsTableService.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Html; -use dipl\Web\Table\Extension\MultiSelect; -use dipl\Html\Link; -use dipl\Web\Url; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Table\Extension\MultiSelect; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Url; class ObjectsTableService extends ObjectsTable { diff --git a/library/Director/Web/Table/PropertymodifierTable.php b/library/Director/Web/Table/PropertymodifierTable.php index 5c95c72e4..29a4e25f8 100644 --- a/library/Director/Web/Table/PropertymodifierTable.php +++ b/library/Director/Web/Table/PropertymodifierTable.php @@ -6,10 +6,10 @@ use Exception; use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\ImportSource; -use dipl\Html\Link; -use dipl\Web\Table\Extension\ZfSortablePriority; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; class PropertymodifierTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/QuickTable.php b/library/Director/Web/Table/QuickTable.php index ad1374ed0..bde5f5685 100644 --- a/library/Director/Web/Table/QuickTable.php +++ b/library/Director/Web/Table/QuickTable.php @@ -15,11 +15,11 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\PlainObjectRenderer; use Icinga\Web\Request; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Url; use Icinga\Web\View; use Icinga\Web\Widget; use Icinga\Web\Widget\Paginator; -use dipl\Html\ValidHtml; +use ipl\Html\ValidHtml; use stdClass; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/SyncRunTable.php b/library/Director/Web/Table/SyncRunTable.php index a5cb77bc9..9c1612351 100644 --- a/library/Director/Web/Table/SyncRunTable.php +++ b/library/Director/Web/Table/SyncRunTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\SyncRule; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class SyncRunTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/SyncpropertyTable.php b/library/Director/Web/Table/SyncpropertyTable.php index fae1b326e..79461cec7 100644 --- a/library/Director/Web/Table/SyncpropertyTable.php +++ b/library/Director/Web/Table/SyncpropertyTable.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\SyncRule; -use dipl\Html\Link; -use dipl\Web\Table\Extension\ZfSortablePriority; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class SyncpropertyTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/SyncruleTable.php b/library/Director/Web/Table/SyncruleTable.php index e2462c516..4a8e4e5c0 100644 --- a/library/Director/Web/Table/SyncruleTable.php +++ b/library/Director/Web/Table/SyncruleTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use dipl\Html\Link; -use dipl\Web\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Link; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; class SyncruleTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/TemplateUsageTable.php b/library/Director/Web/Table/TemplateUsageTable.php index b04abcfdd..d4e9b5a51 100644 --- a/library/Director/Web/Table/TemplateUsageTable.php +++ b/library/Director/Web/Table/TemplateUsageTable.php @@ -5,9 +5,9 @@ use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Resolver\TemplateTree; -use dipl\Html\Link; -use dipl\Html\Table; -use dipl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Link; +use ipl\Html\Table; +use gipfl\Translation\TranslationHelper; class TemplateUsageTable extends Table { diff --git a/library/Director/Web/Table/TemplatesTable.php b/library/Director/Web/Table/TemplatesTable.php index 366790a9e..0b4fce7e3 100644 --- a/library/Director/Web/Table/TemplatesTable.php +++ b/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 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 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 Zend_Db_Select as ZfSelect; class TemplatesTable extends ZfQueryBasedTable implements FilterableByUsage diff --git a/library/Director/Web/Tabs/DataTabs.php b/library/Director/Web/Tabs/DataTabs.php index 28c9725bd..791ca14aa 100644 --- a/library/Director/Web/Tabs/DataTabs.php +++ b/library/Director/Web/Tabs/DataTabs.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Tabs; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class DataTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ImportTabs.php b/library/Director/Web/Tabs/ImportTabs.php index 11e32b1e8..e6c680770 100644 --- a/library/Director/Web/Tabs/ImportTabs.php +++ b/library/Director/Web/Tabs/ImportTabs.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Tabs; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class ImportTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ImportsourceTabs.php b/library/Director/Web/Tabs/ImportsourceTabs.php index 31a37b579..74dedb390 100644 --- a/library/Director/Web/Tabs/ImportsourceTabs.php +++ b/library/Director/Web/Tabs/ImportsourceTabs.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Tabs; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class ImportsourceTabs extends Tabs { diff --git a/library/Director/Web/Tabs/InfraTabs.php b/library/Director/Web/Tabs/InfraTabs.php index 045447c31..8a65c4ee0 100644 --- a/library/Director/Web/Tabs/InfraTabs.php +++ b/library/Director/Web/Tabs/InfraTabs.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Tabs; use Icinga\Authentication\Auth; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class InfraTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ObjectTabs.php b/library/Director/Web/Tabs/ObjectTabs.php index 8953ccf17..bfb16e0e2 100644 --- a/library/Director/Web/Tabs/ObjectTabs.php +++ b/library/Director/Web/Tabs/ObjectTabs.php @@ -4,8 +4,8 @@ use Icinga\Authentication\Auth; use Icinga\Module\Director\Objects\IcingaObject; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class ObjectTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ObjectsTabs.php b/library/Director/Web/Tabs/ObjectsTabs.php index 0a309642f..5edfd71ec 100644 --- a/library/Director/Web/Tabs/ObjectsTabs.php +++ b/library/Director/Web/Tabs/ObjectsTabs.php @@ -4,8 +4,8 @@ use Icinga\Authentication\Auth; use Icinga\Module\Director\Objects\IcingaObject; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class ObjectsTabs extends Tabs { diff --git a/library/Director/Web/Tabs/SyncRuleTabs.php b/library/Director/Web/Tabs/SyncRuleTabs.php index bf6067619..d64ff818b 100644 --- a/library/Director/Web/Tabs/SyncRuleTabs.php +++ b/library/Director/Web/Tabs/SyncRuleTabs.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Tabs; use Icinga\Module\Director\Objects\SyncRule; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\Tabs; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\Tabs; class SyncRuleTabs extends Tabs { diff --git a/library/Director/Web/Tree/InspectTreeRenderer.php b/library/Director/Web/Tree/InspectTreeRenderer.php index 34be181aa..54a177f4d 100644 --- a/library/Director/Web/Tree/InspectTreeRenderer.php +++ b/library/Director/Web/Tree/InspectTreeRenderer.php @@ -3,10 +3,10 @@ namespace Icinga\Module\Director\Web\Tree; use Icinga\Module\Director\Objects\IcingaEndpoint; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; class InspectTreeRenderer extends BaseHtmlElement { diff --git a/library/Director/Web/Tree/TemplateTreeRenderer.php b/library/Director/Web/Tree/TemplateTreeRenderer.php index 475792f7e..e238ded02 100644 --- a/library/Director/Web/Tree/TemplateTreeRenderer.php +++ b/library/Director/Web/Tree/TemplateTreeRenderer.php @@ -4,11 +4,11 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Resolver\TemplateTree; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\ControlsAndContent; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\ControlsAndContent; class TemplateTreeRenderer extends BaseHtmlElement { diff --git a/library/Director/Web/Widget/ActivityLogInfo.php b/library/Director/Web/Widget/ActivityLogInfo.php index f580d1b4b..a7d76143f 100644 --- a/library/Director/Web/Widget/ActivityLogInfo.php +++ b/library/Director/Web/Widget/ActivityLogInfo.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; -use dipl\Html\HtmlElement; +use ipl\Html\HtmlDocument; +use ipl\Html\HtmlElement; use Icinga\Date\DateFormatter; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\ConfigDiff; @@ -13,13 +13,13 @@ use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaService; use Icinga\Module\Director\Objects\IcingaServiceSet; -use dipl\Html\Html; -use dipl\Html\Icon; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Url; -use dipl\Web\Widget\NameValueTable; -use dipl\Web\Widget\Tabs; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Icon; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Url; +use gipfl\IcingaWeb2\Widget\NameValueTable; +use gipfl\IcingaWeb2\Widget\Tabs; class ActivityLogInfo extends HtmlDocument { diff --git a/library/Director/Web/Widget/AdditionalTableActions.php b/library/Director/Web/Widget/AdditionalTableActions.php index fe6a7dc53..978f399d1 100644 --- a/library/Director/Web/Widget/AdditionalTableActions.php +++ b/library/Director/Web/Widget/AdditionalTableActions.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\Html; -use dipl\Html\HtmlDocument; -use dipl\Html\Icon; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Table\ZfQueryBasedTable; -use dipl\Web\Url; +use ipl\Html\Html; +use ipl\Html\HtmlDocument; +use gipfl\IcingaWeb2\Icon; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use gipfl\IcingaWeb2\Url; use Icinga\Authentication\Auth; use Icinga\Module\Director\Web\Table\FilterableByUsage; diff --git a/library/Director/Web/Widget/DeployedConfigInfoHeader.php b/library/Director/Web/Widget/DeployedConfigInfoHeader.php index 96f2d6747..6253fb544 100644 --- a/library/Director/Web/Widget/DeployedConfigInfoHeader.php +++ b/library/Director/Web/Widget/DeployedConfigInfoHeader.php @@ -2,15 +2,15 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Module\Director\Core\DeploymentApiInterface; use Icinga\Module\Director\Db; use Icinga\Module\Director\Forms\DeployConfigForm; use Icinga\Module\Director\IcingaConfig\IcingaConfig; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\NameValueTable; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\NameValueTable; class DeployedConfigInfoHeader extends HtmlDocument { diff --git a/library/Director/Web/Widget/DeploymentInfo.php b/library/Director/Web/Widget/DeploymentInfo.php index 8d6576ac1..110200f29 100644 --- a/library/Director/Web/Widget/DeploymentInfo.php +++ b/library/Director/Web/Widget/DeploymentInfo.php @@ -2,19 +2,19 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Authentication\Auth; use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\Objects\DirectorDeploymentLog; use Icinga\Module\Director\StartupLogRenderer; use Icinga\Util\Format; use Icinga\Web\Request; -use dipl\Html\Html; -use dipl\Html\Icon; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\NameValueTable; -use dipl\Web\Widget\Tabs; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Icon; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\NameValueTable; +use gipfl\IcingaWeb2\Widget\Tabs; class DeploymentInfo extends HtmlDocument { diff --git a/library/Director/Web/Widget/HealthCheckPluginOutput.php b/library/Director/Web/Widget/HealthCheckPluginOutput.php index 6e8d66a92..83ac1029f 100644 --- a/library/Director/Web/Widget/HealthCheckPluginOutput.php +++ b/library/Director/Web/Widget/HealthCheckPluginOutput.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\Html; -use dipl\Html\HtmlDocument; -use dipl\Html\HtmlString; -use dipl\Translation\TranslationHelper; +use ipl\Html\Html; +use ipl\Html\HtmlDocument; +use ipl\Html\HtmlString; +use gipfl\Translation\TranslationHelper; use Icinga\Module\Director\CheckPlugin\PluginState; use Icinga\Module\Director\Health; diff --git a/library/Director/Web/Widget/HostServiceRedirector.php b/library/Director/Web/Widget/HostServiceRedirector.php index 1702e0c14..16bff78ea 100644 --- a/library/Director/Web/Widget/HostServiceRedirector.php +++ b/library/Director/Web/Widget/HostServiceRedirector.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Web\Url; +use gipfl\IcingaWeb2\Url; use Icinga\Authentication\Auth; use Icinga\Data\Filter\Filter; use Icinga\Module\Director\Objects\HostApplyMatches; diff --git a/library/Director/Web/Widget/IcingaObjectInspection.php b/library/Director/Web/Widget/IcingaObjectInspection.php index 0832d043f..61f35671a 100644 --- a/library/Director/Web/Widget/IcingaObjectInspection.php +++ b/library/Director/Web/Widget/IcingaObjectInspection.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\BaseHtmlElement; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\NameValueTable; +use ipl\Html\BaseHtmlElement; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\NameValueTable; use Icinga\Date\DateFormatter; use Icinga\Module\Director\Db; use Icinga\Module\Director\PlainObjectRenderer; diff --git a/library/Director/Web/Widget/ImportSourceDetails.php b/library/Director/Web/Widget/ImportSourceDetails.php index bd3b531cf..57e3e569a 100644 --- a/library/Director/Web/Widget/ImportSourceDetails.php +++ b/library/Director/Web/Widget/ImportSourceDetails.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Module\Director\Forms\ImportCheckForm; use Icinga\Module\Director\Forms\ImportRunForm; use Icinga\Module\Director\Objects\ImportSource; -use dipl\Html\Html; -use dipl\Translation\TranslationHelper; +use ipl\Html\Html; +use gipfl\Translation\TranslationHelper; class ImportSourceDetails extends HtmlDocument { diff --git a/library/Director/Web/Widget/JobDetails.php b/library/Director/Web/Widget/JobDetails.php index d40dfabc9..32e8ebd95 100644 --- a/library/Director/Web/Widget/JobDetails.php +++ b/library/Director/Web/Widget/JobDetails.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Module\Director\Objects\DirectorJob; -use dipl\Html\Html; -use dipl\Translation\TranslationHelper; +use ipl\Html\Html; +use gipfl\Translation\TranslationHelper; class JobDetails extends HtmlDocument { diff --git a/library/Director/Web/Widget/ShowConfigFile.php b/library/Director/Web/Widget/ShowConfigFile.php index adf4eac1c..77d32cf3e 100644 --- a/library/Director/Web/Widget/ShowConfigFile.php +++ b/library/Director/Web/Widget/ShowConfigFile.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Module\Director\IcingaConfig\IcingaConfigFile; -use dipl\Html\Html; -use dipl\Html\HtmlString; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; +use ipl\Html\Html; +use ipl\Html\HtmlString; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; class ShowConfigFile extends HtmlDocument { diff --git a/library/Director/Web/Widget/SyncRunDetails.php b/library/Director/Web/Widget/SyncRunDetails.php index 83aeff1ba..9f0e3a096 100644 --- a/library/Director/Web/Widget/SyncRunDetails.php +++ b/library/Director/Web/Widget/SyncRunDetails.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Director\Web\Widget; -use dipl\Html\HtmlDocument; +use ipl\Html\HtmlDocument; use Icinga\Module\Director\Db; use Icinga\Module\Director\Objects\SyncRun; -use dipl\Html\Html; -use dipl\Html\Link; -use dipl\Translation\TranslationHelper; -use dipl\Web\Widget\NameValueTable; +use ipl\Html\Html; +use gipfl\IcingaWeb2\Link; +use gipfl\Translation\TranslationHelper; +use gipfl\IcingaWeb2\Widget\NameValueTable; class SyncRunDetails extends NameValueTable { diff --git a/library/vendor/ipl/Db/Zf1/FilterRenderer.php b/library/vendor/ipl/Db/Zf1/FilterRenderer.php index 67d542292..bb7298fd9 100644 --- a/library/vendor/ipl/Db/Zf1/FilterRenderer.php +++ b/library/vendor/ipl/Db/Zf1/FilterRenderer.php @@ -45,7 +45,7 @@ public function toDbExpression() return new DbExpr($this->render()); } - public static function applyToQuery(Filter $filter, $query) + public static function applyToQuery(Filter $filter, \Zend_Db_Select $query) { if (! $filter->isEmpty()) { if ($query instanceof DbSelect) { diff --git a/library/vendor/ipl/Html/ValidHtml.php b/library/vendor/ipl/Html/ValidHtml.php index c250714a9..d4a90e0e5 100644 --- a/library/vendor/ipl/Html/ValidHtml.php +++ b/library/vendor/ipl/Html/ValidHtml.php @@ -2,11 +2,13 @@ namespace dipl\Html; +use ipl\Html\ValidHtml as iplValidHtml; + /** * Interface for HTML elements or primitives that promise to render valid UTF-8 encoded HTML5 with special characters * converted to HTML entities */ -interface ValidHtml +interface ValidHtml extends iplValidHtml { /** * Render to HTML