From 442f956945181e0bc92bc26ed744ffe315b5101c Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 12 Sep 2014 15:03:03 +0200 Subject: [PATCH] monitoring/commands: Fix object command forms code compliance refs #6593 --- .../Object/AcknowledgeProblemCommandForm.php | 16 +++++++-------- .../Command/Object/AddCommentCommandForm.php | 6 +++--- .../Command/Object/CheckNowCommandForm.php | 17 +++++----------- .../ScheduleServiceCheckCommandForm.php | 4 ++-- .../ScheduleServiceDowntimeCommandForm.php | 20 +++++++++---------- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php index 8da595a0d..a9c1549af 100644 --- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php @@ -39,8 +39,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'value' => mt( 'monitoring', 'This command is used to acknowledge host or service problems. When a problem is acknowledged,' - . ' future notifications about problems are temporarily disabled until the host or service' - . ' recovers.' + . ' future notifications about problems are temporarily disabled until the host or service' + . ' recovers.' ) ) ), @@ -53,8 +53,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you work with other administrators, you may find it useful to share information about the' - . ' the host or service that is having problems. Make sure you enter a brief description of' - . ' what you are doing.' + . ' the host or service that is having problems. Make sure you enter a brief description of' + . ' what you are doing.' ) ) ), @@ -66,7 +66,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you would like the comment to remain even when the acknowledgement is removed, check this' - . ' option.' + . ' option.' ) ) ), @@ -92,7 +92,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'Enter the expire date and time for this acknowledgement here. Icinga will delete the' - . ' acknowledgement after this time expired.' + . ' acknowledgement after this time expired.' ) ) ) @@ -118,7 +118,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you want the acknowledgement to disable notifications until the host or service recovers,' - . 'check this option.' + . 'check this option.' ) ) ), @@ -131,7 +131,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,' - . 'uncheck this option.' + . 'uncheck this option.' ) ) ) diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php index 777d96868..1183070fc 100644 --- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php @@ -48,8 +48,8 @@ class AddCommentCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you work with other administrators, you may find it useful to share information about the' - . ' the host or service that is having problems. Make sure you enter a brief description of' - . ' what you are doing.' + . ' the host or service that is having problems. Make sure you enter a brief description of' + . ' what you are doing.' ) ) ), @@ -62,7 +62,7 @@ class AddCommentCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you uncheck this option, the comment will automatically be deleted the next time Icinga is' - . ' restarted.' + . ' restarted.' ) ) ) diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php index 65ef67ff5..ade78402c 100644 --- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php @@ -34,15 +34,10 @@ class CheckNowCommandForm extends ObjectsCommandForm 'note', 'icon', array( - 'decorators' => array( - array( - 'HtmlTag', - array( - 'tag' => 'img', - 'src' => $this->getView()->href('img/icons/refresh_petrol.png'), - ) - ) - ) + 'decorators' => array(array( + 'HtmlTag', + array('tag' => 'img', 'src' => $this->getView()->href('img/icons/refresh_petrol.png')) + )) ) ), array( @@ -51,9 +46,7 @@ class CheckNowCommandForm extends ObjectsCommandForm array( 'ignore' => true, 'label' => mt('monitoring', 'Check Now'), - 'decorators' => array( - 'ViewHelper' - ) + 'decorators' => array('ViewHelper') ) ) )); diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php index a93fcf4ae..477fb1733 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php @@ -41,7 +41,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm 'value' => mt( 'monitoring', 'This command is used to schedule the next check of hosts or services. Icinga will re-queue the' - . ' hosts or services to be checked at the time you specify.' + . ' hosts or services to be checked at the time you specify.' ) ) ), @@ -62,7 +62,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you select this option, Icinga will force a check regardless of both what time the' - . 'scheduled check occurs and whether or not checks are enabled.' + . 'scheduled check occurs and whether or not checks are enabled.' ) ) ) diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php index 76d36d214..b5d153dd5 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php @@ -53,10 +53,10 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm 'value' => mt( 'monitoring', 'This command is used to schedule host and service downtimes. During the specified downtime,' - . ' Icinga will not send notifications out about the hosts and services. When the scheduled' - . ' downtime expires, Icinga will send out notifications for the hosts and services as it' - . ' normally would. Scheduled downtimes are preserved across program shutdowns and' - . ' restarts.' + . ' Icinga will not send notifications out about the hosts and services. When the scheduled' + . ' downtime expires, Icinga will send out notifications for the hosts and services as it' + . ' normally would. Scheduled downtimes are preserved across program shutdowns and' + . ' restarts.' ) ) ), @@ -69,8 +69,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you work with other administrators, you may find it useful to share information about the' - . ' the host or service that is having problems. Make sure you enter a brief description of' - . ' what you are doing.' + . ' the host or service that is having problems. Make sure you enter a brief description of' + . ' what you are doing.' ) ) ), @@ -102,9 +102,9 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'If you select the fixed option, the downtime will be in effect between the start and end' - . ' times you specify whereas a flexible downtime starts when the host or service enters a' - . ' problem state sometime between the start and end times you specified and lasts as long' - . ' as the duration time you enter. The duration fields do not apply for fixed downtimes.' + . ' times you specify whereas a flexible downtime starts when the host or service enters a' + . ' problem state sometime between the start and end times you specified and lasts as long' + . ' as the duration time you enter. The duration fields do not apply for fixed downtimes.' ), 'multiOptions' => array( self::FIXED => mt('monitoring', 'Fixed'), @@ -159,7 +159,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm 'description' => mt( 'monitoring', 'Enter here the duration of the downtime. The downtime will be automatically deleted after this' - . ' time expired.' + . ' time expired.' ), 'decorators' => array( 'FormElements',