diff options
| author | Udo Walter | 2017-04-10 19:53:28 +0200 |
|---|---|---|
| committer | Udo Walter | 2017-04-10 19:53:28 +0200 |
| commit | 12fec381898ce5c1d5bef7a9b6bf3fcca36addf4 (patch) | |
| tree | 9c3b47ee1c3c390d7654f984c125c39cb96ffe7e /inc | |
| parent | [permission-manager] moved multiple code, added text-search to rolesTable (diff) | |
| download | slx-admin-12fec381898ce5c1d5bef7a9b6bf3fcca36addf4.tar.gz slx-admin-12fec381898ce5c1d5bef7a9b6bf3fcca36addf4.tar.xz slx-admin-12fec381898ce5c1d5bef7a9b6bf3fcca36addf4.zip | |
[permissionmanager] changed description to tooltips
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/user.inc.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/inc/user.inc.php b/inc/user.inc.php index f7688b00..3606f025 100644 --- a/inc/user.inc.php +++ b/inc/user.inc.php @@ -26,10 +26,16 @@ class User return self::$user['fullname']; } - public static function hasPermission($permission) + public static function hasPermission($permission, $locationid = NULL) { if (!self::isLoggedIn()) return false; + if (Module::get("permissionmanager")) { + require_once "modules/permissionmanager/inc/permissionutil.inc.php"; + $module = Request::get("do", false); + $permission = $module ? $module.".".$permission : $permission; + return PermissionUtil::userHasPermission(self::$user['userid'], $permission, $locationid); + } return (self::$user['permissions'] & (Permission::get($permission) | Permission::get('superadmin'))) != 0; } |