From 3166c518e15fe29a022b43f89d8e4427b3cde4c5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Nov 2014 11:17:22 +0100 Subject: [PATCH] Rename Icinga\Module\Monitoring\Form to Icinga\Module\Moni...\Forms refs #7553 --- .../controllers/CommandController.php | 20 +++++++++---------- .../controllers/ConfigController.php | 6 +++--- .../controllers/HostController.php | 8 ++++---- .../controllers/HostsController.php | 12 +++++------ .../controllers/ListController.php | 8 ++++---- .../controllers/MultiController.php | 2 +- .../controllers/ProcessController.php | 4 ++-- .../controllers/ServiceController.php | 8 ++++---- .../controllers/ServicesController.php | 12 +++++------ .../application/forms/Command/CommandForm.php | 2 +- .../DisableNotificationsExpireCommandForm.php | 4 ++-- .../ToggleInstanceFeaturesCommandForm.php | 4 ++-- .../Object/AcknowledgeProblemCommandForm.php | 2 +- .../Command/Object/AddCommentCommandForm.php | 2 +- .../Command/Object/CheckNowCommandForm.php | 2 +- .../Object/DeleteCommentCommandForm.php | 2 +- .../Object/DeleteDowntimeCommandForm.php | 2 +- .../Command/Object/ObjectsCommandForm.php | 4 ++-- .../RemoveAcknowledgementCommandForm.php | 2 +- .../Object/ScheduleHostCheckCommandForm.php | 2 +- .../ScheduleHostDowntimeCommandForm.php | 2 +- .../ScheduleServiceCheckCommandForm.php | 2 +- .../ScheduleServiceDowntimeCommandForm.php | 2 +- .../ToggleObjectFeaturesCommandForm.php | 2 +- .../forms/Config/BackendConfigForm.php | 2 +- .../Config/Instance/LocalInstanceForm.php | 2 +- .../Config/Instance/RemoteInstanceForm.php | 2 +- .../forms/Config/InstanceConfigForm.php | 6 +++--- .../forms/Config/SecurityConfigForm.php | 2 +- .../application/forms/Setup/BackendPage.php | 2 +- .../forms/Setup/IdoResourcePage.php | 2 +- .../application/forms/Setup/InstancePage.php | 4 ++-- .../forms/Setup/LivestatusResourcePage.php | 2 +- .../application/forms/Setup/SecurityPage.php | 4 ++-- .../application/forms/Setup/WelcomePage.php | 2 +- .../application/forms/StatehistoryForm.php | 2 +- .../library/Monitoring/MonitoringWizard.php | 12 +++++------ .../Controller/MonitoredObjectController.php | 14 ++++++------- 38 files changed, 87 insertions(+), 87 deletions(-) diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php index 6f45a388b..d2615104a 100644 --- a/modules/monitoring/application/controllers/CommandController.php +++ b/modules/monitoring/application/controllers/CommandController.php @@ -5,8 +5,8 @@ use Icinga\Application\Icinga; use Icinga\Application\Config; use Icinga\Application\Logger; -use Icinga\Module\Monitoring\Form\Command\DisableNotificationWithExpireForm; -use Icinga\Module\Monitoring\Form\Command\SingleArgumentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\DisableNotificationWithExpireForm; +use Icinga\Module\Monitoring\Forms\Command\SingleArgumentCommandForm; use Icinga\Web\Form; use Icinga\Web\Url; use Icinga\Web\Notification; @@ -14,14 +14,14 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Protocol\Commandpipe\CommandPipe; use Icinga\Exception\ConfigurationError; use Icinga\Exception\MissingParameterException; -use Icinga\Module\Monitoring\Form\Command\AcknowledgeForm; -use Icinga\Module\Monitoring\Form\Command\CommentForm; -use Icinga\Module\Monitoring\Form\Command\CommandForm; -use Icinga\Module\Monitoring\Form\Command\CustomNotificationForm; -use Icinga\Module\Monitoring\Form\Command\DelayNotificationForm; -use Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm; -use Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm; -use Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm; +use Icinga\Module\Monitoring\Forms\Command\AcknowledgeForm; +use Icinga\Module\Monitoring\Forms\Command\CommentForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CustomNotificationForm; +use Icinga\Module\Monitoring\Forms\Command\DelayNotificationForm; +use Icinga\Module\Monitoring\Forms\Command\RescheduleNextCheckForm; +use Icinga\Module\Monitoring\Forms\Command\ScheduleDowntimeForm; +use Icinga\Module\Monitoring\Forms\Command\SubmitPassiveCheckResultForm; use Icinga\Exception\IcingaException; /** diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index bae10ed17..1e961d26e 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -6,9 +6,9 @@ use Icinga\Web\Notification; use Icinga\Data\ResourceFactory; use Icinga\Forms\ConfirmRemovalForm; use Icinga\Web\Controller\ModuleActionController; -use Icinga\Module\Monitoring\Form\Config\BackendConfigForm; -use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; -use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm; +use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm; +use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm; +use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm; /** * Configuration controller for editing monitoring resources diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php index f77d11deb..0a4a727ed 100644 --- a/modules/monitoring/application/controllers/HostController.php +++ b/modules/monitoring/application/controllers/HostController.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController; diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index d34a8ba2f..fe34c1d6f 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -4,12 +4,12 @@ use Icinga\Data\Filter\Filter; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\HostList; diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 15b90079e..c25bf5047 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -4,8 +4,8 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Backend; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm; use Icinga\Web\Url; use Icinga\Web\Hook; use Icinga\Web\Widget\Tabextension\DashboardAction; @@ -17,8 +17,8 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid; use Icinga\Data\Filter\Filter; use Icinga\Web\Widget; use Icinga\Module\Monitoring\Web\Widget\SelectBox; -use Icinga\Module\Monitoring\Form\StatehistoryForm; -use Icinga\Module\Monitoring\Form\EventOverviewForm; +use Icinga\Module\Monitoring\Forms\StatehistoryForm; +use Icinga\Module\Monitoring\Forms\EventOverviewForm; class Monitoring_ListController extends Controller { diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php index 52dfcf07f..52d927ffb 100644 --- a/modules/monitoring/application/controllers/MultiController.php +++ b/modules/monitoring/application/controllers/MultiController.php @@ -4,7 +4,7 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Web\Widget\Chart\InlinePie; -use Icinga\Module\Monitoring\Form\Command\MultiCommandFlagForm; +use Icinga\Module\Monitoring\Forms\Command\MultiCommandFlagForm; use Icinga\Web\Widget; use Icinga\Data\Filter\Filter; diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php index 98cba000f..e843d8ecd 100644 --- a/modules/monitoring/application/controllers/ProcessController.php +++ b/modules/monitoring/application/controllers/ProcessController.php @@ -3,8 +3,8 @@ // {{{ICINGA_LICENSE_HEADER}}} use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Instance\DisableNotificationsExpireCommandForm; -use Icinga\Module\Monitoring\Form\Command\Instance\ToggleInstanceFeaturesCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Instance\ToggleInstanceFeaturesCommandForm; /** * Display process and performance information of the monitoring host and program-wide commands diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php index ea29aa54a..c6d0e4e2f 100644 --- a/modules/monitoring/application/controllers/ServiceController.php +++ b/modules/monitoring/application/controllers/ServiceController.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController; diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php index 11b983d45..d4b0cef4d 100644 --- a/modules/monitoring/application/controllers/ServicesController.php +++ b/modules/monitoring/application/controllers/ServicesController.php @@ -4,12 +4,12 @@ use Icinga\Data\Filter\Filter; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\ServiceList; diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php index da797e60c..807e1e6ca 100644 --- a/modules/monitoring/application/forms/Command/CommandForm.php +++ b/modules/monitoring/application/forms/Command/CommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command; +namespace Icinga\Module\Monitoring\Forms\Command; use Icinga\Module\Monitoring\Backend\MonitoringBackend; use Icinga\Module\Monitoring\Command\Transport\CommandTransport; diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php index 0bbfbe4f8..2cb1b83ba 100644 --- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php +++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php @@ -2,12 +2,12 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Instance; +namespace Icinga\Module\Monitoring\Forms\Command\Instance; use DateTime; use DateInterval; use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php index 883a11a35..ed2d7e719 100644 --- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php +++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Instance; +namespace Icinga\Module\Monitoring\Forms\Command\Instance; use Icinga\Module\Monitoring\Command\Instance\ToggleInstanceFeatureCommand; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php index 7bdfbd8cc..34ac138b1 100644 --- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php index a89353d52..70b216da6 100644 --- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\AddCommentCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php index c8c3caac5..b8f708de0 100644 --- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand; diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php index 4c7df0141..d0edef274 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php index ae712eddb..3dced5072 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php index bf603a7b5..1dbf07840 100644 --- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php @@ -2,9 +2,9 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Module\Monitoring\Object\MonitoredObject; /** diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php index 6ccd0633d..41cde9b43 100644 --- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php index 89d39716c..4e2bd62a9 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php index 25caa0f20..db4262f68 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php index dd0ad9f3e..5641557d6 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php index a7d5f028b..93a45c5c4 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php index 8e5e5408c..ebaad32c8 100644 --- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ToggleObjectFeatureCommand; use Icinga\Module\Monitoring\Object\MonitoredObject; diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index 237542d74..e3c68fc67 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use InvalidArgumentException; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php index 029da3d35..ac1139268 100644 --- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config\Instance; +namespace Icinga\Module\Monitoring\Forms\Config\Instance; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php index e2d6840eb..c93436ab2 100644 --- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config\Instance; +namespace Icinga\Module\Monitoring\Forms\Config\Instance; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php index fcfbabd82..8515c522e 100644 --- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php +++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php @@ -2,15 +2,15 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use InvalidArgumentException; use Icinga\Exception\ConfigurationError; use Icinga\Forms\ConfigForm; use Icinga\Module\Monitoring\Command\Transport\LocalCommandFile; use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile; -use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm; -use Icinga\Module\Monitoring\Form\Config\Instance\RemoteInstanceForm; +use Icinga\Module\Monitoring\Forms\Config\Instance\LocalInstanceForm; +use Icinga\Module\Monitoring\Forms\Config\Instance\RemoteInstanceForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php index 14911bbd4..4d8230bfd 100644 --- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php +++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use Icinga\Web\Request; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php index c5506111c..4bee056ca 100644 --- a/modules/monitoring/application/forms/Setup/BackendPage.php +++ b/modules/monitoring/application/forms/Setup/BackendPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Application\Platform; diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php index 7c839e8d2..189d65fea 100644 --- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php +++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Forms\Config\Resource\DbResourceForm; diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php index af1b6df61..dccfd1d91 100644 --- a/modules/monitoring/application/forms/Setup/InstancePage.php +++ b/modules/monitoring/application/forms/Setup/InstancePage.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; -use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; +use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm; class InstancePage extends Form { diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php index 884760eb1..4faa17416 100644 --- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php +++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Forms\Config\Resource\LivestatusResourceForm; diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php index 42eed4d70..0c7d3d1de 100644 --- a/modules/monitoring/application/forms/Setup/SecurityPage.php +++ b/modules/monitoring/application/forms/Setup/SecurityPage.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; -use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm; +use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm; class SecurityPage extends Form { diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php index c329c71aa..d910e2e01 100644 --- a/modules/monitoring/application/forms/Setup/WelcomePage.php +++ b/modules/monitoring/application/forms/Setup/WelcomePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php index 3008724c3..9fa1bdc26 100644 --- a/modules/monitoring/application/forms/StatehistoryForm.php +++ b/modules/monitoring/application/forms/StatehistoryForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form; +namespace Icinga\Module\Monitoring\Forms; use \Zend_Form; use Icinga\Web\Form; diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php index 1baac1787..0ac4c7f63 100644 --- a/modules/monitoring/library/Monitoring/MonitoringWizard.php +++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php @@ -13,12 +13,12 @@ use Icinga\Module\Setup\Requirements; use Icinga\Module\Setup\Utils\MakeDirStep; use Icinga\Module\Setup\Utils\EnableModuleStep; use Icinga\Module\Setup\Forms\SummaryPage; -use Icinga\Module\Monitoring\Form\Setup\WelcomePage; -use Icinga\Module\Monitoring\Form\Setup\BackendPage; -use Icinga\Module\Monitoring\Form\Setup\InstancePage; -use Icinga\Module\Monitoring\Form\Setup\SecurityPage; -use Icinga\Module\Monitoring\Form\Setup\IdoResourcePage; -use Icinga\Module\Monitoring\Form\Setup\LivestatusResourcePage; +use Icinga\Module\Monitoring\Forms\Setup\WelcomePage; +use Icinga\Module\Monitoring\Forms\Setup\BackendPage; +use Icinga\Module\Monitoring\Forms\Setup\InstancePage; +use Icinga\Module\Monitoring\Forms\Setup\SecurityPage; +use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage; +use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage; /** * Monitoring Module Setup Wizard diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 856496ca8..380b1d277 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -5,13 +5,13 @@ namespace Icinga\Module\Monitoring\Web\Controller; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ToggleObjectFeaturesCommandForm; use Icinga\Web\Hook; use Icinga\Web\Url; use Icinga\Web\Widget\Tabextension\DashboardAction;