diff --git a/application/controllers/BasketController.php b/application/controllers/BasketController.php index 48c0c9dd..74daf67c 100644 --- a/application/controllers/BasketController.php +++ b/application/controllers/BasketController.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Controllers; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Widget\NameValueTable; +use dipl\Html\Link; +use dipl\Web\Widget\NameValueTable; use Exception; use Icinga\Date\DateFormatter; use Icinga\Module\Director\ConfigDiff; @@ -18,7 +18,7 @@ use Icinga\Module\Director\Forms\BasketForm; use Icinga\Module\Director\Forms\BasketUploadForm; use Icinga\Module\Director\Forms\RestoreBasketForm; use Icinga\Module\Director\Web\Controller\ActionController; -use ipl\Html\Html; +use dipl\Html\Html; use Icinga\Module\Director\Web\Table\BasketSnapshotTable; class BasketController extends ActionController diff --git a/application/controllers/BasketsController.php b/application/controllers/BasketsController.php index 7d13fee8..2f2ec9f9 100644 --- a/application/controllers/BasketsController.php +++ b/application/controllers/BasketsController.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Controllers; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; use Icinga\Module\Director\Web\Controller\ActionController; use Icinga\Module\Director\Web\Table\BasketTable; diff --git a/application/controllers/CommandController.php b/application/controllers/CommandController.php index 6d250eac..53b0196e 100644 --- a/application/controllers/CommandController.php +++ b/application/controllers/CommandController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use ipl\Html\Html; +use dipl\Html\Html; use Icinga\Module\Director\Forms\IcingaCommandArgumentForm; use Icinga\Module\Director\Objects\IcingaCommand; use Icinga\Module\Director\Resolver\CommandUsage; diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 792d5561..a05922ae 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -24,11 +24,11 @@ use Icinga\Module\Director\Web\Widget\ShowConfigFile; use Icinga\Web\Notification; use Exception; use RuntimeException; -use ipl\Html\Html; -use ipl\Html\HtmlString; -use gipfl\IcingaWeb2\Icon; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Html\Icon; +use dipl\Html\Link; +use dipl\Web\Url; class ConfigController extends ActionController { @@ -445,7 +445,7 @@ class ConfigController extends ActionController } /** - * @return \gipfl\IcingaWeb2\Widget\Tabs + * @return \dipl\Web\Widget\Tabs */ protected function configTabs() { diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 38d84ec2..0bde4264 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -2,6 +2,7 @@ namespace Icinga\Module\Director\Controllers; +use dipl\Html\Html; use Icinga\Module\Director\Web\Widget\HealthCheckPluginOutput; use Icinga\Module\Director\Dashboard\Dashboard; use Icinga\Module\Director\Health; @@ -18,13 +19,9 @@ class DashboardController extends ActionController protected function addDbSelection() { if ($this->isMultiDbSetup()) { - $form = new DbSelectorForm( - $this->getResponse(), - $this->Window(), - $this->listAllowedDbResourceNames() - ); + $form = new DbSelectorForm($this->Window(), $this->listAllowedDbResourceNames()); $this->content()->add($form); - $form->handleRequest($this->getServerRequest()); + $form->handleRequest($this->getRequest()); } } diff --git a/application/controllers/DataController.php b/application/controllers/DataController.php index d3d10345..983ac59f 100644 --- a/application/controllers/DataController.php +++ b/application/controllers/DataController.php @@ -11,7 +11,7 @@ use Icinga\Module\Director\Web\Table\DatafieldTable; use Icinga\Module\Director\Web\Table\DatalistEntryTable; use Icinga\Module\Director\Web\Table\DatalistTable; use Icinga\Module\Director\Web\Tabs\DataTabs; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class DataController extends ActionController { diff --git a/application/controllers/HealthController.php b/application/controllers/HealthController.php index 87c30606..987062ef 100644 --- a/application/controllers/HealthController.php +++ b/application/controllers/HealthController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use ipl\Html\Html; +use dipl\Html\Html; use Icinga\Module\Director\Web\Widget\HealthCheckPluginOutput; use Icinga\Module\Director\Health; use Icinga\Module\Director\Web\Controller\ActionController; diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php index e0ea63eb..cb1594c3 100644 --- a/application/controllers/HostController.php +++ b/application/controllers/HostController.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Controllers; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Url; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Web\Url; +use dipl\Web\Widget\Tabs; use Exception; use Icinga\Module\Director\CustomVariable\CustomVariableDictionary; use Icinga\Module\Director\Db\AppliedServiceSetLoader; diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php index 03320729..6a2e6ecd 100644 --- a/application/controllers/HostsController.php +++ b/application/controllers/HostsController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use gipfl\IcingaWeb2\Url; +use dipl\Web\Url; use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\FilterChain; use Icinga\Data\Filter\FilterExpression; @@ -11,7 +11,7 @@ use Icinga\Module\Director\Forms\IcingaAddServiceForm; use Icinga\Module\Director\Forms\IcingaAddServiceSetForm; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Web\Controller\ObjectsController; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class HostsController extends ObjectsController { diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php index f51524f5..d7e7a2cf 100644 --- a/application/controllers/ImportsourceController.php +++ b/application/controllers/ImportsourceController.php @@ -15,7 +15,7 @@ use Icinga\Module\Director\Web\Table\PropertymodifierTable; use Icinga\Module\Director\Web\Tabs\ImportsourceTabs; use Icinga\Module\Director\Web\Widget\ImportSourceDetails; use InvalidArgumentException; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class ImportsourceController extends ActionController { @@ -124,7 +124,7 @@ class ImportsourceController extends ActionController $this->addTitle('Clone: %s', $source->get('source_name')); $form = new CloneImportSourceForm($source); $this->content()->add($form); - $form->handleRequest($this->getServerRequest()); + $form->handleRequest($this->getRequest()); } /** diff --git a/application/controllers/InspectController.php b/application/controllers/InspectController.php index 9aec3da6..9dbe8dcc 100644 --- a/application/controllers/InspectController.php +++ b/application/controllers/InspectController.php @@ -10,8 +10,8 @@ use Icinga\Module\Director\Web\Table\CoreApiObjectsTable; use Icinga\Module\Director\Web\Table\CoreApiPrototypesTable; use Icinga\Module\Director\Web\Tabs\ObjectTabs; use Icinga\Module\Director\Web\Tree\InspectTreeRenderer; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; use Icinga\Module\Director\Web\Widget\IcingaObjectInspection; class InspectController extends ActionController diff --git a/application/controllers/JobController.php b/application/controllers/JobController.php index 3164ee55..68fd0277 100644 --- a/application/controllers/JobController.php +++ b/application/controllers/JobController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; use Icinga\Module\Director\Forms\DirectorJobForm; use Icinga\Module\Director\Web\Controller\ActionController; use Icinga\Module\Director\Objects\DirectorJob; diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php index b0ca24e4..a8b01422 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 ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; class SchemaController extends ActionController { diff --git a/application/controllers/SelfServiceController.php b/application/controllers/SelfServiceController.php index bce9785b..b9d82b97 100644 --- a/application/controllers/SelfServiceController.php +++ b/application/controllers/SelfServiceController.php @@ -12,7 +12,7 @@ use Icinga\Module\Director\Objects\IcingaZone; use Icinga\Module\Director\Settings; use Icinga\Module\Director\Util; use Icinga\Module\Director\Web\Controller\ActionController; -use ipl\Html\Html; +use dipl\Html\Html; class SelfServiceController extends ActionController { diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php index 1cd7db44..78a3542b 100644 --- a/application/controllers/ServiceController.php +++ b/application/controllers/ServiceController.php @@ -11,8 +11,8 @@ use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Web\Form\DirectorObjectForm; use Icinga\Module\Director\Web\Table\IcingaAppliedServiceTable; use Icinga\Web\Widget\Tab; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Html\Link; +use dipl\Web\Widget\Tabs; class ServiceController extends ObjectController { diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php index 8d178c20..45db5eea 100644 --- a/application/controllers/ServicesController.php +++ b/application/controllers/ServicesController.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Controllers; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Url; use Icinga\Module\Director\DirectorObject\Automation\ExportInterface; use Icinga\Module\Director\Web\Controller\ObjectsController; diff --git a/application/controllers/ServicesetController.php b/application/controllers/ServicesetController.php index dec7de43..fce54256 100644 --- a/application/controllers/ServicesetController.php +++ b/application/controllers/ServicesetController.php @@ -9,7 +9,7 @@ use Icinga\Module\Director\Web\Controller\ObjectController; use Icinga\Module\Director\Web\Form\DirectorObjectForm; use Icinga\Module\Director\Web\Table\IcingaServiceSetHostTable; use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class ServicesetController extends ObjectController { diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php index c4709e6b..4eea1d25 100644 --- a/application/controllers/SettingsController.php +++ b/application/controllers/SettingsController.php @@ -6,7 +6,7 @@ use Icinga\Module\Director\Forms\KickstartForm; use Icinga\Module\Director\Forms\SelfServiceSettingsForm; use Icinga\Module\Director\Settings; use Icinga\Module\Director\Web\Controller\ActionController; -use ipl\Html\Html; +use dipl\Html\Html; class SettingsController extends ActionController { diff --git a/application/controllers/SuggestController.php b/application/controllers/SuggestController.php index 665e2ad9..54d6911d 100644 --- a/application/controllers/SuggestController.php +++ b/application/controllers/SuggestController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use ipl\Html\Html; +use dipl\Html\Html; use Icinga\Exception\NotFoundError; use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\IcingaHost; diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php index 70413e3f..67c62635 100644 --- a/application/controllers/SyncruleController.php +++ b/application/controllers/SyncruleController.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Controllers; -use gipfl\IcingaWeb2\Widget\UnorderedList; +use dipl\Web\Widget\UnorderedList; use Icinga\Module\Director\ConfigDiff; use Icinga\Module\Director\Db\Cache\PrefetchCache; use Icinga\Module\Director\DirectorObject\Automation\ExportInterface; @@ -24,8 +24,8 @@ use Icinga\Module\Director\Web\Table\SyncpropertyTable; use Icinga\Module\Director\Web\Table\SyncRunTable; use Icinga\Module\Director\Web\Tabs\SyncRuleTabs; use Icinga\Module\Director\Web\Widget\SyncRunDetails; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; class SyncruleController extends ActionController { @@ -270,7 +270,7 @@ class SyncruleController extends ActionController /** * @param IcingaObject[] $objects - * @return \ipl\Html\HtmlElement + * @return \dipl\Html\HtmlElement * @throws \Icinga\Exception\NotFoundError */ protected function objectList($objects) @@ -499,7 +499,7 @@ class SyncruleController extends ActionController $form = new CloneSyncRuleForm($rule); $this->content()->add($form); - $form->handleRequest($this->getServerRequest()); + $form->handleRequest($this->getRequest()); } /** diff --git a/application/forms/AddToBasketForm.php b/application/forms/AddToBasketForm.php index 28b151e5..61053ddb 100644 --- a/application/forms/AddToBasketForm.php +++ b/application/forms/AddToBasketForm.php @@ -2,9 +2,9 @@ namespace Icinga\Module\Director\Forms; -use ipl\Html\Html; -use ipl\Html\HtmlDocument; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\HtmlDocument; +use dipl\Html\Link; use Icinga\Module\Director\DirectorObject\Automation\Basket; use Icinga\Module\Director\Web\Form\DirectorForm; diff --git a/application/forms/DeploymentLinkForm.php b/application/forms/DeploymentLinkForm.php index 55902733..6d158fc2 100644 --- a/application/forms/DeploymentLinkForm.php +++ b/application/forms/DeploymentLinkForm.php @@ -9,7 +9,7 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Deployment\DeploymentInfo; use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\Web\Form\DirectorForm; -use gipfl\IcingaWeb2\Icon; +use dipl\Html\Icon; use Zend_View_Interface; class DeploymentLinkForm extends DirectorForm diff --git a/application/forms/IcingaHostForm.php b/application/forms/IcingaHostForm.php index 09131aae..7b68ffa3 100644 --- a/application/forms/IcingaHostForm.php +++ b/application/forms/IcingaHostForm.php @@ -6,9 +6,9 @@ use Icinga\Exception\AuthenticationException; use Icinga\Module\Director\Repository\IcingaTemplateRepository; use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -use ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Link; class IcingaHostForm extends DirectorObjectForm { diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php index d802c767..0ed2daea 100644 --- a/application/forms/IcingaServiceForm.php +++ b/application/forms/IcingaServiceForm.php @@ -11,8 +11,8 @@ use Icinga\Module\Director\Web\Form\DirectorObjectForm; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaService; use Icinga\Module\Director\Objects\IcingaServiceSet; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; use RuntimeException; class IcingaServiceForm extends DirectorObjectForm diff --git a/application/forms/KickstartForm.php b/application/forms/KickstartForm.php index 7fe8db52..bbf4f4aa 100644 --- a/application/forms/KickstartForm.php +++ b/application/forms/KickstartForm.php @@ -10,8 +10,8 @@ use Icinga\Module\Director\Db\Migrations; use Icinga\Module\Director\Objects\IcingaEndpoint; use Icinga\Module\Director\KickstartHelper; use Icinga\Module\Director\Web\Form\DirectorForm; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; class KickstartForm extends DirectorForm { diff --git a/application/forms/RemoveLinkForm.php b/application/forms/RemoveLinkForm.php index 6f0c7cc9..75fc654f 100644 --- a/application/forms/RemoveLinkForm.php +++ b/application/forms/RemoveLinkForm.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Forms; -use gipfl\IcingaWeb2\Icon; +use dipl\Html\Icon; use Icinga\Module\Director\Web\Form\DirectorForm; class RemoveLinkForm extends DirectorForm diff --git a/library/Director/ConfigDiff.php b/library/Director/ConfigDiff.php index b350fd46..d439a2da 100644 --- a/library/Director/ConfigDiff.php +++ b/library/Director/ConfigDiff.php @@ -3,7 +3,7 @@ namespace Icinga\Module\Director; use Diff; -use ipl\Html\ValidHtml; +use dipl\Html\ValidHtml; use InvalidArgumentException; class ConfigDiff implements ValidHtml diff --git a/library/Director/Dashboard/Dashboard.php b/library/Director/Dashboard/Dashboard.php index 99e4fba3..c77029e3 100644 --- a/library/Director/Dashboard/Dashboard.php +++ b/library/Director/Dashboard/Dashboard.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Dashboard; -use ipl\Html\HtmlDocument; +use dipl\Html\HtmlDocument; use Exception; use Icinga\Authentication\Auth; use Icinga\Module\Director\Objects\IcingaObject; @@ -10,10 +10,10 @@ use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Dashboard\Dashlet\Dashlet; use Icinga\Module\Director\Db; use Icinga\Web\Widget\Tab; -use ipl\Html\Html; -use ipl\Html\HtmlString; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; use Zend_Db_Select as ZfSelect; abstract class Dashboard extends HtmlDocument diff --git a/library/Director/Dashboard/Dashlet/Dashlet.php b/library/Director/Dashboard/Dashlet/Dashlet.php index 984abfc4..cfa35d8c 100644 --- a/library/Director/Dashboard/Dashlet/Dashlet.php +++ b/library/Director/Dashboard/Dashlet/Dashlet.php @@ -6,11 +6,11 @@ use DirectoryIterator; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\Acl; use Icinga\Module\Director\Dashboard\Dashboard; -use ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Icon; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Icon; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; abstract class Dashlet extends BaseHtmlElement { diff --git a/library/Director/Import/ImportSourceSql.php b/library/Director/Import/ImportSourceSql.php index 8711c7b5..5c44fcac 100644 --- a/library/Director/Import/ImportSourceSql.php +++ b/library/Director/Import/ImportSourceSql.php @@ -9,7 +9,7 @@ use Icinga\Module\Director\Objects\ImportSource; use Icinga\Module\Director\Util; use Icinga\Module\Director\Web\Form\Filter\QueryColumnsFromSql; use Icinga\Module\Director\Web\Form\QuickForm; -use ipl\Html\Html; +use dipl\Html\Html; class ImportSourceSql extends ImportSourceHook { diff --git a/library/Director/Resolver/CommandUsage.php b/library/Director/Resolver/CommandUsage.php index 7e3e0c5a..e9a3b7cd 100644 --- a/library/Director/Resolver/CommandUsage.php +++ b/library/Director/Resolver/CommandUsage.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Resolver; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; use Icinga\Module\Director\Objects\IcingaCommand; use InvalidArgumentException; diff --git a/library/Director/Restriction/FilterByNameRestriction.php b/library/Director/Restriction/FilterByNameRestriction.php index 8c3b2569..fcf18022 100644 --- a/library/Director/Restriction/FilterByNameRestriction.php +++ b/library/Director/Restriction/FilterByNameRestriction.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Restriction; -use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer; +use dipl\Db\Zf1\FilterRenderer; use Icinga\Authentication\Auth; use Icinga\Data\Filter\Filter; use Icinga\Module\Director\Db; diff --git a/library/Director/StartupLogRenderer.php b/library/Director/StartupLogRenderer.php index bc7b3ea4..1d22b39d 100644 --- a/library/Director/StartupLogRenderer.php +++ b/library/Director/StartupLogRenderer.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director; -use ipl\Html\Html; +use dipl\Html\Html; use Icinga\Module\Director\Objects\DirectorDeploymentLog; -use gipfl\IcingaWeb2\Link; -use ipl\Html\ValidHtml; +use dipl\Html\Link; +use dipl\Html\ValidHtml; class StartupLogRenderer implements ValidHtml { diff --git a/library/Director/TranslationDummy.php b/library/Director/TranslationDummy.php index 937cc0b2..ff1bda02 100644 --- a/library/Director/TranslationDummy.php +++ b/library/Director/TranslationDummy.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director; -use gipfl\Translation\TranslationHelper; +use dipl\Translation\TranslationHelper; class TranslationDummy { diff --git a/library/Director/Util.php b/library/Director/Util.php index aac2e30a..489a1b72 100644 --- a/library/Director/Util.php +++ b/library/Director/Util.php @@ -7,8 +7,8 @@ use Icinga\Data\ResourceFactory; use Icinga\Module\Director\Web\Form\QuickForm; use Icinga\Exception\NotImplementedError; use Icinga\Exception\ProgrammingError; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Html; +use dipl\Html\Link; use RuntimeException; use Zend_Db_Expr; diff --git a/library/Director/Web/ActionBar/AutomationObjectActionBar.php b/library/Director/Web/ActionBar/AutomationObjectActionBar.php index 247677fd..49d162b5 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 gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ActionBar; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ActionBar; use Icinga\Web\Request; class AutomationObjectActionBar extends ActionBar diff --git a/library/Director/Web/ActionBar/ChoicesActionBar.php b/library/Director/Web/ActionBar/ChoicesActionBar.php index 7b59d2cf..1c77ea4a 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 gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class ChoicesActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/ActionBar/DirectorBaseActionBar.php b/library/Director/Web/ActionBar/DirectorBaseActionBar.php index 8612a0d3..222f5ff9 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 gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ActionBar; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ActionBar; +use dipl\Web\Url; class DirectorBaseActionBar extends ActionBar { diff --git a/library/Director/Web/ActionBar/ObjectsActionBar.php b/library/Director/Web/ActionBar/ObjectsActionBar.php index 5f86949a..56395a3c 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 gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class ObjectsActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/ActionBar/TemplateActionBar.php b/library/Director/Web/ActionBar/TemplateActionBar.php index 53e65ed6..5364c16e 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 gipfl\IcingaWeb2\Link; +use dipl\Html\Link; class TemplateActionBar extends DirectorBaseActionBar { diff --git a/library/Director/Web/Controller/ActionController.php b/library/Director/Web/Controller/ActionController.php index 129befa3..48a78a04 100644 --- a/library/Director/Web/Controller/ActionController.php +++ b/library/Director/Web/Controller/ActionController.php @@ -13,14 +13,12 @@ use Icinga\Security\SecurityException; use Icinga\Web\Controller; use Icinga\Web\UrlParams; use InvalidArgumentException; -use gipfl\IcingaWeb2\Translator; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ControlsAndContent; -use gipfl\IcingaWeb2\Controller\Extension\ControlsAndContentHelper; -use gipfl\IcingaWeb2\Zf1\SimpleViewRenderer; -use GuzzleHttp\Psr7\ServerRequest; -use Psr\Http\Message\ServerRequestInterface; +use dipl\Compat\Translator; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ControlsAndContent; +use dipl\Web\Controller\Extension\ControlsAndContentHelper; +use dipl\Zf1\SimpleViewRenderer; abstract class ActionController extends Controller implements ControlsAndContent { @@ -120,14 +118,6 @@ abstract class ActionController extends Controller implements ControlsAndContent return $this; } - /** - * @return ServerRequestInterface - */ - protected function getServerRequest() - { - return ServerRequest::fromGlobals(); - } - protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null) { $limit = $this->params->get('limit', $limit); diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php index 60a835f5..188c4e3d 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 ipl\Html\Html; +use dipl\Html\Html; use Icinga\Exception\IcingaException; use Icinga\Exception\InvalidPropertyException; use Icinga\Exception\NotFoundError; @@ -25,7 +25,7 @@ use Icinga\Module\Director\Web\Table\ActivityLogTable; use Icinga\Module\Director\Web\Table\GroupMemberTable; use Icinga\Module\Director\Web\Table\IcingaObjectDatafieldTable; use Icinga\Module\Director\Web\Tabs\ObjectTabs; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; abstract class ObjectController extends ActionController { diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php index 3a1c7c79..69cd8e3d 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 gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Web\Table\ZfQueryBasedTable; use Icinga\Data\Filter\FilterChain; use Icinga\Data\Filter\FilterExpression; use Icinga\Exception\NotFoundError; @@ -21,7 +21,7 @@ use Icinga\Module\Director\Web\Table\ObjectsTable; use Icinga\Module\Director\Web\Table\TemplatesTable; use Icinga\Module\Director\Web\Tabs\ObjectsTabs; use Icinga\Module\Director\Web\Tree\TemplateTreeRenderer; -use gipfl\IcingaWeb2\Link; +use dipl\Html\Link; use Icinga\Module\Director\Web\Widget\AdditionalTableActions; abstract class ObjectsController extends ActionController diff --git a/library/Director/Web/Controller/TemplateController.php b/library/Director/Web/Controller/TemplateController.php index df8f41af..20a77b54 100644 --- a/library/Director/Web/Controller/TemplateController.php +++ b/library/Director/Web/Controller/TemplateController.php @@ -12,11 +12,11 @@ use Icinga\Module\Director\Web\Table\ObjectsTable; use Icinga\Module\Director\Web\Table\TemplatesTable; use Icinga\Module\Director\Web\Table\TemplateUsageTable; use Icinga\Module\Director\Web\Tabs\ObjectTabs; -use ipl\Html\FormattedString; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\CompatController; -use gipfl\IcingaWeb2\Widget\UnorderedList; +use dipl\Html\FormattedString; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Web\CompatController; +use dipl\Web\Widget\UnorderedList; abstract class TemplateController extends CompatController { diff --git a/library/Director/Web/Form/CloneImportSourceForm.php b/library/Director/Web/Form/CloneImportSourceForm.php index 415ba611..fb3e649e 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 ipl\Html\Form; -use ipl\Html\FormDecorator\DdDtDecorator; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Form; +use dipl\Html\FormDecorator\DdDtDecorator; +use dipl\Translation\TranslationHelper; +use dipl\Web\Url; use Icinga\Module\Director\Objects\ImportSource; class CloneImportSourceForm extends Form @@ -26,7 +26,7 @@ class CloneImportSourceForm extends Form protected function assemble() { - $this->addElement('text', 'source_name', [ + $this->addElement('source_name', 'text', [ 'label' => $this->translate('New name'), 'value' => $this->source->get('source_name'), ]); @@ -49,7 +49,7 @@ class CloneImportSourceForm extends Form public function onSuccess() { $export = $this->source->export(); - $newName = $this->getElement('source_name')->getValue(); + $newName = $this->getValue('source_name'); $export->source_name = $newName; unset($export->originalId); diff --git a/library/Director/Web/Form/CloneSyncRuleForm.php b/library/Director/Web/Form/CloneSyncRuleForm.php index bb6f1bf9..2077135b 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 ipl\Html\Form; -use ipl\Html\FormDecorator\DdDtDecorator; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Form; +use dipl\Html\FormDecorator\DdDtDecorator; +use dipl\Translation\TranslationHelper; +use dipl\Web\Url; use Icinga\Module\Director\Objects\SyncRule; class CloneSyncRuleForm extends Form diff --git a/library/Director/Web/Form/DbSelectorForm.php b/library/Director/Web/Form/DbSelectorForm.php index 52fe5ea3..54df0081 100644 --- a/library/Director/Web/Form/DbSelectorForm.php +++ b/library/Director/Web/Form/DbSelectorForm.php @@ -2,9 +2,7 @@ namespace Icinga\Module\Director\Web\Form; -use gipfl\IcingaWeb2\Url; -use Icinga\Web\Response; -use ipl\Html\Form; +use dipl\Html\Form; use Icinga\Web\Window; class DbSelectorForm extends Form @@ -18,21 +16,18 @@ class DbSelectorForm extends Form /** @var Window */ protected $window; - protected $response; - - public function __construct(Response $response, Window $window, $allowedNames) + public function __construct(Window $window, $allowedNames) { - $this->response = $response; $this->window = $window; $this->allowedNames = $allowedNames; } protected function assemble() { - $this->addElement('hidden', 'DbSelector', [ + $this->addElement('DbSelector', 'hidden', [ 'value' => 'sent' ]); - $this->addElement('select', 'db_resource', [ + $this->addElement('db_resource', 'select', [ 'options' => $this->allowedNames, 'class' => 'autosubmit', 'value' => $this->getSession()->get('db_resource') @@ -46,35 +41,15 @@ class DbSelectorForm extends Form */ public function hasBeenSubmitted() { - return $this->hasBeenSent() && $this->getRequestParam('DbSelector') === 'sent'; + return $this->hasBeenSent() && $this->getRequest()->get('DbSelector') === 'sent'; } public function onSuccess() { - $this->getSession()->set('db_resource', $this->getElement('db_resource')->getValue()); - $this->response->redirectAndExit(Url::fromRequest($this->getRequest())); + $this->getSession()->set('db_resource', $this->getValue('db_resource')); + $this->redirectOnSuccess(); } - protected function getRequestParam($name, $default = null) - { - $request = $this->getRequest(); - if ($request === null) { - return $default; - } - if ($request->getMethod() === 'POST') { - $params = $request->getParsedBody(); - } elseif ($this->getMethod() === 'GET') { - parse_str($request->getUri()->getQuery(), $params); - } else { - $params = []; - } - - if (array_key_exists($name, $params)) { - return $params[$name]; - } - - return $default; - } /** * @return \Icinga\Web\Session\SessionNamespace */ diff --git a/library/Director/Web/Form/IplElement/ExtensibleSetElement.php b/library/Director/Web/Form/IplElement/ExtensibleSetElement.php index 8c440cda..96c21012 100644 --- a/library/Director/Web/Form/IplElement/ExtensibleSetElement.php +++ b/library/Director/Web/Form/IplElement/ExtensibleSetElement.php @@ -5,9 +5,9 @@ namespace Icinga\Module\Director\Web\Form\IplElement; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\IcingaConfig\ExtensibleSet as Set; use Icinga\Module\Director\Web\Form\IconHelper; -use ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\Translation\TranslationHelper; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class ExtensibleSetElement extends BaseHtmlElement { diff --git a/library/Director/Web/Form/QuickBaseForm.php b/library/Director/Web/Form/QuickBaseForm.php index 43ce82a9..ed8ef7a4 100644 --- a/library/Director/Web/Form/QuickBaseForm.php +++ b/library/Director/Web/Form/QuickBaseForm.php @@ -4,12 +4,11 @@ namespace Icinga\Module\Director\Web\Form; use Icinga\Application\Icinga; use Icinga\Application\Modules\Module; -use ipl\Html\Html; -use ipl\Html\ValidHtml; -use dipl\Html\ValidHtml as DiplValidHml; +use dipl\Html\Html; +use dipl\Html\ValidHtml; use Zend_Form; -abstract class QuickBaseForm extends Zend_Form implements ValidHtml, DiplValidHml +abstract class QuickBaseForm extends Zend_Form implements ValidHtml { /** * The Icinga module this form belongs to. Usually only set if the diff --git a/library/Director/Web/ObjectPreview.php b/library/Director/Web/ObjectPreview.php index ca1387c4..f54009a2 100644 --- a/library/Director/Web/ObjectPreview.php +++ b/library/Director/Web/ObjectPreview.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Director\Web; -use ipl\Html\Text; +use dipl\Html\Text; use Icinga\Module\Director\Exception\NestingError; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Web\Request; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ControlsAndContent; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ControlsAndContent; class ObjectPreview { diff --git a/library/Director/Web/SelfService.php b/library/Director/Web/SelfService.php index 8b513d22..a58ce24c 100644 --- a/library/Director/Web/SelfService.php +++ b/library/Director/Web/SelfService.php @@ -12,11 +12,11 @@ use Icinga\Exception\NotFoundError; use Icinga\Module\Director\IcingaConfig\AgentWizard; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Util; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ActionBar; -use gipfl\IcingaWeb2\Widget\ControlsAndContent; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ActionBar; +use dipl\Web\Widget\ControlsAndContent; class SelfService { diff --git a/library/Director/Web/Table/ActivityLogTable.php b/library/Director/Web/Table/ActivityLogTable.php index 90e85d9c..74cdabb6 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 ipl\Html\BaseHtmlElement; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class ActivityLogTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ApplyRulesTable.php b/library/Director/Web/Table/ApplyRulesTable.php index 2be27cc2..148dda3e 100644 --- a/library/Director/Web/Table/ApplyRulesTable.php +++ b/library/Director/Web/Table/ApplyRulesTable.php @@ -9,11 +9,11 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\IcingaConfig\AssignRenderer; use Icinga\Module\Director\Objects\IcingaObject; -use gipfl\IcingaWeb2\Icon; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; -use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer; +use dipl\Db\Zf1\FilterRenderer; +use dipl\Html\Icon; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; use Zend_Db_Select as ZfSelect; class ApplyRulesTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/BasketSnapshotTable.php b/library/Director/Web/Table/BasketSnapshotTable.php index 08f808ab..b7b6bd57 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 ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; use Icinga\Date\DateFormatter; use Icinga\Module\Director\Core\Json; use Icinga\Module\Director\DirectorObject\Automation\Basket; diff --git a/library/Director/Web/Table/BasketTable.php b/library/Director/Web/Table/BasketTable.php index 022fb480..4c381593 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class BasketTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ChoicesTable.php b/library/Director/Web/Table/ChoicesTable.php index 4ba24602..6bca3143 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; class ChoicesTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ConfigFileDiffTable.php b/library/Director/Web/Table/ConfigFileDiffTable.php index 1d14d5e0..0bc00f9e 100644 --- a/library/Director/Web/Table/ConfigFileDiffTable.php +++ b/library/Director/Web/Table/ConfigFileDiffTable.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use Icinga\Module\Director\Util; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class ConfigFileDiffTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/CoreApiFieldsTable.php b/library/Director/Web/Table/CoreApiFieldsTable.php index 90c3e5eb..25e73d34 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 ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use ipl\Html\Table; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Url; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Html\Table; +use dipl\Translation\TranslationHelper; +use dipl\Web\Url; class CoreApiFieldsTable extends Table { diff --git a/library/Director/Web/Table/CoreApiObjectsTable.php b/library/Director/Web/Table/CoreApiObjectsTable.php index 0dd223d5..411064ff 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 gipfl\IcingaWeb2\Link; -use ipl\Html\Table; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Link; +use dipl\Html\Table; +use dipl\Translation\TranslationHelper; class CoreApiObjectsTable extends Table { diff --git a/library/Director/Web/Table/CoreApiPrototypesTable.php b/library/Director/Web/Table/CoreApiPrototypesTable.php index ecc62bda..73fec13e 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 ipl\Html\Table; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Table; +use dipl\Translation\TranslationHelper; class CoreApiPrototypesTable extends Table { diff --git a/library/Director/Web/Table/CustomvarTable.php b/library/Director/Web/Table/CustomvarTable.php index f9a38447..012a47ea 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 ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/CustomvarVariantsTable.php b/library/Director/Web/Table/CustomvarVariantsTable.php index 80fca705..f29a89c6 100644 --- a/library/Director/Web/Table/CustomvarVariantsTable.php +++ b/library/Director/Web/Table/CustomvarVariantsTable.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use Icinga\Module\Director\PlainObjectRenderer; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/DatafieldTable.php b/library/Director/Web/Table/DatafieldTable.php index d78d918e..c967cca8 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/DatalistEntryTable.php b/library/Director/Web/Table/DatalistEntryTable.php index 70167c75..42909d47 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class DatalistEntryTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/DatalistTable.php b/library/Director/Web/Table/DatalistTable.php index 7b35fe01..8fbdec76 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class DatalistTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/DeploymentLogTable.php b/library/Director/Web/Table/DeploymentLogTable.php index 2d5cb947..9c24e416 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; use Icinga\Date\DateFormatter; class DeploymentLogTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/GeneratedConfigFileTable.php b/library/Director/Web/Table/GeneratedConfigFileTable.php index 97f7091a..e845220a 100644 --- a/library/Director/Web/Table/GeneratedConfigFileTable.php +++ b/library/Director/Web/Table/GeneratedConfigFileTable.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use Icinga\Module\Director\IcingaConfig\IcingaConfig; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class GeneratedConfigFileTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/GroupMemberTable.php b/library/Director/Web/Table/GroupMemberTable.php index 98e9fc1b..e51a62d4 100644 --- a/library/Director/Web/Table/GroupMemberTable.php +++ b/library/Director/Web/Table/GroupMemberTable.php @@ -7,9 +7,9 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\IcingaConfig\AssignRenderer; use Icinga\Module\Director\Objects\IcingaObjectGroup; use Exception; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; class GroupMemberTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaAppliedServiceTable.php b/library/Director/Web/Table/IcingaAppliedServiceTable.php index b669296d..ae13d68c 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaAppliedServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaCommandArgumentTable.php b/library/Director/Web/Table/IcingaCommandArgumentTable.php index 977d7f4d..c1b859e5 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaCommandArgumentTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php b/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php index 0d2f8e88..a2e26eb4 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 ipl\Html\Html; +use dipl\Html\Html; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\CustomVariable\CustomVariableDictionary; use Icinga\Module\Director\Objects\IcingaHost; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\SimpleQueryBasedTable; class IcingaHostAppliedForServiceTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php index 297b672e..5f02eb7e 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 ipl\Html\Html; +use dipl\Html\Html; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Data\Filter\Filter; use Icinga\Exception\IcingaException; use Icinga\Module\Director\IcingaConfig\AssignRenderer; use Icinga\Module\Director\Objects\HostApplyMatches; use Icinga\Module\Director\Objects\IcingaHost; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\SimpleQueryBasedTable; class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaHostServiceTable.php b/library/Director/Web/Table/IcingaHostServiceTable.php index 7e8fb021..3dda12ef 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 ipl\Html\Html; +use dipl\Html\Html; use Icinga\Module\Director\Objects\IcingaHost; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaHostServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaObjectDatafieldTable.php b/library/Director/Web/Table/IcingaObjectDatafieldTable.php index f97692e1..2bd9d06b 100644 --- a/library/Director/Web/Table/IcingaObjectDatafieldTable.php +++ b/library/Director/Web/Table/IcingaObjectDatafieldTable.php @@ -6,8 +6,8 @@ use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Web\Form\IcingaObjectFieldLoader; use Icinga\Web\Url; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\SimpleQueryBasedTable; class IcingaObjectDatafieldTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php b/library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php index cd8f8b1c..5edd5d87 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaScheduledDowntimeRangeTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaServiceSetHostTable.php b/library/Director/Web/Table/IcingaServiceSetHostTable.php index 9fc3c61b..a241166f 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaServiceSetHostTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaServiceSetServiceTable.php b/library/Director/Web/Table/IcingaServiceSetServiceTable.php index e928218e..18e81bf2 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 ipl\Html\BaseHtmlElement; -use ipl\Html\Html; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; use Icinga\Module\Director\Forms\RemoveLinkForm; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaServiceSet; -use ipl\Html\HtmlElement; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\HtmlElement; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; class IcingaServiceSetServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaTimePeriodRangeTable.php b/library/Director/Web/Table/IcingaTimePeriodRangeTable.php index 5870e67e..42dce307 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaTimePeriodRangeTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ImportedrowsTable.php b/library/Director/Web/Table/ImportedrowsTable.php index 34c4704d..a7646c00 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 ipl\Html\Html; -use ipl\Html\ValidHtml; -use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; +use dipl\Html\Html; +use dipl\Html\ValidHtml; +use dipl\Web\Table\SimpleQueryBasedTable; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\Objects\ImportRun; use Icinga\Module\Director\PlainObjectRenderer; diff --git a/library/Director/Web/Table/ImportrunTable.php b/library/Director/Web/Table/ImportrunTable.php index e6c8a380..c21dd9d7 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class ImportrunTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ImportsourceHookTable.php b/library/Director/Web/Table/ImportsourceHookTable.php index 40cbc8ff..c2197892 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 ipl\Html\ValidHtml; +use dipl\Html\ValidHtml; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Import\SyncUtils; use Icinga\Module\Director\Objects\ImportSource; use Icinga\Module\Director\PlainObjectRenderer; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Table\SimpleQueryBasedTable; +use dipl\Html\Html; +use dipl\Web\Table\SimpleQueryBasedTable; class ImportsourceHookTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/ImportsourceTable.php b/library/Director/Web/Table/ImportsourceTable.php index 1a93ef55..29683e80 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class ImportsourceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/JobTable.php b/library/Director/Web/Table/JobTable.php index 81ba07b8..7d71efaa 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class JobTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ObjectSetTable.php b/library/Director/Web/Table/ObjectSetTable.php index 2c98c42b..79f5afc6 100644 --- a/library/Director/Web/Table/ObjectSetTable.php +++ b/library/Director/Web/Table/ObjectSetTable.php @@ -4,9 +4,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Authentication\Auth; use Icinga\Module\Director\Db; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; use Icinga\Module\Director\Restriction\FilterByNameRestriction; class ObjectSetTable extends ZfQueryBasedTable diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php index 6ebc2bb0..4d20209e 100644 --- a/library/Director/Web/Table/ObjectsTable.php +++ b/library/Director/Web/Table/ObjectsTable.php @@ -9,9 +9,9 @@ use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Restriction\FilterByNameRestriction; use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Restriction\ObjectRestriction; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; use Zend_Db_Select as ZfSelect; class ObjectsTable extends ZfQueryBasedTable @@ -170,11 +170,6 @@ class ObjectsTable extends ZfQueryBasedTable return $tr; } -protected function getRowClasses() -{ -return []; -} - protected function applyObjectTypeFilter(ZfSelect $query) { return $query->where( diff --git a/library/Director/Web/Table/ObjectsTableEndpoint.php b/library/Director/Web/Table/ObjectsTableEndpoint.php index aedc4526..46d94f60 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 gipfl\IcingaWeb2\Icon; +use dipl\Html\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 68b7e463..a85a285f 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 gipfl\IcingaWeb2\Table\Extension\MultiSelect; +use dipl\Web\Table\Extension\MultiSelect; class ObjectsTableHost extends ObjectsTable { diff --git a/library/Director/Web/Table/ObjectsTableService.php b/library/Director/Web/Table/ObjectsTableService.php index c9be7b88..192638b5 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 ipl\Html\Html; -use gipfl\IcingaWeb2\Table\Extension\MultiSelect; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Html; +use dipl\Web\Table\Extension\MultiSelect; +use dipl\Html\Link; +use dipl\Web\Url; class ObjectsTableService extends ObjectsTable { diff --git a/library/Director/Web/Table/PropertymodifierTable.php b/library/Director/Web/Table/PropertymodifierTable.php index 29a4e25f..5c95c72e 100644 --- a/library/Director/Web/Table/PropertymodifierTable.php +++ b/library/Director/Web/Table/PropertymodifierTable.php @@ -6,10 +6,10 @@ use Error; use Exception; use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\ImportSource; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; +use dipl\Html\Link; +use dipl\Web\Table\Extension\ZfSortablePriority; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; class PropertymodifierTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/QuickTable.php b/library/Director/Web/Table/QuickTable.php index bde5f568..ad1374ed 100644 --- a/library/Director/Web/Table/QuickTable.php +++ b/library/Director/Web/Table/QuickTable.php @@ -15,11 +15,11 @@ use Icinga\Exception\QueryException; use Icinga\Module\Director\Db; use Icinga\Module\Director\PlainObjectRenderer; use Icinga\Web\Request; -use gipfl\IcingaWeb2\Url; +use dipl\Web\Url; use Icinga\Web\View; use Icinga\Web\Widget; use Icinga\Web\Widget\Paginator; -use ipl\Html\ValidHtml; +use dipl\Html\ValidHtml; use stdClass; use Zend_Db_Select as ZfDbSelect; diff --git a/library/Director/Web/Table/SyncRunTable.php b/library/Director/Web/Table/SyncRunTable.php index 9c161235..a5cb77bc 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class SyncRunTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/SyncpropertyTable.php b/library/Director/Web/Table/SyncpropertyTable.php index 79461cec..fae1b326 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\Extension\ZfSortablePriority; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\Extension\ZfSortablePriority; +use dipl\Web\Table\ZfQueryBasedTable; class SyncpropertyTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/SyncruleTable.php b/library/Director/Web/Table/SyncruleTable.php index 4a8e4e5c..e2462c51 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 gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class SyncruleTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/TemplateUsageTable.php b/library/Director/Web/Table/TemplateUsageTable.php index d4e9b5a5..b04abcfd 100644 --- a/library/Director/Web/Table/TemplateUsageTable.php +++ b/library/Director/Web/Table/TemplateUsageTable.php @@ -5,9 +5,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Resolver\TemplateTree; -use gipfl\IcingaWeb2\Link; -use ipl\Html\Table; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Link; +use dipl\Html\Table; +use dipl\Translation\TranslationHelper; class TemplateUsageTable extends Table { diff --git a/library/Director/Web/Table/TemplatesTable.php b/library/Director/Web/Table/TemplatesTable.php index 0b4fce7e..366790a9 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 ipl\Html\Html; -use gipfl\IcingaWeb2\Icon; -use gipfl\IcingaWeb2\Link; -use gipfl\IcingaWeb2\Table\Extension\MultiSelect; -use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; -use gipfl\IcingaWeb2\Url; -use gipfl\IcingaWeb2\Zf1\Db\FilterRenderer; +use dipl\Db\Zf1\FilterRenderer; +use dipl\Html\Html; +use dipl\Html\Icon; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; use Zend_Db_Select as ZfSelect; class TemplatesTable extends ZfQueryBasedTable implements FilterableByUsage diff --git a/library/Director/Web/Tabs/DataTabs.php b/library/Director/Web/Tabs/DataTabs.php index 791ca14a..28c9725b 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 gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class DataTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ImportTabs.php b/library/Director/Web/Tabs/ImportTabs.php index e6c68077..11e32b1e 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 gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class ImportTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ImportsourceTabs.php b/library/Director/Web/Tabs/ImportsourceTabs.php index 74dedb39..31a37b57 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 gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class ImportsourceTabs extends Tabs { diff --git a/library/Director/Web/Tabs/InfraTabs.php b/library/Director/Web/Tabs/InfraTabs.php index 8a65c4ee..045447c3 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 gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class InfraTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ObjectTabs.php b/library/Director/Web/Tabs/ObjectTabs.php index bfb16e0e..8953ccf1 100644 --- a/library/Director/Web/Tabs/ObjectTabs.php +++ b/library/Director/Web/Tabs/ObjectTabs.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Tabs; use Icinga\Authentication\Auth; use Icinga\Module\Director\Objects\IcingaObject; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class ObjectTabs extends Tabs { diff --git a/library/Director/Web/Tabs/ObjectsTabs.php b/library/Director/Web/Tabs/ObjectsTabs.php index 5edfd71e..0a309642 100644 --- a/library/Director/Web/Tabs/ObjectsTabs.php +++ b/library/Director/Web/Tabs/ObjectsTabs.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Web\Tabs; use Icinga\Authentication\Auth; use Icinga\Module\Director\Objects\IcingaObject; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class ObjectsTabs extends Tabs { diff --git a/library/Director/Web/Tabs/SyncRuleTabs.php b/library/Director/Web/Tabs/SyncRuleTabs.php index d64ff818..bf606761 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 gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\Tabs; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; class SyncRuleTabs extends Tabs { diff --git a/library/Director/Web/Tree/InspectTreeRenderer.php b/library/Director/Web/Tree/InspectTreeRenderer.php index 54a177f4..34be181a 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 ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; class InspectTreeRenderer extends BaseHtmlElement { diff --git a/library/Director/Web/Tree/TemplateTreeRenderer.php b/library/Director/Web/Tree/TemplateTreeRenderer.php index e238ded0..475792f7 100644 --- a/library/Director/Web/Tree/TemplateTreeRenderer.php +++ b/library/Director/Web/Tree/TemplateTreeRenderer.php @@ -4,11 +4,11 @@ namespace Icinga\Module\Director\Web\Tree; use Icinga\Module\Director\Db; use Icinga\Module\Director\Resolver\TemplateTree; -use ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\ControlsAndContent; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ControlsAndContent; class TemplateTreeRenderer extends BaseHtmlElement { diff --git a/library/Director/Web/Widget/ActivityLogInfo.php b/library/Director/Web/Widget/ActivityLogInfo.php index a7d76143..f580d1b4 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 ipl\Html\HtmlDocument; -use ipl\Html\HtmlElement; +use dipl\Html\HtmlDocument; +use dipl\Html\HtmlElement; use Icinga\Date\DateFormatter; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\ConfigDiff; @@ -13,13 +13,13 @@ use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaService; use Icinga\Module\Director\Objects\IcingaServiceSet; -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; +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; class ActivityLogInfo extends HtmlDocument { diff --git a/library/Director/Web/Widget/AdditionalTableActions.php b/library/Director/Web/Widget/AdditionalTableActions.php index 978f399d..fe6a7dc5 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 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 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 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 6253fb54..96f2d674 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 ipl\Html\HtmlDocument; +use dipl\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 ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\NameValueTable; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\NameValueTable; class DeployedConfigInfoHeader extends HtmlDocument { diff --git a/library/Director/Web/Widget/DeploymentInfo.php b/library/Director/Web/Widget/DeploymentInfo.php index 110200f2..8d6576ac 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 ipl\Html\HtmlDocument; +use dipl\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 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; +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; class DeploymentInfo extends HtmlDocument { diff --git a/library/Director/Web/Widget/HealthCheckPluginOutput.php b/library/Director/Web/Widget/HealthCheckPluginOutput.php index 83ac1029..6e8d66a9 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 ipl\Html\Html; -use ipl\Html\HtmlDocument; -use ipl\Html\HtmlString; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Html\HtmlDocument; +use dipl\Html\HtmlString; +use dipl\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 16bff78e..1702e0c1 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 gipfl\IcingaWeb2\Url; +use dipl\Web\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 61f35671..0832d043 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 ipl\Html\BaseHtmlElement; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\NameValueTable; +use dipl\Html\BaseHtmlElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\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 57e3e569..bd3b531c 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 ipl\Html\HtmlDocument; +use dipl\Html\HtmlDocument; use Icinga\Module\Director\Forms\ImportCheckForm; use Icinga\Module\Director\Forms\ImportRunForm; use Icinga\Module\Director\Objects\ImportSource; -use ipl\Html\Html; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class ImportSourceDetails extends HtmlDocument { diff --git a/library/Director/Web/Widget/JobDetails.php b/library/Director/Web/Widget/JobDetails.php index 32e8ebd9..d40dfabc 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 ipl\Html\HtmlDocument; +use dipl\Html\HtmlDocument; use Icinga\Module\Director\Objects\DirectorJob; -use ipl\Html\Html; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class JobDetails extends HtmlDocument { diff --git a/library/Director/Web/Widget/ShowConfigFile.php b/library/Director/Web/Widget/ShowConfigFile.php index 77d32cf3..adf4eac1 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 ipl\Html\HtmlDocument; +use dipl\Html\HtmlDocument; use Icinga\Module\Director\IcingaConfig\IcingaConfigFile; -use ipl\Html\Html; -use ipl\Html\HtmlString; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; class ShowConfigFile extends HtmlDocument { diff --git a/library/Director/Web/Widget/SyncRunDetails.php b/library/Director/Web/Widget/SyncRunDetails.php index 9f0e3a09..83aeff1b 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 ipl\Html\HtmlDocument; +use dipl\Html\HtmlDocument; use Icinga\Module\Director\Db; use Icinga\Module\Director\Objects\SyncRun; -use ipl\Html\Html; -use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; -use gipfl\IcingaWeb2\Widget\NameValueTable; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\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 bb7298fd..67d54229 100644 --- a/library/vendor/ipl/Db/Zf1/FilterRenderer.php +++ b/library/vendor/ipl/Db/Zf1/FilterRenderer.php @@ -45,7 +45,7 @@ class FilterRenderer return new DbExpr($this->render()); } - public static function applyToQuery(Filter $filter, \Zend_Db_Select $query) + public static function applyToQuery(Filter $filter, $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 d4a90e0e..c250714a 100644 --- a/library/vendor/ipl/Html/ValidHtml.php +++ b/library/vendor/ipl/Html/ValidHtml.php @@ -2,13 +2,11 @@ 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 extends iplValidHtml +interface ValidHtml { /** * Render to HTML