Branch '2.3-stable' - pear/Kolab_Storage

[Christoph Wickert]

 pear/Kolab_Storage/ChangeLog                                                           |    6 ++
 pear/Kolab_Storage/package.info                                                        |    2 
 pear/Kolab_Storage/patches/Kolab_Storage-0.5.0/t_framework_HK_GW_ZpushAnnotations.diff |   23 +++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 410322425db18022ae663b0079552a1ba11a005c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon May 30 23:29:23 2011 +0200

    Kolab_Storage: Fix invalid return value of getActiveSync() for the folder INBOX (bugzilla.kolabsys.com #105

diff --git a/pear/Kolab_Storage/ChangeLog b/pear/Kolab_Storage/ChangeLog
index 6569a79..02657d0 100644
--- a/pear/Kolab_Storage/ChangeLog
+++ b/pear/Kolab_Storage/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-26  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff:
+
+	Bug 105 - Invalid return value of getActiveSync() for the folder "INBOX"
+
 2010-06-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.5.0/Kolab_Storage_0.5.0_p2.patch:
diff --git a/pear/Kolab_Storage/package.info b/pear/Kolab_Storage/package.info
index 74057f7..73e7798 100644
--- a/pear/Kolab_Storage/package.info
+++ b/pear/Kolab_Storage/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.5.0'
 
 # Package release number
-release='20100625'
+release='20110526'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.0/t_framework_HK_GW_ZpushAnnotations.diff b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.0/t_framework_HK_GW_ZpushAnnotations.diff
index 175517b..41dfa62 100644
--- a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.0/t_framework_HK_GW_ZpushAnnotations.diff
+++ b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.0/t_framework_HK_GW_ZpushAnnotations.diff
@@ -59,7 +59,7 @@ diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/f
              $result = $this->_perms->save();
              if (is_a($result, 'PEAR_Error')) {
                  return $result;
-@@ -1645,6 +1655,132 @@
+@@ -1645,6 +1655,133 @@
          return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                       $value);
      }
@@ -79,32 +79,33 @@ diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/f
 +            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
 +        );
 +        $local = json_decode(base64_decode($raw), true);
-+        if (!$this->name != 'INBOX') {
++        $result = array(
++            'DEVICE' => array(),
++            'FOLDER' => array(),
++        );
++        if ($this->name != 'INBOX') {
 +            $raw = $imap->getAnnotation(
 +                KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', 'INBOX'
 +            );
 +            $global = json_decode(base64_decode($raw), true);
-+            if (!is_array($local)) {
++            if (is_array($global) && is_array($local)) {
 +                $result = array(
 +                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
-+                    'FOLDER' => array()
++                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
 +                );
 +            } elseif (is_array($global)) {
 +                $result = array(
 +                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
-+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
++                    'FOLDER' => array()
 +                );
-+            } else {
++            } elseif (is_array($local)) {
 +                $result = array(
 +                    'DEVICE' => array(),
 +                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
 +                );
 +            }
-+        } else {
-+            $result = array(
-+                'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
-+                'FOLDER' => array()
-+            );
++        } elseif (is_array($local)) {
++            $result = $local;
 +        }
 +        $result['NAMESPACE'] = $this->_list->namespace->matchNamespace($this->name)->getType();
 +        return $result;