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

Merge branch 'master' into dev/elastic

Browse source
This commit is contained in:
Aleksander Machniak 2018-01-12 11:53:09 +01:00
commit a0569164da
9 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/composer.json
View file

@ -4,7 +4,7 @@
"description": "Calendar plugin", "description": "Calendar plugin",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",

2
plugins/kolab_addressbook/composer.json
View file

@ -4,7 +4,7 @@
"description": "Kolab addressbook", "description": "Kolab addressbook",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.3", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",

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

@ -355,7 +355,7 @@ class rcube_kolab_contacts extends rcube_addressbook
// get members by UID // get members by UID
if (!empty($uids)) { if (!empty($uids)) {
$this->_fetch_contacts($query = array(array('uid', '=', $uids)), !$fetch_all); $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids));
$this->sortindex = array_merge($this->sortindex, $local_sortindex); $this->sortindex = array_merge($this->sortindex, $local_sortindex);
} }
} }
@ -363,7 +363,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$ids = $this->filter['ids']; $ids = $this->filter['ids'];
if (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($query = array(array('uid', '=', $uids)), true); $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids));
} }
} }
else { else {
@ -1066,10 +1066,13 @@ class rcube_kolab_contacts extends rcube_addressbook
{ {
if (!isset($this->dataset) || !empty($query)) { if (!isset($this->dataset) || !empty($query)) {
if ($limit) { if ($limit) {
$this->storagefolder->set_order_and_limit($this->_sort_columns(), $this->page_size, ($this->list_page-1) * $this->page_size); $size = is_int($limit) && $limit < $this->page_size ? $limit : $this->page_size;
$this->storagefolder->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page-1) * $this->page_size);
} }
$this->sortindex = array(); $this->sortindex = array();
$this->dataset = $this->storagefolder->select($query); $this->dataset = $this->storagefolder->select($query);
foreach ($this->dataset as $idx => $record) { foreach ($this->dataset as $idx => $record) {
$contact = $this->_to_rcube_contact($record); $contact = $this->_to_rcube_contact($record);
$this->sortindex[$idx] = $this->_sort_string($contact); $this->sortindex[$idx] = $this->_sort_string($contact);

2
plugins/kolab_auth/composer.json
View file

@ -4,7 +4,7 @@
"description": "Kolab authentication", "description": "Kolab authentication",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",

2
plugins/kolab_files/composer.json
View file

@ -4,7 +4,7 @@
"description": "User interface for Kolab File Manager (Chwala)", "description": "User interface for Kolab File Manager (Chwala)",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Aleksander Machniak", "name": "Aleksander Machniak",

2
plugins/kolab_folders/composer.json
View file

@ -4,7 +4,7 @@
"description": "Type-aware folder management/listing for Kolab", "description": "Type-aware folder management/listing for Kolab",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.2", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Aleksander Machniak", "name": "Aleksander Machniak",

2
plugins/libcalendaring/composer.json
View file

@ -4,7 +4,7 @@
"description": "Library providing common functions for calendaring plugins", "description": "Library providing common functions for calendaring plugins",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",

2
plugins/libkolab/composer.json
View file

@ -4,7 +4,7 @@
"description": "Plugin to setup a basic environment for the interaction with a Kolab server.", "description": "Plugin to setup a basic environment for the interaction with a Kolab server.",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",

2
plugins/tasklist/composer.json
View file

@ -4,7 +4,7 @@
"description": "Task management plugin", "description": "Task management plugin",
"homepage": "https://git.kolab.org/diffusion/RPK/", "homepage": "https://git.kolab.org/diffusion/RPK/",
"license": "AGPLv3", "license": "AGPLv3",
"version": "3.3.4", "version": "3.3.5",
"authors": [ "authors": [
{ {
"name": "Thomas Bruederli", "name": "Thomas Bruederli",