diff options
| author | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
| commit | d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4 (patch) | |
| tree | c1030efbdb837f53651272e015a3ab5562f145c8 /inc/user.inc.php | |
| parent | [systemstatus] lang-descriptions for permissions (diff) | |
| parent | [inc/User] Add locationid 0 to allowed locations in fallback mode (diff) | |
| download | slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.gz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.xz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'inc/user.inc.php')
| -rw-r--r-- | inc/user.inc.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/inc/user.inc.php b/inc/user.inc.php index 95680e65..b5a364ee 100644 --- a/inc/user.inc.php +++ b/inc/user.inc.php @@ -47,8 +47,11 @@ class User $permission = $module ? $module->getIdentifier().".".$permission : $permission; return PermissionUtil::getAllowedLocations(self::$user['userid'], $permission); } - if (self::$user['permissions'] & Permission::get('superadmin')) - return array_keys(Location::getLocationsAssoc()); + if (self::$user['permissions'] & Permission::get('superadmin')) { + $a = array_keys(Location::getLocationsAssoc()); + $a[] = 0; + return $a; + } return array(); } @@ -109,7 +112,6 @@ class User public static function logout() { - error_log("in logout"); Session::delete(); Header('Location: ?do=Main&fromlogout'); exit(0); |