Page MenuHomePhorge
Files F2571766

No OneTemporary
Actions

Size
9 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/ext/Syncroton/Backend/SyncState.php b/lib/ext/Syncroton/Backend/SyncState.php
index 87dc39c..8c90a76 100644
--- a/lib/ext/Syncroton/Backend/SyncState.php
+++ b/lib/ext/Syncroton/Backend/SyncState.php
@@ -1,209 +1,208 @@
<?php
/**
* Syncroton
*
* @package Syncroton
* @subpackage Backend
* @license http://www.tine20.org/licenses/lgpl.html LGPL Version 3
* @author Lars Kneschke <l.kneschke@metaways.de>
* @copyright Copyright (c) 2009-2012 Metaways Infosystems GmbH (http://www.metaways.de)
*
*/
/**
* sql backend class for the folder state
*
* @package Syncroton
* @subpackage Backend
*/
class Syncroton_Backend_SyncState extends Syncroton_Backend_ABackend implements Syncroton_Backend_ISyncState
{
protected $_tableName = 'synckey';
protected $_modelClassName = 'Syncroton_Model_SyncState';
protected $_modelInterfaceName = 'Syncroton_Model_ISyncState';
/**
* (non-PHPdoc)
* @see Syncroton_Backend_ISyncState::create()
*/
public function create($model, $keepPreviousSyncState = true)
{
$state = parent::create($model);
if ($keepPreviousSyncState !== true) {
// remove all other synckeys
$this->_deleteOtherStates($state);
}
return $state;
}
/**
* (non-PHPdoc)
* @see Syncroton_Backend_ABackend::_convertModelToArray()
*/
protected function _convertModelToArray($model)
{
$model = parent::_convertModelToArray($model);
$model['pendingdata'] = isset($model['pendingdata']) && is_array($model['pendingdata']) ? Zend_Json::encode($model['pendingdata']) : null;
return $model;
}
/**
*
* @param Syncroton_Model_ISyncState $state
*/
protected function _deleteOtherStates(Syncroton_Model_ISyncState $state)
{
// remove all other synckeys
$where = array(
'device_id = ?' => $state->deviceId,
'type = ?' => $state->type,
'counter != ?' => $state->counter
);
$this->_db->delete($this->_tablePrefix . $this->_tableName, $where);
return true;
}
/**
* (non-PHPdoc)
* @see Syncroton_Backend_ABackend::_getObject()
*/
protected function _getObject($data)
{
$model = parent::_getObject($data);
if ($model->pendingdata !== NULL) {
$model->pendingdata = Zend_Json::decode($model->pendingdata);
}
return $model;
}
/**
* (non-PHPdoc)
* @see Syncroton_Backend_ISyncState::getSyncState()
*/
public function getSyncState($deviceId, $folderId)
{
$deviceId = $deviceId instanceof Syncroton_Model_IDevice ? $deviceId->id : $deviceId;
$folderId = $folderId instanceof Syncroton_Model_IFolder ? $folderId->id : $folderId;
$select = $this->_db->select()
->from($this->_tablePrefix . $this->_tableName)
->where($this->_db->quoteIdentifier('device_id') . ' = ?', $deviceId)
->where($this->_db->quoteIdentifier('type') . ' = ?', $folderId)
->order('counter DESC')
->limit(1);
$stmt = $this->_db->query($select);
$data = $stmt->fetch();
$stmt = null; # see https://bugs.php.net/bug.php?id=44081
if ($data === false) {
throw new Syncroton_Exception_NotFound('id not found');
}
return $this->_getObject($data);
}
/**
* delete all stored synckeys for given type
*
* @param Syncroton_Model_IDevice|string $deviceId
* @param Syncroton_Model_IFolder|string $folderId
*/
public function resetState($deviceId, $folderId)
{
$deviceId = $deviceId instanceof Syncroton_Model_IDevice ? $deviceId->id : $deviceId;
$folderId = $folderId instanceof Syncroton_Model_IFolder ? $folderId->id : $folderId;
$where = array(
$this->_db->quoteInto($this->_db->quoteIdentifier('device_id') . ' = ?', $deviceId),
$this->_db->quoteInto($this->_db->quoteIdentifier('type') . ' = ?', $folderId)
);
$this->_db->delete($this->_tablePrefix . $this->_tableName, $where);
}
/**
* get array of ids which got send to the client for a given class
*
* @param Syncroton_Model_IDevice|string $deviceId
* @param Syncroton_Model_IFolder|string $folderId
* @return Syncroton_Model_SyncState
*/
public function validate($deviceId, $folderId, $syncKey)
{
$deviceId = $deviceId instanceof Syncroton_Model_IDevice ? $deviceId->id : $deviceId;
$folderId = $folderId instanceof Syncroton_Model_IFolder ? $folderId->id : $folderId;
$select = $this->_db->select()
->from($this->_tablePrefix . $this->_tableName)
->where($this->_db->quoteIdentifier('device_id') . ' = ?', $deviceId)
->where($this->_db->quoteIdentifier('counter') . ' = ?', $syncKey)
->where($this->_db->quoteIdentifier('type') . ' = ?', $folderId);
$stmt = $this->_db->query($select);
$data = $stmt->fetch();
$stmt = null; # see https://bugs.php.net/bug.php?id=44081
if ($data === false) {
return false;
}
$state = $this->_getObject($data);
// check if this was the latest syncKey
$select = $this->_db->select()
->from($this->_tablePrefix . $this->_tableName)
->where($this->_db->quoteIdentifier('device_id') . ' = ?', $deviceId)
->where($this->_db->quoteIdentifier('counter') . ' = ?', $syncKey + 1)
->where($this->_db->quoteIdentifier('type') . ' = ?', $folderId);
$stmt = $this->_db->query($select);
$moreRecentStateData = $stmt->fetch();
$stmt = null; # see https://bugs.php.net/bug.php?id=44081
// found more recent synckey => the last sync repsone got not received by the client
if ($moreRecentStateData !== false) {
// undelete entries marked as deleted in Syncroton_content table
$this->_db->update($this->_tablePrefix . 'content', array(
'is_deleted' => 0,
), array(
'device_id = ?' => $deviceId,
'folder_id = ?' => $folderId,
'creation_synckey = ?' => $state->counter,
'is_deleted = ?' => 1
));
- // remove entries added during latest sync in Syncroton_content table
- $this->_db->delete($this->_tablePrefix . 'content', array(
- 'device_id = ?' => $deviceId,
- 'folder_id = ?' => $folderId,
- 'creation_synckey > ?' => $state->counter,
- ));
-
} else {
- // finaly delete all entries marked for removal in Syncroton_content table
+ // finally delete all entries marked for removal in Syncroton_content table
$this->_db->delete($this->_tablePrefix . 'content', array(
'device_id = ?' => $deviceId,
'folder_id = ?' => $folderId,
'is_deleted = ?' => 1
));
-
}
// remove all other synckeys
$this->_deleteOtherStates($state);
+ // remove entries from Syncroton_content table with an creation_synckey bigger than current one
+ $this->_db->delete($this->_tablePrefix . 'content', array(
+ 'device_id = ?' => $deviceId,
+ 'folder_id = ?' => $folderId,
+ 'creation_synckey > ?' => $state->counter,
+ ));
+
return $state;
}
}
diff --git a/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php b/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php
new file mode 100644
index 0000000..07ca1d9
--- /dev/null
+++ b/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Syncroton
+ *
+ * @package Wbxml
+ * @subpackage ActiveSync
+ * @license http://www.tine20.org/licenses/lgpl.html LGPL Version 3
+ * @copyright Copyright (c) 2013-2013 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @author Lars Kneschke <l.kneschke@metaways.de>
+ */
+
+/**
+ * class documentation
+ *
+ * @link http://msdn.microsoft.com/en-us/live/jj572363.aspx
+ * @package Wbxml
+ * @subpackage ActiveSync
+ */
+class Syncroton_Wbxml_Dtd_ActiveSync_CodePage254 extends Syncroton_Wbxml_Dtd_ActiveSync_Abstract
+{
+ protected $_codePageNumber = 254;
+
+ protected $_codePageName = 'WindowsLive';
+
+ protected $_tags = array(
+ 'Annotations' => 0x05,
+ 'Annotation' => 0x06,
+ 'Name' => 0x07,
+ 'Value' => 0x08
+ );
+}
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Thu, Mar 19, 8:59 AM (23 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
457682
Default Alt Text
(9 KB)

Event Timeline