tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backend: Remove unnecessary calls to isAvailable()

This commit is contained in:
Sukhwinder Dhillon 2023-11-17 16:16:27 +01:00
parent eeaf87741a
commit db7181c29e
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/HostController.php
View File

@ -568,7 +568,6 @@ class HostController extends ObjectController
try {
$backend = $this->backend();
if ($host instanceof IcingaHost
&& $backend->isAvailable()
&& $host->isObject()
&& $backend->hasHost($host->getObjectName())
) {

3
library/Director/ProvidedHook/Icingadb/HostActions.php
View File

@ -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);
}
}

5
library/Director/ProvidedHook/Icingadb/ServiceActions.php
View File

@ -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')) {