2 commits - lib/ext

[Aleksander Machniak]

 lib/ext/Syncroton/Backend/SyncState.php                |   17 ++++-----
 lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php |   31 +++++++++++++++++
 2 files changed, 39 insertions(+), 9 deletions(-)

New commits:
commit ce79d4421d7b10567304d2720f3b3fc2df3578f4
Merge: 5c20f6d 800032d
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri May 3 08:45:57 2013 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-syncroton



commit 5c20f6da35ce9b9555fb6135322664cd8021c8d1
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri May 3 08:45:06 2013 +0200

    Update Syncroton with codepage 254

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
@@ -184,26 +184,25 @@ class Syncroton_Backend_SyncState extends Syncroton_Backend_ABackend implements
                 '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 at 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