Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed listing of contacts when group is selected

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-08-02 13:18:48 +02:00
parent 159d672a1d
commit 1ff51a5500
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -261,7 +261,6 @@ class rcube_kolab_contacts extends rcube_addressbook
public function list_records($cols=null, $subset=0) public function list_records($cols=null, $subset=0)
{ {
$this->result = $this->count(); $this->result = $this->count();
// list member of the selected group // list member of the selected group
if ($this->gid) { if ($this->gid) {
$seen = array(); $seen = array();
@ -270,6 +269,7 @@ class rcube_kolab_contacts extends rcube_addressbook
// skip member that don't match the search filter // skip member that don't match the search filter
if (is_array($this->filter['ids']) && array_search($member['ID'], $this->filter['ids']) === false) if (is_array($this->filter['ids']) && array_search($member['ID'], $this->filter['ids']) === false)
continue; continue;
if ($this->contacts[$member['ID']] && !$seen[$member['ID']]++) if ($this->contacts[$member['ID']] && !$seen[$member['ID']]++)
$this->result->count++; $this->result->count++;
} }
@ -283,7 +283,7 @@ class rcube_kolab_contacts extends rcube_addressbook
uasort($this->contacts, array($this, '_sort_contacts_comp')); uasort($this->contacts, array($this, '_sort_contacts_comp'));
// get sorted IDs // get sorted IDs
if ($count != count($this->contacts)) if ($count != count($this->contacts))
$ids = array_intersect(array_keys($this->contacts), $ids); $ids = array_values(array_intersect(array_keys($this->contacts), $ids));
else else
$ids = array_keys($this->contacts); $ids = array_keys($this->contacts);
} }
@ -1022,6 +1022,7 @@ class rcube_kolab_contacts extends rcube_addressbook
// FIXME: folders without any distribution-list objects return contacts instead ?! // FIXME: folders without any distribution-list objects return contacts instead ?!
if ($record['__type'] != 'Group') if ($record['__type'] != 'Group')
continue; continue;
$record['ID'] = md5($record['uid']); $record['ID'] = md5($record['uid']);
foreach ((array)$record['member'] as $i => $member) { foreach ((array)$record['member'] as $i => $member) {
$mid = md5($member['uid']); $mid = md5($member['uid']);