[Pkg-owncloud-commits] [php-sabredav] 44/148: Small updates to Sabre/DAVACL plugin.

[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 c2932ca0dd14fb3bfdcc16f4dcb05bcd7b63d794
Author: Evert Pot <me at evertpot.com>
Date:   Fri Feb 13 17:28:04 2015 -0500

    Small updates to Sabre/DAVACL plugin.
---
 lib/DAVACL/Plugin.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php
index f8d9ae5..2693d86 100644
--- a/lib/DAVACL/Plugin.php
+++ b/lib/DAVACL/Plugin.php
@@ -2,12 +2,11 @@
 
 namespace Sabre\DAVACL;
 
-use
-    Sabre\DAV,
-    Sabre\DAV\INode,
-    Sabre\HTTP\URLUtil,
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
+use Sabre\DAV;
+use Sabre\DAV\INode;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+use Sabre\Uri;
 
 /**
  * SabreDAV ACL Plugin
@@ -710,6 +709,7 @@ class Plugin extends DAV\ServerPlugin {
         // class.
         $server->xml->elementMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Xml\\Property\\Href';
         $server->xml->elementMap['{DAV:}acl'] = 'Sabre\\DAVACL\\Xml\\Property\\Acl';
+        $server->xml->elementMap['{DAV:}expand-property'] = 'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport';
 
     }
 
@@ -792,7 +792,7 @@ class Plugin extends DAV\ServerPlugin {
      */
     function beforeBind($uri) {
 
-        list($parentUri) = URLUtil::splitPath($uri);
+        list($parentUri) = Uri\split($uri);
         $this->checkPrivileges($parentUri,'{DAV:}bind');
 
     }
@@ -808,7 +808,7 @@ class Plugin extends DAV\ServerPlugin {
      */
     function beforeUnbind($uri) {
 
-        list($parentUri) = URLUtil::splitPath($uri);
+        list($parentUri) = Uri\split($uri);
         $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
 
     }

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