Branch 'kolab-syncroton-2.2' - lib/kolab_sync_data_calendar.php lib/kolab_sync_data_contacts.php lib/kolab_sync_data_tasks.php
Aleksander Machniak
machniak at kolabsys.com
Fri Oct 18 12:08:39 CEST 2013
lib/kolab_sync_data_calendar.php | 2 +-
lib/kolab_sync_data_contacts.php | 14 ++++++++++++++
lib/kolab_sync_data_tasks.php | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 1856697aa3012ab4d9c0e36b0cb307b206869916
Author: Aleksander Machniak <alec at alec.pl>
Date: Fri Oct 18 12:05:16 2013 +0200
Specify object type directly in libkolab queries, do not depend
on kolab_cache behaviour that was changed in latest cache refactoring (Bug #2385)
diff --git a/lib/kolab_sync_data_calendar.php b/lib/kolab_sync_data_calendar.php
index d305dde..fc2da1e 100644
--- a/lib/kolab_sync_data_calendar.php
+++ b/lib/kolab_sync_data_calendar.php
@@ -501,7 +501,7 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
*/
protected function filter($filter_type = 0)
{
- $filter = array();
+ $filter = array(array('type', '=', $this->modelName));
switch ($filter_type) {
case Syncroton_Command_Sync::FILTER_2_WEEKS_BACK:
diff --git a/lib/kolab_sync_data_contacts.php b/lib/kolab_sync_data_contacts.php
index 94dc2f6..7d703ef 100644
--- a/lib/kolab_sync_data_contacts.php
+++ b/lib/kolab_sync_data_contacts.php
@@ -254,4 +254,18 @@ class kolab_sync_data_contacts extends kolab_sync_data
return $contact;
}
+ /**
+ * Returns filter query array according to specified ActiveSync FilterType
+ *
+ * @param int $filter_type Filter type
+ *
+ * @param array Filter query
+ */
+ protected function filter($filter_type = 0)
+ {
+ // specify object type, contact folders in Kolab might
+ // contain also ditribution-list objects, we'll skip them
+ return array(array('type', '=', $this->modelName));
+ }
+
}
diff --git a/lib/kolab_sync_data_tasks.php b/lib/kolab_sync_data_tasks.php
index bade8a6..86ee985 100644
--- a/lib/kolab_sync_data_tasks.php
+++ b/lib/kolab_sync_data_tasks.php
@@ -220,7 +220,7 @@ class kolab_sync_data_tasks extends kolab_sync_data
*/
protected function filter($filter_type = 0)
{
- $filter = array();
+ $filter = array(array('type', '=', $this->modelName));
if ($filter_type == Syncroton_Command_Sync::FILTER_INCOMPLETE) {
$filter[] = array('tags', '!~', 'x-complete');
More information about the commits
mailing list