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

Addressbook - Fix filtering by addressbook in duplicates view.

Browse Source
This commit is contained in:
nathangray 2017-03-22 14:23:05 -06:00
parent 452d590161
commit 6551a71b41
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,21 +296,21 @@ class Sql extends Api\Storage
$join .= 'a2.contact_tid != \'D\' AND ';
}
// add filter for read ACL in sql, if user is NOT the owner of the addressbook
if ($param['owner'] && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
if (array_key_exists('owner',$param) && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
{
$filter['owner'] = $param['owner'];
$join .= 'a2.contact_owner = ' . $this->db->quote($filter['owner']) . ' AND ';
$filter[$this->table_name.'.contact_owner'] = $param['owner'];
$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
}
else
{
// we have no private grants in addressbook at the moment, they have then to be added here too
if ($param['owner'])
if (array_key_exists('owner', $param))
{
if (!$this->grants[(int) $filter['owner']]) return false; // we have no access to that addressbook
if (!$this->grants[(int) $param['owner']]) return false; // we have no access to that addressbook
$filter['owner'] = $param['owner'];
$filter['private'] = 0;
$join .= 'a2.contact_owner = ' . $this->db->quote($filter['owner']) . ' AND ';
$filter[$this->table_name.'.contact_owner'] = $param['owner'];
$filter[$this->table_name.'.private'] = 0;
$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
$join .= 'a2.contact_private = ' . $this->db->quote($filter['private']) . ' AND ';
}
else // search all addressbooks, incl. accounts

7
api/src/Contacts/Storage.php
View File

@ -866,7 +866,12 @@ class Storage
// return all entries including deleted
unset($param['col_filter']['tid']);
}
if($param['col_filter']['owner'])
if(array_key_exists('filter', $param) && $param['filter'] != '')
{
$param['owner'] = $param['filter'];
unset($param['filter']);
}
if(array_key_exists('owner', $param['col_filter']) && $param['col_filter']['owner'] != '')
{
$param['owner'] = $param['col_filter']['owner'];
unset($param['col_filter']['owner']);