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

Fix module permissions for hooks 

(cherry picked from commit 21b75e624e)

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
lippserd 2017-01-18 09:07:09 +01:00 committed by Eric Lippmann
parent 6970b79fd7
commit eca2dd7b9f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Application/Hook.php
View File

@ -263,7 +263,7 @@ class Hook
} }
foreach (self::$hooks[$name] as $key => $hook) { foreach (self::$hooks[$name] as $key => $hook) {
if (self::hasPermission($key)) { if (self::hasPermission($hook)) {
if (self::createInstance($name, $key) === null) { if (self::createInstance($name, $key) === null) {
return array(); return array();
} }
@ -286,7 +286,7 @@ class Hook
if (self::has($name)) { if (self::has($name)) {
foreach (self::$hooks[$name] as $key => $hook) { foreach (self::$hooks[$name] as $key => $hook) {
if (self::hasPermission($key)) { if (self::hasPermission($hook)) {
return self::createInstance($name, $key); return self::createInstance($name, $key);
} }
} }
@ -309,6 +309,8 @@ class Hook
self::$hooks[$name] = array(); self::$hooks[$name] = array();
} }
$class = ltrim($class, ClassLoader::NAMESPACE_SEPARATOR);
self::$hooks[$name][$key] = $class; self::$hooks[$name][$key] = $class;
} }
} }