tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make hooks respect module permissions"

Browse Source 
This reverts commit 4d2e6d2d8709da9168af824c36458dd5857b08a8.
This commit is contained in:
Alexander A. Klimov 2016-10-20 18:28:19 +02:00 committed by Johannes Meyer
parent 4d2e6d2d87
commit 1cd2cfbdc9
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/Icinga/Application/Modules/Module.php
View File

@ -4,7 +4,6 @@
namespace Icinga\Application\Modules; namespace Icinga\Application\Modules;
use Exception; use Exception;
use Icinga\Authentication\Auth;
use Zend_Controller_Router_Route; use Zend_Controller_Router_Route;
use Zend_Controller_Router_Route_Abstract; use Zend_Controller_Router_Route_Abstract;
use Zend_Controller_Router_Route_Regex; use Zend_Controller_Router_Route_Regex;
@ -1283,22 +1282,19 @@ class Module
*/ */
protected function provideHook($name, $implementation = null, $key = null) protected function provideHook($name, $implementation = null, $key = null)
{ {
if (Auth::getInstance()->hasPermission('module/' . $this->name)) { if ($implementation === null) {
if ($implementation === null) { $implementation = $name;
$implementation = $name;
}
if (strpos($implementation, '\\') === false) {
$class = $this->getNamespace()
. '\\ProvidedHook\\'
. $this->slashesToNamespace($implementation);
} else {
$class = $implementation;
}
Hook::register($name, $class, $class);
} }
if (strpos($implementation, '\\') === false) {
$class = $this->getNamespace()
. '\\ProvidedHook\\'
. $this->slashesToNamespace($implementation);
} else {
$class = $implementation;
}
Hook::register($name, $class, $class);
return $this; return $this;
} }