holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix public addressbook categories with were not visible with grant on personal addressbook

Browse Source
This commit is contained in:
nathan 2023-02-24 14:40:51 -07:00
parent 04bedf30be
commit be3e5fbe8d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Categories.php
View File

@ -573,12 +573,13 @@ class Categories
}
// Check for ACL granted access, the self::GLOBAL_ACCOUNT user must not get access by ACL to keep old behaviour
$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && ($category['appname'] ?? null) == $this->app_name && $this->app_name != 'addressbook';
$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && ($category['appname'] ?? null) == $this->app_name;
$owner_grant = false;
foreach(!empty($category['owner']) ? explode(',',$category['owner']) : [] as $owner)
{
$owner_grant = $owner_grant || (is_array($this->grants) && !empty($this->grants[$owner]) && ($this->grants[$owner] & $needed) &&
($category['appname'] !== 'addressbook' && $category['access'] === 'public' || ($this->grants[$owner] & Acl::PRIVAT)));
(($category['appname'] !== 'addressbook' && $category['access'] === 'public' || ($this->grants[$owner] & Acl::PRIVAT)) ||
($category['appname'] == 'addressbook' && $category['access'] === 'public' && ($this->grants[$owner] & $needed))));
}
return $acl_grant && $owner_grant;
}