From b36b44702316e23d8831a535a12d146c9dde05bc Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 11:33:33 +0200 Subject: [PATCH 01/10] Use Controller::httpNotFound() in applicationlog/list refs #9449 --- application/controllers/ListController.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 5e937d91b..9a20755c9 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -1,15 +1,14 @@ httpNotFound('Page not found'); } $this->addTitleTab('application log'); From d40c3f0a29554c90f6c968081cf3bc75d68dc3cc Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 11:49:18 +0200 Subject: [PATCH 02/10] Remove unnecessary use in FormTriStateCheckbox refs #9449 --- application/views/helpers/FormTriStateCheckbox.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php index 61089cc51..293da78d8 100644 --- a/application/views/helpers/FormTriStateCheckbox.php +++ b/application/views/helpers/FormTriStateCheckbox.php @@ -1,8 +1,6 @@ Date: Tue, 28 Jul 2015 11:54:00 +0200 Subject: [PATCH 03/10] doc: Remove unnecessary use in IcingawebController refs #9449 --- modules/doc/application/controllers/IcingawebController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php index 31819239a..8af8b97ff 100644 --- a/modules/doc/application/controllers/IcingawebController.php +++ b/modules/doc/application/controllers/IcingawebController.php @@ -1,7 +1,6 @@ translate('Documentation for Icinga Web 2 is not available'), - 404 - ); + $this->httpNotFound($this->translate('Documentation for Icinga Web 2 is not available')); } /** From b3f463a7a50955f93d5d78e00b244abfe0a38ff7 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 11:54:55 +0200 Subject: [PATCH 04/10] doc: Remove unnecessary use in ModuleController refs #9449 --- modules/doc/application/controllers/ModuleController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php index eb9f4dcf1..753da45cc 100644 --- a/modules/doc/application/controllers/ModuleController.php +++ b/modules/doc/application/controllers/ModuleController.php @@ -1,7 +1,6 @@ Date: Tue, 28 Jul 2015 11:55:27 +0200 Subject: [PATCH 05/10] doc: Remove unnecessary use in SearchController refs #9449 --- modules/doc/application/controllers/SearchController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php index 5df4ffeb3..e896c31f6 100644 --- a/modules/doc/application/controllers/SearchController.php +++ b/modules/doc/application/controllers/SearchController.php @@ -1,7 +1,6 @@ Date: Tue, 28 Jul 2015 11:56:48 +0200 Subject: [PATCH 06/10] monitoring: Remove unnecessary use w/ backlash in DeleteCommentsCommandForm refs #9449 --- .../forms/Command/Object/DeleteCommentsCommandForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php index 805002922..1a51431f3 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand; -use \Icinga\Module\Monitoring\Forms\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; /** From 9bd31f70e23c11b840f3e94904a4f77b5cdc890d Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 12:44:27 +0200 Subject: [PATCH 07/10] monitoring: Remove unnecessary use w/ backlash in DeleteDowntimeCommandForm refs #9449 --- .../forms/Command/Object/DeleteDowntimeCommandForm.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php index 31ec778fa..395f90ad4 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand; -use \Icinga\Module\Monitoring\Forms\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; /** @@ -20,7 +20,7 @@ class DeleteDowntimeCommandForm extends CommandForm { $this->setAttrib('class', 'inline'); } - + /** * (non-PHPDoc) * @see \Icinga\Web\Form::createElements() For the method documentation. @@ -57,7 +57,7 @@ class DeleteDowntimeCommandForm extends CommandForm ); return $this; } - + /** * (non-PHPDoc) * @see \Icinga\Web\Form::addSubmitButton() For the method documentation. @@ -79,7 +79,7 @@ class DeleteDowntimeCommandForm extends CommandForm ); return $this; } - + /** * (non-PHPDoc) * @see \Icinga\Web\Form::onSuccess() For the method documentation. @@ -90,7 +90,7 @@ class DeleteDowntimeCommandForm extends CommandForm $cmd->setDowntimeId($this->getElement('downtime_id')->getValue()); $cmd->setIsService($this->getElement('downtime_is_service')->getValue()); $this->getTransport($this->request)->send($cmd); - + $redirect = $this->getElement('redirect')->getValue(); if (! empty($redirect)) { $this->setRedirectUrl($redirect); From 0a01eb66b1f42a334ff4c1baa71d7847e2877618 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 13:34:39 +0200 Subject: [PATCH 08/10] monitoring: Remove unnecessary use w/ backslash in DeleteDowntimesCommandForm refs #9449 --- .../Command/Object/DeleteDowntimesCommandForm.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php index 4a19cac96..3d13866ec 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand; -use \Icinga\Module\Monitoring\Forms\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; /** @@ -18,7 +18,7 @@ class DeleteDowntimesCommandForm extends CommandForm * @var array */ protected $downtimes; - + /** * (non-PHPDoc) * @see \Zend_Form::init() For the method documentation. @@ -43,7 +43,7 @@ class DeleteDowntimesCommandForm extends CommandForm )); return $this; } - + /** * (non-PHPDoc) * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation. @@ -52,7 +52,7 @@ class DeleteDowntimesCommandForm extends CommandForm { return $this->translatePlural('Remove', 'Remove All', count($this->downtimes)); } - + /** * (non-PHPDoc) * @see \Icinga\Web\Form::onSuccess() For the method documentation. @@ -72,7 +72,7 @@ class DeleteDowntimesCommandForm extends CommandForm Notification::success($this->translate('Deleting downtime.')); return true; } - + /** * Set the downtimes to be deleted upon success * From 7df1b3aa0f626ba6cd4ab3c1a8f7b8f80f151b30 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 13:35:52 +0200 Subject: [PATCH 09/10] monitoring: Fix use statements in EventOverviewForm refs #9449 --- modules/monitoring/application/forms/EventOverviewForm.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php index bb230232f..b835b77e0 100644 --- a/modules/monitoring/application/forms/EventOverviewForm.php +++ b/modules/monitoring/application/forms/EventOverviewForm.php @@ -3,9 +3,7 @@ namespace Icinga\Module\Monitoring\Forms; -use Icinga\Data\Filter\FilterNot; use Icinga\Web\Url; -use \Zend_Form; use Icinga\Web\Form; use Icinga\Data\Filter\Filter; @@ -15,7 +13,7 @@ use Icinga\Data\Filter\Filter; class EventOverviewForm extends Form { /** - * Initialize this form + * {@inheritdoc} */ public function init() { @@ -28,7 +26,7 @@ class EventOverviewForm extends Form } /** - * @see Form::createElements() + * {@inheritdoc} */ public function createElements(array $formData) { From a8765bc4ea866690632586ed1cfd727b67313dae Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 28 Jul 2015 13:36:51 +0200 Subject: [PATCH 10/10] monitoring: Remove unnecessary use in StatehistoryForm refs #9449 --- modules/monitoring/application/forms/StatehistoryForm.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php index 730e3f43b..f6c148d8c 100644 --- a/modules/monitoring/application/forms/StatehistoryForm.php +++ b/modules/monitoring/application/forms/StatehistoryForm.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Monitoring\Forms; -use \Zend_Form; use Icinga\Web\Form; use Icinga\Data\Filter\Filter; @@ -13,7 +12,7 @@ use Icinga\Data\Filter\Filter; class StatehistoryForm extends Form { /** - * Initialize this form + * {@inheritdoc} */ public function init() { @@ -56,7 +55,7 @@ class StatehistoryForm extends Form } /** - * @see Form::createElements() + * {@inheritdoc} */ public function createElements(array $formData) {