Show modify action links only with corresponding monitoring and Icinga DB permission

Author: raviks789

library/Director/ProvidedHook/Icingadb/HostActions.php

@@ -47,10 +47,12 @@ protected function getThem(Host $host): array
         if (Util::hasPermission(Permission::HOSTS) && IcingaHost::exists($hostname, $db)) {
             $allowEdit = true;
         }
-        if (Util::hasPermission(Permission::ICINGADB_HOSTS)) {
-            if ((new IcingadbBackend())->canModifyHost($hostname)) {
-                $allowEdit = IcingaHost::exists($hostname, $db);
-            }
+        if (
+            Util::hasPermission(Permission::HOSTS)
+            && Util::hasPermission(Permission::ICINGADB_HOSTS)
+            && (new IcingadbBackend())->canModifyHost($hostname)
+        ) {
+            $allowEdit = IcingaHost::exists($hostname, $db);
         }
 
         if ($allowEdit) {

library/Director/ProvidedHook/Icingadb/ServiceActions.php

@@ -52,12 +52,12 @@ protected function getThem(Service $service)
         }
 
         $title = null;
-        if (Util::hasPermission(Permission::HOSTS)) {
+        if (
+            Util::hasPermission(Permission::SERVICES)
+            && Util::hasPermission(Permission::ICINGADB_SERVICES)
+            && (new IcingadbBackend())->canModifyService($hostname, $serviceName)
+        ) {
             $title = mt('director', 'Modify');
-        } elseif (Util::hasPermission(Permission::ICINGADB_SERVICES)) {
-            if ((new IcingadbBackend())->canModifyService($hostname, $serviceName)) {
-                $title = mt('director', 'Modify');
-            }
         } elseif (Util::hasPermission(Permission::ICINGADB_SERVICES_RO)) {
             $title = mt('director', 'Configuration');
         }

library/Director/ProvidedHook/Monitoring/HostActions.php

@@ -41,13 +41,12 @@ protected function getThem(Host $host)
         }
 
         $allowEdit = false;
-        if (Util::hasPermission(Permission::HOSTS) && IcingaHost::exists($hostname, $db)) {
-            $allowEdit = true;
-        }
-        if (Util::hasPermission(Permission::MONITORING_HOSTS)) {
-            if ((new Monitoring(Auth::getInstance()))->canModifyHost($hostname)) {
-                $allowEdit = IcingaHost::exists($hostname, $db);
-            }
+        if (
+            Util::hasPermission(Permission::HOSTS)
+            && Util::hasPermission(Permission::MONITORING_HOSTS)
+            && (new Monitoring(Auth::getInstance()))->canModifyHost($hostname)
+        ) {
+            $allowEdit = IcingaHost::exists($hostname, $db);
         }
 
         if ($allowEdit) {

library/Director/ProvidedHook/Monitoring/ServiceActions.php

@@ -53,12 +53,12 @@ protected function getThem(Service $service)
         }
 
         $title = null;
-        if (Util::hasPermission(Permission::HOSTS)) {
+        if (
+            Util::hasPermission(Permission::SERVICES)
+            && Util::hasPermission(Permission::MONITORING_SERVICES)
+            && (new Monitoring(Auth::getInstance()))->canModifyService($hostname, $serviceName)
+        ) {
             $title = mt('director', 'Modify');
-        } elseif (Util::hasPermission(Permission::MONITORING_SERVICES)) {
-            if ((new Monitoring(Auth::getInstance()))->canModifyService($hostname, $serviceName)) {
-                $title = mt('director', 'Modify');
-            }
         } elseif (Util::hasPermission(Permission::MONITORING_SERVICES_RO)) {
             $title = mt('director', 'Configuration');
         }