Page MenuHomePhorge
Files F2555776

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/ext/Syncroton/Command/MoveItems.php b/lib/ext/Syncroton/Command/MoveItems.php
index 73e57dd..3f89b34 100644
--- a/lib/ext/Syncroton/Command/MoveItems.php
+++ b/lib/ext/Syncroton/Command/MoveItems.php
@@ -1,94 +1,97 @@
<?php
/**
* Syncroton
*
* @package Syncroton
* @subpackage Command
* @license http://www.tine20.org/licenses/lgpl.html LGPL Version 3
* @copyright Copyright (c) 2009-2012 Metaways Infosystems GmbH (http://www.metaways.de)
* @copyright Copyright (c) 2012-2012 Kolab Systems AG (http://www.kolabsys.com)
* @author Lars Kneschke <l.kneschke@metaways.de>
* @author Aleksander Machniak <machniak@kolabsys.com>
*/
/**
* class to handle ActiveSync MoveItems command
*
* @package Syncroton
* @subpackage Command
*/
class Syncroton_Command_MoveItems extends Syncroton_Command_Wbxml
{
const STATUS_SUCCESS = 3;
protected $_defaultNameSpace = 'uri:Move';
protected $_documentElement = 'MoveItems';
/**
* list of items to move
*
* @var array
*/
protected $_moves = array();
/**
* parse MoveItems request
*/
public function handle()
{
$xml = simplexml_import_dom($this->_requestBody);
foreach ($xml->Move as $move) {
$this->_moves[] = array(
'srcMsgId' => (string)$move->SrcMsgId,
'srcFldId' => (string)$move->SrcFldId,
'dstFldId' => (string)$move->DstFldId
);
}
}
/**
* generate MoveItems response
*/
public function getResponse()
{
$moves = $this->_outputDom->documentElement;
foreach ($this->_moves as $move) {
$response = $moves->appendChild($this->_outputDom->createElementNS('uri:Move', 'Response'));
$response->appendChild($this->_outputDom->createElementNS('uri:Move', 'SrcMsgId', $move['srcMsgId']));
try {
if ($move['srcFldId'] === $move['dstFldId']) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::SAME_FOLDER);
}
try {
$sourceFolder = $this->_folderBackend->getFolder($this->_device, $move['srcFldId']);
} catch (Syncroton_Exception_NotFound $e) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
}
try {
$destinationFolder = $this->_folderBackend->getFolder($this->_device, $move['dstFldId']);
} catch (Syncroton_Exception_NotFound $senf) {
throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_DESTINATION);
}
$dataController = Syncroton_Data_Factory::factory($sourceFolder->class, $this->_device, $this->_syncTimeStamp);
$newId = $dataController->moveItem($move['srcFldId'], $move['srcMsgId'], $move['dstFldId']);
+ if (!$newId) {
+ throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
+ }
+
$response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Command_MoveItems::STATUS_SUCCESS));
- if ($newId)
- $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
+ $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
} catch (Syncroton_Exception_Status $e) {
$response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', $e->getCode()));
} catch (Exception $e) {
$response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Exception_Status::SERVER_ERROR));
}
}
return $this->_outputDom;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Feb 26, 2:00 PM (20 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
446934
Default Alt Text
(4 KB)

Event Timeline