extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix contacts shared with a user are not visible in his personal AB, but when all addressbooks selected

Browse Source
This commit is contained in:
Ralf Becker 2020-10-15 11:35:53 +02:00
parent ea41ab8e77
commit 9567a1fed3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Contacts/Sql.php
View File

@ -505,8 +505,7 @@ class Sql extends Api\Storage
$this->db->expression(self::SHARED_TABLE, ['shared_with' => $filter['owner'] ?? array_keys($this->grants)]).')'; $this->db->expression(self::SHARED_TABLE, ['shared_with' => $filter['owner'] ?? array_keys($this->grants)]).')';
// add filter for read ACL in sql, if user is NOT the owner of the addressbook // add filter for read ACL in sql, if user is NOT the owner of the addressbook
if (isset($this->grants) && !$ignore_acl && if (isset($this->grants) && !$ignore_acl)
!(isset($filter['owner']) && $filter['owner'] == $GLOBALS['egw_info']['user']['account_id']))
{ {
// add read ACL for groupmembers (they have no // add read ACL for groupmembers (they have no
if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' && if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
@ -549,6 +548,12 @@ class Sql extends Api\Storage
" OR contact_private=0 AND $this->table_name.contact_owner IN (". " OR contact_private=0 AND $this->table_name.contact_owner IN (".
implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)"; implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
} }
else
{
$filter[] = '('.$this->db->expression($this->table_name, $this->table_name.'.', ['contact_owner' => $filter['owner']]).
" OR $shared_sql)";
unset($filter['owner']);
}
} }
else // search all addressbooks, incl. accounts else // search all addressbooks, incl. accounts
{ {