2 commits - lib/kolab_sync_data_email.php lib/kolab_sync_data.php
Aleksander Machniak
machniak at kolabsys.com
Thu Feb 13 19:15:12 CET 2014
lib/kolab_sync_data.php | 11 -----------
lib/kolab_sync_data_email.php | 20 +++++++-------------
2 files changed, 7 insertions(+), 24 deletions(-)
New commits:
commit 03f6485124f4529badf197d4d8da587b9d8f94ac
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Thu Feb 13 19:13:41 2014 +0100
Fix invalid email message identifier in Move response (Bug #2845)
diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index 7191510..5ccd031 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -511,19 +511,20 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
*/
public function moveItem($srcFolderId, $serverId, $dstFolderId)
{
- $msg = $this->parseMessageId($serverId);
- $dest = $this->extractFolders($dstFolderId);
- $dstname = $this->backend->folder_id2name(array_shift($dest), $this->device->deviceid);
+ $msg = $this->parseMessageId($serverId);
+ $dest = $this->extractFolders($dstFolderId);
+ $dest_id = array_shift($dest);
+ $dest_name = $this->backend->folder_id2name($dest_id, $this->device->deviceid);
if (empty($msg)) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
}
- if ($dstname === null) {
+ if ($dest_name === null) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_DESTINATION);
}
- if (!$this->storage->move_message($msg['uid'], $dstname, $msg['foldername'])) {
+ if (!$this->storage->move_message($msg['uid'], $dest_name, $msg['foldername'])) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
}
@@ -531,7 +532,7 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
$copyuid = $this->storage->conn->data['COPYUID'];
if (is_array($copyuid) && ($uid = $copyuid[1])) {
- return $this->createMessageId($dstFolderId, $uid);
+ return $this->createMessageId($dest_id, $uid);
}
}
commit d1762544b24e10e9fcfee1cd2b73467143309f4d
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Thu Feb 13 19:08:03 2014 +0100
Remove unused code
diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
index 3579a12..8f0bfef 100644
--- a/lib/kolab_sync_data.php
+++ b/lib/kolab_sync_data.php
@@ -576,17 +576,6 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
$result = array_merge($result, $uids);
}
break;
-
- case self::RESULT_OBJECT:
- default:
- $objects = $folder->select($filter);
-
- if (!is_array($objects)) {
- $error = true;
- }
- else {
- $result = array_merge($result, $objects);
- }
}
if ($error) {
diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index f378eb3..7191510 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -871,13 +871,6 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
$result = array_merge($result, $uids);
}
break;
-/*
- case self::RESULT_OBJECT:
- default:
- if ($objects = $folder->select($filter)) {
- $result = array_merge($result, $objects);
- }
-*/
}
}
More information about the commits
mailing list