From db7181c29e9715202b3b20d78ea676a86dda91f0 Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Fri, 17 Nov 2023 16:16:27 +0100 Subject: [PATCH] Backend: Remove unnecessary calls to isAvailable() --- application/controllers/HostController.php | 1 - library/Director/ProvidedHook/Icingadb/HostActions.php | 3 +-- library/Director/ProvidedHook/Icingadb/ServiceActions.php | 5 +---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php index cce491e2..da873a61 100644 --- a/application/controllers/HostController.php +++ b/application/controllers/HostController.php @@ -568,7 +568,6 @@ class HostController extends ObjectController try { $backend = $this->backend(); if ($host instanceof IcingaHost - && $backend->isAvailable() && $host->isObject() && $backend->hasHost($host->getObjectName()) ) { diff --git a/library/Director/ProvidedHook/Icingadb/HostActions.php b/library/Director/ProvidedHook/Icingadb/HostActions.php index 4fa636c0..f69f24c6 100644 --- a/library/Director/ProvidedHook/Icingadb/HostActions.php +++ b/library/Director/ProvidedHook/Icingadb/HostActions.php @@ -44,8 +44,7 @@ class HostActions extends HostActionsHook $allowEdit = true; } if (Util::hasPermission('director/monitoring/hosts')) { - $backend = new IcingadbBackend(); - if ($backend->isAvailable() && $backend->canModifyHost($hostname)) { + if ((new IcingadbBackend())->canModifyHost($hostname)) { $allowEdit = IcingaHost::exists($hostname, $db); } } diff --git a/library/Director/ProvidedHook/Icingadb/ServiceActions.php b/library/Director/ProvidedHook/Icingadb/ServiceActions.php index 23f3fab9..337754e9 100644 --- a/library/Director/ProvidedHook/Icingadb/ServiceActions.php +++ b/library/Director/ProvidedHook/Icingadb/ServiceActions.php @@ -56,10 +56,7 @@ class ServiceActions extends ServiceActionsHook if (Util::hasPermission('director/hosts')) { $title = mt('director', 'Modify'); } elseif (Util::hasPermission('director/monitoring/services')) { - $backend = new IcingadbBackend(); - if ($backend->isAvailable() - && $backend->canModifyService($hostname, $serviceName) - ) { + if ((new IcingadbBackend())->canModifyService($hostname, $serviceName)) { $title = mt('director', 'Modify'); } } elseif (Util::hasPermission('director/monitoring/services-ro')) {