[Pkg-owncloud-commits] [php-sabredav] 60/64: ACL plugin no longer relies on $authPlugin->getUserName().

[David Prévot]

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

taffit pushed a commit to tag 2.2.0alpha1
in repository php-sabredav.

commit 09169c5880d44e8e40df2bbb31b94b5f25d2ad29
Author: Evert Pot <me at evertpot.com>
Date:   Sat Dec 6 23:19:37 2014 -0500

    ACL plugin no longer relies on $authPlugin->getUserName().
---
 lib/DAVACL/Plugin.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php
index 3cc8df3..f1bd5a7 100644
--- a/lib/DAVACL/Plugin.php
+++ b/lib/DAVACL/Plugin.php
@@ -87,15 +87,6 @@ class Plugin extends DAV\ServerPlugin {
     public $hideNodesFromListings = false;
 
     /**
-     * This string is prepended to the username of the currently logged in
-     * user. This allows the plugin to determine the principal path based on
-     * the username.
-     *
-     * @var string
-     */
-    public $defaultUsernamePath = 'principals';
-
-    /**
      * This list of properties are the properties a client can search on using
      * the {DAV:}principal-property-search report.
      *
@@ -242,10 +233,7 @@ class Plugin extends DAV\ServerPlugin {
         if (is_null($authPlugin)) return null;
         /** @var $authPlugin Sabre\DAV\Auth\Plugin */
 
-        $userName = $authPlugin->getCurrentUser();
-        if (!$userName) return null;
-
-        return $this->defaultUsernamePath . '/' .  $userName;
+        return $authPlugin->getCurrentPrincipal();
 
     }
 

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