[Pkg-owncloud-commits] [php-sabredav] 148/275: Ensuring principal urls end in / in group-member-set and group-membership

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 0c2320588d859b81ff7af1a6cb81128891429529
Author: Evert Pot <me at evertpot.com>
Date:   Mon Aug 11 18:34:51 2014 -0400

    Ensuring principal urls end in / in group-member-set and
    group-membership
---
 lib/DAVACL/Plugin.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php
index 64ebeac..bb6a675 100644
--- a/lib/DAVACL/Plugin.php
+++ b/lib/DAVACL/Plugin.php
@@ -875,10 +875,18 @@ class Plugin extends DAV\ServerPlugin {
                 return new DAV\Property\Href($node->getPrincipalUrl() . '/');
             });
             $propFind->handle('{DAV:}group-member-set', function() use ($node) {
-                return new DAV\Property\HrefList($node->getGroupMemberSet());
+                $members = $node->getGroupMemberSet();
+                foreach($members as $k=>$member) {
+                    $members[$k] = rtrim($member,'/') . '/';
+                }
+                return new DAV\Property\HrefList($members);
             });
             $propFind->handle('{DAV:}group-membership', function() use ($node) {
-                return new DAV\Property\HrefList($node->getGroupMembership());
+                $members = $node->getGroupMembership();
+                foreach($members as $k=>$member) {
+                    $members[$k] = rtrim($member,'/') . '/';
+                }
+                return new DAV\Property\HrefList($members);
             });
             $propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git