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

Small improvements in contacts list/search handling

Browse source
This commit is contained in:
Aleksander Machniak 2013-09-09 12:40:00 +02:00
parent 94f3198ad1
commit c8174100f6
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,19 +286,20 @@ class rcube_kolab_contacts extends rcube_addressbook
} }
$ids = array_keys($this->contacts); $ids = array_keys($this->contacts);
$this->result->count = count($this->contacts);
} }
else if (is_array($this->filter['ids'])) { else if (is_array($this->filter['ids'])) {
$ids = $this->filter['ids']; $ids = $this->filter['ids'];
if ($this->result->count = count($ids)) { if (count($ids)) {
$uids = array_map(array($this, 'id2uid'), $this->filter['ids']); $uids = array_map(array($this, 'id2uid'), $this->filter['ids']);
$this->_fetch_contacts(array(array('uid', '=', $uids))); $this->_fetch_contacts(array(array('uid', '=', $uids)));
} }
else {
$this->contacts = array();
}
} }
else { else {
$this->_fetch_contacts(); $this->_fetch_contacts();
$ids = array_keys($this->contacts); $ids = array_keys($this->contacts);
$this->result->count = count($ids);
} }
// sort data arrays according to desired list sorting // sort data arrays according to desired list sorting
@ -309,6 +310,8 @@ class rcube_kolab_contacts extends rcube_addressbook
$ids = array_values(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);
$this->result->count = count($ids);
} }
// fill contact data into the current result set // fill contact data into the current result set
@ -420,6 +423,11 @@ class rcube_kolab_contacts extends rcube_addressbook
$this->filter['ids'][] = $id; $this->filter['ids'][] = $id;
} }
// dummy result with contacts count
if (!$select) {
return new rcube_result_set(count($this->filter['ids']), ($this->list_page-1) * $this->page_size);
}
// list records (now limited by $this->filter) // list records (now limited by $this->filter)
return $this->list_records(); return $this->list_records();
} }