From f35979e0fea46bf3a8109e4fbd5cc359d3a7c9a6 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 15 Mar 2010 10:59:25 +0100
Subject: [PATCH] Some hotfixes to make creating shares work.

---
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php     | 10 +++++-----
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index d06be64a7..017e411f7 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -434,7 +434,7 @@ class Horde_Kolab_Storage_Folder
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
                 $store = base64_encode($value);
                 if ($key == 'desc') {
-                    $entry = '/comment';
+                    $entry = '/shared/comment';
                 } else {
                     $entry = self::ANNOT_SHARE_ATTR . $key;
                 }
@@ -1260,12 +1260,12 @@ class Horde_Kolab_Storage_Folder
      */
     function setPermission(&$perms, $update = true)
     {
-        if (!is_a($perms, 'Horde_Permission')) {
-            return PEAR::raiseError('The permissions for this share must be specified as an instance of the Horde_Permission class!');
+        if (!is_a($perms, 'Horde_Perms_Permission')) {
+            return PEAR::raiseError('The permissions for this share must be specified as an instance of the Horde_Perms_Permission class!');
         }
 
-        if (!is_a($perms, 'Horde_Permission_Kolab')) {
-            $this->_perms = new Horde_Permission_Kolab($this, $perms->data);
+        if (!is_a($perms, 'Horde_Kolab_Storage_Permission')) {
+            $this->_perms = new Horde_Kolab_Storage_Permission($this, $perms->data);
         } else {
             $this->_perms = $perms;
             $this->_perms->setFolder($this);
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
index c3fe6f0a9..200543ad4 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
@@ -149,9 +149,10 @@ class Horde_Kolab_Storage_Permission extends Horde_Perms_Permission
 
         // Loop through the returned users
         $data = array();
-        foreach ($acl as $user => $rights) {
+        foreach ($acl as $user => $r) {
             // Convert the user rights to horde format
             $result = 0;
+            $rights = join('', $r);
             for ($i = 0, $j = strlen($rights); $i < $j; $i++) {
                 switch ($rights[$i]) {
                 case 'l':
-- 
2.11.0