diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 3d9f541c..f81bce60 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -24,10 +24,10 @@ use Icinga\Module\Director\Web\Widget\ShowConfigFile; use Icinga\Web\Notification; use Icinga\Web\Url; use Exception; -use ipl\Html\Html; -use ipl\Html\HtmlString; -use ipl\Html\Icon; -use ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Html\Icon; +use dipl\Html\Link; class ConfigController extends ActionController { diff --git a/application/controllers/DataController.php b/application/controllers/DataController.php index 87a6e44a..f8e00262 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 ipl\Html\Link; +use dipl\Html\Link; class DataController extends ActionController { diff --git a/application/controllers/DependenciesController.php b/application/controllers/DependenciesController.php index 51e43b3e..a3a692c2 100644 --- a/application/controllers/DependenciesController.php +++ b/application/controllers/DependenciesController.php @@ -3,7 +3,7 @@ namespace Icinga\Module\Director\Controllers; use Icinga\Module\Director\Web\Controller\ObjectsController; -use ipl\Html\Html; +use dipl\Html\Html; class DependenciesController extends ObjectsController { diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php index 255471b1..3a4f9686 100644 --- a/application/controllers/HostController.php +++ b/application/controllers/HostController.php @@ -20,7 +20,7 @@ use Icinga\Module\Director\Web\Table\IcingaHostAppliedServicesTable; use Icinga\Module\Director\Web\Table\IcingaHostServiceTable; use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable; use Icinga\Web\Url; -use ipl\Html\Link; +use dipl\Html\Link; class HostController extends ObjectController { diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php index 1b83c4b8..621383a5 100644 --- a/application/controllers/HostsController.php +++ b/application/controllers/HostsController.php @@ -8,7 +8,7 @@ use Icinga\Data\Filter\FilterExpression; use Icinga\Module\Director\Forms\IcingaAddServiceForm; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Web\Controller\ObjectsController; -use ipl\Html\Link; +use dipl\Html\Link; class HostsController extends ObjectsController { diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php index 9cc20448..ed88441d 100644 --- a/application/controllers/ImportsourceController.php +++ b/application/controllers/ImportsourceController.php @@ -11,7 +11,7 @@ use Icinga\Module\Director\Web\Table\ImportsourceHookTable; use Icinga\Module\Director\Web\Table\PropertymodifierTable; use Icinga\Module\Director\Web\Tabs\ImportsourceTabs; use Icinga\Module\Director\Web\Widget\ImportSourceDetails; -use ipl\Html\Link; +use dipl\Html\Link; class ImportsourceController extends ActionController { diff --git a/application/controllers/InspectController.php b/application/controllers/InspectController.php index 566e6e01..32ce2d77 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 ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\Link; class InspectController extends ActionController { diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php index 7e723cc1..2515d544 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 ipl\Html\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 75d2375e..9f344ff9 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 d0984975..ba9c1a3a 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 ipl\Html\Link; -use ipl\Web\Widget\Tabs; +use dipl\Html\Link; +use dipl\Web\Widget\Tabs; class ServiceController extends ObjectController { diff --git a/application/controllers/ServicesetController.php b/application/controllers/ServicesetController.php index 69bc19b5..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 ipl\Html\Link; +use dipl\Html\Link; class ServicesetController extends ObjectController { diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php index 9d1e02fc..cc4784b1 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 323ff4a7..9e06abc6 100644 --- a/application/controllers/SuggestController.php +++ b/application/controllers/SuggestController.php @@ -6,7 +6,7 @@ use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaService; use Icinga\Module\Director\Web\Controller\ActionController; use Icinga\Data\Filter\Filter; -use ipl\Html\Util; +use dipl\Html\Util; use Icinga\Module\Director\Objects\HostApplyMatches; class SuggestController extends ActionController diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php index 9e9bb3d1..54af3679 100644 --- a/application/controllers/SyncruleController.php +++ b/application/controllers/SyncruleController.php @@ -13,8 +13,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 ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\Link; class SyncruleController extends ActionController { diff --git a/application/forms/DeploymentLinkForm.php b/application/forms/DeploymentLinkForm.php index c9a34295..f163b548 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 ipl\Html\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 70d6e961..72aace22 100644 --- a/application/forms/IcingaHostForm.php +++ b/application/forms/IcingaHostForm.php @@ -5,9 +5,9 @@ namespace Icinga\Module\Director\Forms; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Repository\IcingaTemplateRepository; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -use ipl\Html\BaseElement; -use ipl\Html\Html; -use ipl\Html\Link; +use dipl\Html\BaseElement; +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 c2f95d31..44b23054 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 Icinga\Module\Director\Web\Form\Validate\NamePattern; -use ipl\Html\Html; -use ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\Link; class IcingaServiceForm extends DirectorObjectForm { diff --git a/application/forms/KickstartForm.php b/application/forms/KickstartForm.php index aeebdb9e..3a72015f 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 ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\Link; class KickstartForm extends DirectorForm { diff --git a/library/Director/ConfigDiff.php b/library/Director/ConfigDiff.php index b8a5eefe..3f5c1a7a 100644 --- a/library/Director/ConfigDiff.php +++ b/library/Director/ConfigDiff.php @@ -7,7 +7,7 @@ use Diff_Renderer_Html_Inline; use Diff_Renderer_Html_SideBySide; use Diff_Renderer_Text_Context; use Diff_Renderer_Text_Unified; -use ipl\Html\ValidHtml; +use dipl\Html\ValidHtml; class ConfigDiff implements ValidHtml { diff --git a/library/Director/Dashboard/Dashboard.php b/library/Director/Dashboard/Dashboard.php index 2472ee83..e0b3b293 100644 --- a/library/Director/Dashboard/Dashboard.php +++ b/library/Director/Dashboard/Dashboard.php @@ -10,11 +10,11 @@ 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 ipl\Html\Util; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\Tabs; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Html\Util; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\Tabs; use Zend_Db_Select as ZfSelect; abstract class Dashboard extends Html implements Countable diff --git a/library/Director/Dashboard/Dashlet/Dashlet.php b/library/Director/Dashboard/Dashlet/Dashlet.php index e4b72dfa..a335a7e1 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\BaseElement; -use ipl\Html\Html; -use ipl\Html\Icon; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; +use dipl\Html\BaseElement; +use dipl\Html\Html; +use dipl\Html\Icon; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; abstract class Dashlet extends BaseElement { 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/StartupLogRenderer.php b/library/Director/StartupLogRenderer.php index 644e131d..4e73ac0c 100644 --- a/library/Director/StartupLogRenderer.php +++ b/library/Director/StartupLogRenderer.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director; use Icinga\Module\Director\Objects\DirectorDeploymentLog; -use ipl\Html\Link; -use ipl\Html\Util as iplUtil; -use ipl\Html\ValidHtml; +use dipl\Html\Link; +use dipl\Html\Util as iplUtil; +use dipl\Html\ValidHtml; class StartupLogRenderer implements ValidHtml { diff --git a/library/Director/TranslationDummy.php b/library/Director/TranslationDummy.php index b798c04e..ff1bda02 100644 --- a/library/Director/TranslationDummy.php +++ b/library/Director/TranslationDummy.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director; -use ipl\Translation\TranslationHelper; +use dipl\Translation\TranslationHelper; class TranslationDummy { diff --git a/library/Director/Util.php b/library/Director/Util.php index 8368bcb9..9ad5c1df 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 ipl\Html\Link; +use dipl\Html\Html; +use dipl\Html\Link; use Zend_Db_Expr; class Util diff --git a/library/Director/Web/ActionBar/ChoicesActionBar.php b/library/Director/Web/ActionBar/ChoicesActionBar.php index 51a3e45b..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 ipl\Html\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 824838fa..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 ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\ActionBar; -use ipl\Web\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 ac726356..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 ipl\Html\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 56eeee95..9278559b 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 ipl\Html\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 fc7f3a3b..f543b115 100644 --- a/library/Director/Web/Controller/ActionController.php +++ b/library/Director/Web/Controller/ActionController.php @@ -16,12 +16,12 @@ use Icinga\Security\SecurityException; use Icinga\Web\Controller; use Icinga\Web\UrlParams; use Icinga\Web\Widget; -use ipl\Compat\Translator; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\ControlsAndContent; -use ipl\Web\Controller\Extension\ControlsAndContentHelper; -use ipl\Zf1\SimpleViewRenderer; +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 { diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php index 164bed26..dc5edacc 100644 --- a/library/Director/Web/Controller/ObjectController.php +++ b/library/Director/Web/Controller/ObjectController.php @@ -18,7 +18,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 ipl\Html\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 975277c9..d884521d 100644 --- a/library/Director/Web/Controller/ObjectsController.php +++ b/library/Director/Web/Controller/ObjectsController.php @@ -18,7 +18,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 ipl\Html\Link; +use dipl\Html\Link; abstract class ObjectsController extends ActionController { diff --git a/library/Director/Web/Controller/TemplateController.php b/library/Director/Web/Controller/TemplateController.php index c675f32a..d7cdfa36 100644 --- a/library/Director/Web/Controller/TemplateController.php +++ b/library/Director/Web/Controller/TemplateController.php @@ -9,11 +9,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 ipl\Html\Link; -use ipl\Web\CompatController; -use ipl\Web\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/IplElement/ExtensibleSetElement.php b/library/Director/Web/Form/IplElement/ExtensibleSetElement.php index 7ff1ba8a..1dc50532 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\BaseElement; -use ipl\Html\Html; -use ipl\Translation\TranslationHelper; +use dipl\Html\BaseElement; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class ExtensibleSetElement extends BaseElement { diff --git a/library/Director/Web/Form/QuickBaseForm.php b/library/Director/Web/Form/QuickBaseForm.php index 4e7eb211..ed8ef7a4 100644 --- a/library/Director/Web/Form/QuickBaseForm.php +++ b/library/Director/Web/Form/QuickBaseForm.php @@ -4,8 +4,8 @@ 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\Html; +use dipl\Html\ValidHtml; use Zend_Form; abstract class QuickBaseForm extends Zend_Form implements ValidHtml diff --git a/library/Director/Web/ObjectPreview.php b/library/Director/Web/ObjectPreview.php index dc089745..047c19f6 100644 --- a/library/Director/Web/ObjectPreview.php +++ b/library/Director/Web/ObjectPreview.php @@ -5,10 +5,10 @@ namespace Icinga\Module\Director\Web; use Icinga\Module\Director\Exception\NestingError; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Web\Request; -use ipl\Html\Html; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\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 b274d7bd..e34f1c73 100644 --- a/library/Director/Web/SelfService.php +++ b/library/Director/Web/SelfService.php @@ -11,11 +11,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 ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\ActionBar; -use ipl\Web\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 f91a61cd..3692db0e 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\BaseElement; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; +use dipl\Html\BaseElement; +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 10255e31..db8875aa 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 ipl\Db\Zf1\FilterRenderer; -use ipl\Html\Icon; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\Url; +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/ChoicesTable.php b/library/Director/Web/Table/ChoicesTable.php index f9bc8cf8..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 ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\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 b69ccc54..f58daab2 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 ipl\Html\Link; -use ipl\Web\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 ddf51ab4..06baeece 100644 --- a/library/Director/Web/Table/CoreApiFieldsTable.php +++ b/library/Director/Web/Table/CoreApiFieldsTable.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Director\Web\Table; -use ipl\Html\BaseElement; -use ipl\Html\Link; -use ipl\Html\Table; -use ipl\Translation\TranslationHelper; -use ipl\Web\Url; +use dipl\Html\BaseElement; +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 3b22aaac..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 ipl\Html\Link; -use ipl\Html\Table; -use ipl\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 d5dfa1b5..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 ipl\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 ecb84891..9460259c 100644 --- a/library/Director/Web/Table/CustomvarTable.php +++ b/library/Director/Web/Table/CustomvarTable.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\Web\Table; -use ipl\Html\Link; -use ipl\Web\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/CustomvarVariantsTable.php b/library/Director/Web/Table/CustomvarVariantsTable.php index b608703b..629d5c40 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 ipl\Html\Link; -use ipl\Web\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 a8c4678b..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 ipl\Html\Link; -use ipl\Web\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 17d2b8d0..b42cbf33 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 ipl\Html\Link; -use ipl\Web\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 70ff185c..689ae6dd 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 ipl\Html\Link; -use ipl\Web\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 719a80c3..30448e5c 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 ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class DeploymentLogTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/GeneratedConfigFileTable.php b/library/Director/Web/Table/GeneratedConfigFileTable.php index f508eb83..22d9a299 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 ipl\Html\Link; -use ipl\Web\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 b7dd33c7..8c10d84e 100644 --- a/library/Director/Web/Table/GroupMemberTable.php +++ b/library/Director/Web/Table/GroupMemberTable.php @@ -4,9 +4,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use Icinga\Module\Director\Objects\IcingaObjectGroup; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\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 6a1786bd..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 ipl\Html\Link; -use ipl\Web\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 8e243231..47a28c85 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 ipl\Html\Link; -use ipl\Web\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 e4eff817..e2b206c8 100644 --- a/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php +++ b/library/Director/Web/Table/IcingaHostAppliedForServiceTable.php @@ -5,8 +5,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\CustomVariable\CustomVariableDictionary; use Icinga\Module\Director\Objects\IcingaHost; -use ipl\Html\Link; -use ipl\Web\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 cac65fc4..e316940f 100644 --- a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php +++ b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php @@ -6,8 +6,8 @@ use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Data\Filter\Filter; use Icinga\Module\Director\Objects\HostApplyMatches; use Icinga\Module\Director\Objects\IcingaHost; -use ipl\Html\Link; -use ipl\Web\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 c5a80719..bbb557b2 100644 --- a/library/Director/Web/Table/IcingaHostServiceTable.php +++ b/library/Director/Web/Table/IcingaHostServiceTable.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaHost; -use ipl\Html\Link; -use ipl\Web\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 daf3d37c..4345e041 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 ipl\Html\Link; -use ipl\Web\Table\SimpleQueryBasedTable; +use dipl\Html\Link; +use dipl\Web\Table\SimpleQueryBasedTable; class IcingaObjectDatafieldTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaServiceSetHostTable.php b/library/Director/Web/Table/IcingaServiceSetHostTable.php index 59eda469..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 ipl\Html\Link; -use ipl\Web\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 3c860260..5c98076f 100644 --- a/library/Director/Web/Table/IcingaServiceSetServiceTable.php +++ b/library/Director/Web/Table/IcingaServiceSetServiceTable.php @@ -4,9 +4,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaServiceSet; -use ipl\Html\Element; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; +use dipl\Html\Element; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; class IcingaServiceSetServiceTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/IcingaTimePeriodRangeTable.php b/library/Director/Web/Table/IcingaTimePeriodRangeTable.php index 88c0fdfa..590ace81 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 ipl\Html\Link; -use ipl\Web\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 3c1fdf73..7ea166f9 100644 --- a/library/Director/Web/Table/ImportedrowsTable.php +++ b/library/Director/Web/Table/ImportedrowsTable.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Module\Director\Objects\ImportRun; -use ipl\Web\Table\SimpleQueryBasedTable; +use dipl\Web\Table\SimpleQueryBasedTable; class ImportedrowsTable extends SimpleQueryBasedTable { diff --git a/library/Director/Web/Table/ImportrunTable.php b/library/Director/Web/Table/ImportrunTable.php index bc36e25f..459e8ef1 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 ipl\Html\Link; -use ipl\Web\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 b8d44459..55d04015 100644 --- a/library/Director/Web/Table/ImportsourceHookTable.php +++ b/library/Director/Web/Table/ImportsourceHookTable.php @@ -7,8 +7,8 @@ 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 ipl\Web\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 6763c253..1e2e3826 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 ipl\Html\Link; -use ipl\Web\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 26219304..2318defb 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 ipl\Html\Link; -use ipl\Web\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 1c3c6246..05c59665 100644 --- a/library/Director/Web/Table/ObjectSetTable.php +++ b/library/Director/Web/Table/ObjectSetTable.php @@ -3,9 +3,9 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\Url; class ObjectSetTable extends ZfQueryBasedTable { diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php index bc7ae048..c25d1432 100644 --- a/library/Director/Web/Table/ObjectsTable.php +++ b/library/Director/Web/Table/ObjectsTable.php @@ -8,9 +8,9 @@ use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Restriction\ObjectRestriction; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\Url; +use dipl\Html\Link; +use dipl\Web\Table\ZfQueryBasedTable; +use dipl\Web\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 15ea8573..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 ipl\Html\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 7e0ca19f..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 ipl\Web\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 175412fb..3d44f921 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 ipl\Web\Table\Extension\MultiSelect; -use ipl\Html\Link; -use ipl\Web\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 c5b955f2..f6a07a10 100644 --- a/library/Director/Web/Table/PropertymodifierTable.php +++ b/library/Director/Web/Table/PropertymodifierTable.php @@ -5,10 +5,10 @@ namespace Icinga\Module\Director\Web\Table; use Exception; use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\ImportSource; -use ipl\Html\Link; -use ipl\Web\Table\Extension\ZfSortablePriority; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\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 a6a3a97f..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 ipl\Web\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 30989581..2af3f2dc 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 ipl\Html\Link; -use ipl\Web\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 0c6ed55b..967c6226 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 ipl\Html\Link; -use ipl\Web\Table\Extension\ZfSortablePriority; -use ipl\Web\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 b36b3158..251c0481 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 ipl\Html\Link; -use ipl\Web\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 a7722437..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 ipl\Html\Link; -use ipl\Html\Table; -use ipl\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 fcd447ef..e5ca183f 100644 --- a/library/Director/Web/Table/TemplatesTable.php +++ b/library/Director/Web/Table/TemplatesTable.php @@ -7,12 +7,12 @@ use Icinga\Data\Filter\Filter; use Icinga\Module\Director\Db; use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\Objects\IcingaObject; -use ipl\Db\Zf1\FilterRenderer; -use ipl\Html\Html; -use ipl\Html\Icon; -use ipl\Html\Link; -use ipl\Web\Table\ZfQueryBasedTable; -use ipl\Web\Url; +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 diff --git a/library/Director/Web/Tabs/DataTabs.php b/library/Director/Web/Tabs/DataTabs.php index f2d77a19..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 ipl\Translation\TranslationHelper; -use ipl\Web\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 b7b886bd..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 ipl\Translation\TranslationHelper; -use ipl\Web\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 d1797e9a..66cf3ebc 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 ipl\Translation\TranslationHelper; -use ipl\Web\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 eaa0f78b..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 ipl\Translation\TranslationHelper; -use ipl\Web\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 8a9211d2..f9436236 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 ipl\Translation\TranslationHelper; -use ipl\Web\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 ea3a3f09..b9d4a187 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 ipl\Translation\TranslationHelper; -use ipl\Web\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 eece6972..efa3831f 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 ipl\Translation\TranslationHelper; -use ipl\Web\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 371702f0..e67a2367 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\BaseElement; -use ipl\Html\Html; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; +use dipl\Html\BaseElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; class InspectTreeRenderer extends BaseElement { diff --git a/library/Director/Web/Tree/TemplateTreeRenderer.php b/library/Director/Web/Tree/TemplateTreeRenderer.php index fcb54a11..93ad6d3d 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\BaseElement; -use ipl\Html\Html; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\ControlsAndContent; +use dipl\Html\BaseElement; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\ControlsAndContent; class TemplateTreeRenderer extends BaseElement { diff --git a/library/Director/Web/Widget/ActivityLogInfo.php b/library/Director/Web/Widget/ActivityLogInfo.php index 6344c340..bcb1f225 100644 --- a/library/Director/Web/Widget/ActivityLogInfo.php +++ b/library/Director/Web/Widget/ActivityLogInfo.php @@ -8,14 +8,14 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Forms\RestoreObjectForm; use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\Objects\IcingaObject; -use ipl\Html\Container; -use ipl\Html\Html; -use ipl\Html\Icon; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Url; -use ipl\Web\Widget\NameValueTable; -use ipl\Web\Widget\Tabs; +use dipl\Html\Container; +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 Html { diff --git a/library/Director/Web/Widget/DeployedConfigInfoHeader.php b/library/Director/Web/Widget/DeployedConfigInfoHeader.php index 70be5e33..47c983a4 100644 --- a/library/Director/Web/Widget/DeployedConfigInfoHeader.php +++ b/library/Director/Web/Widget/DeployedConfigInfoHeader.php @@ -6,10 +6,10 @@ use Icinga\Module\Director\Core\CoreApi; use Icinga\Module\Director\Db; use Icinga\Module\Director\Forms\DeployConfigForm; use Icinga\Module\Director\IcingaConfig\IcingaConfig; -use ipl\Html\Html; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\NameValueTable; +use dipl\Html\Html; +use dipl\Html\Link; +use dipl\Translation\TranslationHelper; +use dipl\Web\Widget\NameValueTable; class DeployedConfigInfoHeader extends Html { diff --git a/library/Director/Web/Widget/DeploymentInfo.php b/library/Director/Web/Widget/DeploymentInfo.php index fe04f000..1149a4eb 100644 --- a/library/Director/Web/Widget/DeploymentInfo.php +++ b/library/Director/Web/Widget/DeploymentInfo.php @@ -8,12 +8,12 @@ use Icinga\Module\Director\Objects\DirectorDeploymentLog; use Icinga\Module\Director\StartupLogRenderer; use Icinga\Util\Format; use Icinga\Web\Request; -use ipl\Html\Html; -use ipl\Html\Icon; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\Widget\NameValueTable; -use ipl\Web\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 Html { diff --git a/library/Director/Web/Widget/ImportSourceDetails.php b/library/Director/Web/Widget/ImportSourceDetails.php index c1afcd60..9ab2359d 100644 --- a/library/Director/Web/Widget/ImportSourceDetails.php +++ b/library/Director/Web/Widget/ImportSourceDetails.php @@ -5,8 +5,8 @@ namespace Icinga\Module\Director\Web\Widget; use Icinga\Module\Director\Forms\ImportCheckForm; use Icinga\Module\Director\Forms\ImportRunForm; use Icinga\Module\Director\Objects\ImportSource; -use ipl\Html\Html; -use ipl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class ImportSourceDetails extends Html { diff --git a/library/Director/Web/Widget/JobDetails.php b/library/Director/Web/Widget/JobDetails.php index 037c95ac..10b7d921 100644 --- a/library/Director/Web/Widget/JobDetails.php +++ b/library/Director/Web/Widget/JobDetails.php @@ -3,8 +3,8 @@ namespace Icinga\Module\Director\Web\Widget; use Icinga\Module\Director\Objects\DirectorJob; -use ipl\Html\Html; -use ipl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Translation\TranslationHelper; class JobDetails extends Html { diff --git a/library/Director/Web/Widget/ShowConfigFile.php b/library/Director/Web/Widget/ShowConfigFile.php index 35a9fd71..5ad46f8c 100644 --- a/library/Director/Web/Widget/ShowConfigFile.php +++ b/library/Director/Web/Widget/ShowConfigFile.php @@ -3,11 +3,11 @@ namespace Icinga\Module\Director\Web\Widget; use Icinga\Module\Director\IcingaConfig\IcingaConfigFile; -use ipl\Html\Html; -use ipl\Html\HtmlString; -use ipl\Html\Link; -use ipl\Html\Util; -use ipl\Translation\TranslationHelper; +use dipl\Html\Html; +use dipl\Html\HtmlString; +use dipl\Html\Link; +use dipl\Html\Util; +use dipl\Translation\TranslationHelper; class ShowConfigFile extends Html { diff --git a/library/Director/Web/Widget/SyncRunDetails.php b/library/Director/Web/Widget/SyncRunDetails.php index 71080b6b..aeacf16c 100644 --- a/library/Director/Web/Widget/SyncRunDetails.php +++ b/library/Director/Web/Widget/SyncRunDetails.php @@ -4,10 +4,10 @@ namespace Icinga\Module\Director\Web\Widget; use Icinga\Module\Director\Db; use Icinga\Module\Director\Objects\SyncRun; -use ipl\Html\Html; -use ipl\Html\Link; -use ipl\Translation\TranslationHelper; -use ipl\Web\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/Compat/Translator.php b/library/vendor/ipl/Compat/Translator.php index 2fd478e1..e45f6f06 100644 --- a/library/vendor/ipl/Compat/Translator.php +++ b/library/vendor/ipl/Compat/Translator.php @@ -1,9 +1,9 @@ getLoader()->registerNamespace( - 'ipl', + 'dipl', dirname(__DIR__) ); } diff --git a/library/vendor/ipl/Test/BaseTestCase.php b/library/vendor/ipl/Test/BaseTestCase.php index 2760c286..f65a35bf 100644 --- a/library/vendor/ipl/Test/BaseTestCase.php +++ b/library/vendor/ipl/Test/BaseTestCase.php @@ -1,8 +1,8 @@ provideHook('director/Job', $prefix . 'Job\\SyncJob'); $this->provideHook('cube/Actions', 'CubeLinks'); -// ipl compat, unless it is released: -if (class_exists('ipl\\Html\\ValidHtml')) { - return; -} - -if ($this->app->getModuleManager()->hasEnabled('ipl')) { - return; -} - require_once __DIR__ . '/library/vendor/ipl/Loader/CompatLoader.php'; CompatLoader::delegateLoadingToIcingaWeb($this->app);