diff options
| author | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
| commit | f14c04f3af8936f07d0efaa292ce0ea92981b1f6 (patch) | |
| tree | e1275d80fdced4f0b3d652277863150f756785a3 /inc | |
| parent | [serversetup-bwlp] Simplify permissions (diff) | |
| parent | [dozmod] ldapfilters: Fix list (attr/value) (diff) | |
| download | slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.gz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.xz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.zip | |
Merge branch 'master' into ipxe
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/user.inc.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/inc/user.inc.php b/inc/user.inc.php index 2571c61c..20e8cd3d 100644 --- a/inc/user.inc.php +++ b/inc/user.inc.php @@ -34,8 +34,15 @@ class User if ($permission{0} === '.') { $permission = substr($permission, 1); } else { - $module = Page::getModule(); - $permission = $module ? $module->getIdentifier() . "." . $permission : $permission; + if (class_exists('Page')) { + $module = Page::getModule(); + if ($module !== false) { + $module = $module->getIdentifier(); + } + } else { + $module = strtolower(Request::any('do')); + } + $permission = $module ? $module . "." . $permission : $permission; } return PermissionUtil::userHasPermission(self::$user['userid'], $permission, $locationid); } |