4 commits - lib/ext

[Aleksander Machniak]

 lib/ext/Roundcube/rcube_db_mysql.php          |    3 +++
 lib/ext/Roundcube/rcube_imap.php              |    5 +++++
 lib/ext/Roundcube/rcube_imap_generic.php      |    6 +++++-
 lib/ext/Syncroton/Command/GetItemEstimate.php |    4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 689ce13c2c12b89b4a0036f3f2b9651c88219b0d
Merge: 7790973 6f564be
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Nov 5 20:19:22 2012 +0100

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



commit 7790973f483908e8ccf87cf61c30ccf905364c9a
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Nov 5 20:04:26 2012 +0100

    Fix affected_rows() result on MySQL. Patch from upstream

diff --git a/lib/ext/Roundcube/rcube_db_mysql.php b/lib/ext/Roundcube/rcube_db_mysql.php
index 2cdcf30..6f0acba 100644
--- a/lib/ext/Roundcube/rcube_db_mysql.php
+++ b/lib/ext/Roundcube/rcube_db_mysql.php
@@ -127,6 +127,9 @@ class rcube_db_mysql extends rcube_db
             $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
         }
 
+        // Always return matching (not affected only) rows count
+        $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+
         return $result;
     }
 


commit d1776bb20a50d1bd2d4cb674c0d3292a8d33e971
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Nov 5 19:33:18 2012 +0100

    Applied fixes from upstream

diff --git a/lib/ext/Roundcube/rcube_imap.php b/lib/ext/Roundcube/rcube_imap.php
index 1e6cf36..a89fd16 100644
--- a/lib/ext/Roundcube/rcube_imap.php
+++ b/lib/ext/Roundcube/rcube_imap.php
@@ -4119,6 +4119,11 @@ class rcube_imap extends rcube_storage
         return $this->delete_folder($folder);
     }
 
+    function clear_mailbox($folder = null)
+    {
+        return $this->clear_folder($folder);
+    }
+
     public function mailbox_exists($folder, $subscription=false)
     {
         return $this->folder_exists($folder, $subscription);
diff --git a/lib/ext/Roundcube/rcube_imap_generic.php b/lib/ext/Roundcube/rcube_imap_generic.php
index 52bf0e3..9c525dc 100644
--- a/lib/ext/Roundcube/rcube_imap_generic.php
+++ b/lib/ext/Roundcube/rcube_imap_generic.php
@@ -3530,6 +3530,10 @@ class rcube_imap_generic
      */
     static function uncompressMessageSet($messages)
     {
+        if (empty($messages)) {
+            return array();
+        }
+
         $result   = array();
         $messages = explode(',', $messages);
 
@@ -3538,7 +3542,7 @@ class rcube_imap_generic
             $max   = max($items[0], $items[1]);
 
             for ($x=$items[0]; $x<=$max; $x++) {
-                $result[] = $x;
+                $result[] = (int)$x;
             }
             unset($messages[$idx]);
         }


commit 362482c65962279f1a9bd9b323268f1a143b73d7
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Nov 5 18:31:47 2012 +0100

    Fix FilterType element value in GetItemEstimate command

diff --git a/lib/ext/Syncroton/Command/GetItemEstimate.php b/lib/ext/Syncroton/Command/GetItemEstimate.php
index de0de96..79ed73d 100644
--- a/lib/ext/Syncroton/Command/GetItemEstimate.php
+++ b/lib/ext/Syncroton/Command/GetItemEstimate.php
@@ -45,9 +45,9 @@ class Syncroton_Command_GetItemEstimate extends Syncroton_Command_Wbxml
             
             $collectionData = array(
                 'syncKey'       => (int)$airSyncValues->SyncKey,
-                'class'         => (string) $xmlCollection->Class,
                 'collectionId'  => (string) $xmlCollection->CollectionId,
-                'filterType'    => isset($airSyncValues->FilterType) ? (int)$airSyncValues->FilterType : 0
+                'class'         => isset($xmlCollection->Class) ? (string) $xmlCollection->Class : null,
+                'filterType'    => isset($airSyncValues->Options) && isset($airSyncValues->Options->FilterType) ? (int)$airSyncValues->Options->FilterType : 0
             );
             
             if ($this->_logger instanceof Zend_Log)