From fc28088dc0d136f4f13c003467bf5fa6982aa748 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:09:54 +0200 Subject: [PATCH 01/12] monitoring: Remove deprecated method ListController::applyRestriction() --- .../application/controllers/ListController.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index d26cc0c52..affef2e40 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -24,24 +24,6 @@ class Monitoring_ListController extends Controller $this->createTabs(); } - /** - * @deprecated DO NOT USE. THIS IS A HACK. This is removed once we fix the eventhistory action w/ filters. - */ - protected function applyFilter($query) - { - $params = clone $this->params; - $params->shift('format'); - $params->shift('limit'); - $params->shift('page'); - $params->shift('view'); - if ($sort = $params->shift('sort')) { - $query->order($sort, $params->shift('dir')); - } - $query->applyFilter(Filter::fromQuerystring((string) $params)); - $this->handleFormatRequest($query); - return $query; - } - /** * Overwrite the backend to use (used for testing) * From 67bbc3ed6a5572ee06a925158c75648eeaefb500 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:11:50 +0200 Subject: [PATCH 02/12] monitoring: Apply restriction on hosts before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index affef2e40..46dd38fcb 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -73,8 +73,8 @@ class Monitoring_ListController extends Controller 'host_current_check_attempt', 'host_max_check_attempts' ), $this->addColumns())); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->view->hosts = $query; $stats = $this->backend->select()->from('hoststatussummary', array( 'hosts_total', From 4aa0af5dcaa5b0d5e440adcbe825b403bd04c523 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:15:32 +0200 Subject: [PATCH 03/12] monitoring: Apply restriction on services before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 46dd38fcb..aaf0265fa 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -159,8 +159,8 @@ class Monitoring_ListController extends Controller 'max_check_attempts' => 'service_max_check_attempts' ), $this->addColumns()); $query = $this->backend->select()->from('servicestatus', $columns); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->view->services = $query; $this->setupLimitControl(); From 5d325f318229c9ade82727b0d766d88492bb8e91 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:16:02 +0200 Subject: [PATCH 04/12] monitoring: Apply restriction on downtimes before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index aaf0265fa..41651d880 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -224,9 +224,8 @@ class Monitoring_ListController extends Controller 'host_display_name', 'service_display_name' )); - $this->filterQuery($query); - $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->view->downtimes = $query; From d463a86304ac7e428dc29e5f9150a6cc7dd9ebd9 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:16:53 +0200 Subject: [PATCH 05/12] monitoring: Apply restriction on notifications before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 41651d880..8508261d1 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -272,8 +272,8 @@ class Monitoring_ListController extends Controller 'host_display_name', 'service_display_name' )); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->view->notifications = $query; $this->setupLimitControl(); From 959cff4d100a873ea3eab56c966b590ddb126cc7 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:17:44 +0200 Subject: [PATCH 06/12] monitoring: Apply restriction on contacts before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 8508261d1..2c3f19d28 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -295,8 +295,8 @@ class Monitoring_ListController extends Controller 'contact_notify_service_timeperiod', 'contact_notify_host_timeperiod' )); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->view->contacts = $query; $this->setupLimitControl(); From e58c0a8e427115b4a8e6e56fd7efe13fc13a9eec Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:18:30 +0200 Subject: [PATCH 07/12] monitoring: Apply restriction on contact groups before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 2c3f19d28..3abd50193 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -367,8 +367,8 @@ class Monitoring_ListController extends Controller 'contact_email', 'contact_pager' )); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->setupSortControl(array( 'contactgroup_name' => $this->translate('Contactgroup Name'), From 9dd13d2a82b105fca54811aa96c5c1f201c68b8b Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:19:00 +0200 Subject: [PATCH 08/12] monitoring: Apply restriction on comments before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 3abd50193..0863d40e9 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -411,10 +411,8 @@ class Monitoring_ListController extends Controller 'host_display_name', 'service_display_name' )); - $this->filterQuery($query); - $this->applyRestriction('monitoring/filter/objects', $query); - + $this->filterQuery($query): $this->view->comments = $query; $this->setupLimitControl(); From 3dc140b125dc0b9b4d986d269c33a3dfa3491cac Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:19:31 +0200 Subject: [PATCH 09/12] monitoring: Apply restriction on service groups before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 0863d40e9..2ee41c0f9 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -464,10 +464,8 @@ class Monitoring_ListController extends Controller 'services_warning_last_state_change_unhandled' => 'services_warning_unhandled_last_state_change', 'services_warning_unhandled' )); - $this->filterQuery($query); - $this->applyRestriction('monitoring/filter/objects', $query); - + $this->filterQuery($query); $this->view->servicegroups = $query; $this->setupLimitControl(); From 4c68b4a0177f01f6737812f5f1b7366d68b3025a Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:19:56 +0200 Subject: [PATCH 10/12] monitoring: Apply restriction on host groups before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 2ee41c0f9..e6add2f4a 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -508,10 +508,8 @@ class Monitoring_ListController extends Controller 'services_warning_handled', 'services_warning_unhandled' )); - $this->filterQuery($query); - $this->applyRestriction('monitoring/filter/objects', $query); - + $this->filterQuery($query); $this->view->hostgroups = $query; $this->setupLimitControl(); From de00a1998e450207cc99e1cb75f01f5b627887a8 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:20:56 +0200 Subject: [PATCH 11/12] monitoring: Apply restriction on the service grid before calling filterQuery which also handles format refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index e6add2f4a..d5dc930f5 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -564,8 +564,8 @@ class Monitoring_ListController extends Controller 'service_output', 'service_handled' )); - $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); + $this->filterQuery($query); $this->setupSortControl(array( 'host_name' => $this->translate('Hostname'), 'service_description' => $this->translate('Service description') From b08715f70eea15a8ce80f34a9775634131008d3a Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 21 Aug 2015 11:21:52 +0200 Subject: [PATCH 12/12] monitoring: Fix typo in ListController refs #9965 --- modules/monitoring/application/controllers/ListController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index d5dc930f5..44172f1ea 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -412,7 +412,7 @@ class Monitoring_ListController extends Controller 'service_display_name' )); $this->applyRestriction('monitoring/filter/objects', $query); - $this->filterQuery($query): + $this->filterQuery($query); $this->view->comments = $query; $this->setupLimitControl();