YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAVACL/Plugin.php

Doc Comments +9 added lines, -11 removed lines

@@ -113,7 +113,7 @@ 
      *
      * This list is used in the response of a HTTP OPTIONS request.
      *
-     * @return array
+     * @return string[]
      */
     function getFeatures() {
 
@@ -125,7 +125,7 @@ 
      * Returns a list of available methods for a given url
      *
      * @param string $uri
-     * @return array
+     * @return string[]
      */
     function getMethods($uri) {
 
@@ -155,7 +155,7 @@ 
      * implement them
      *
      * @param string $uri
-     * @return array
+     * @return string[]
      */
     function getSupportedReportSet($uri) {
 
@@ -176,7 +176,7 @@ 
      * and return true otherwise.
      *
      * @param string $uri
-     * @param array|string $privileges
+     * @param string $privileges
      * @param int $recursion
      * @param bool $throwExceptions if set to false, this method won't throw exceptions.
      * @throws Sabre\DAVACL\Exception\NeedPrivileges
@@ -269,7 +269,7 @@ 
     /**
      * Returns all the principal groups the specified principal is a member of.
      *
-     * @param string $principal
+     * @param string $mainPrincipal
      * @return array
      */
     function getPrincipalMembership($mainPrincipal) {
@@ -831,10 +831,8 @@ 
      *
      * @param DAV\PropFind $propFind
      * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
      * @TODO really should be broken into multiple methods, or even a class.
-     * @return bool
+     * @return false|null
      */
     function propFind(DAV\PropFind $propFind, DAV\INode $node) {
 
@@ -982,7 +980,7 @@ 
      * @param string $reportName
      * @param mixed $report
      * @param mixed $path
-     * @return bool
+     * @return false|null
      */
     function report($reportName, $report, $path) {
 
@@ -1133,7 +1131,7 @@ 
      * @param array $path
      * @param array $requestedProperties the list of required properties
      * @param int $depth
-     * @return array
+     * @return DAV\Xml\Element\Response[]
      */
     protected function expandProperties($path, array $requestedProperties, $depth) {
 
@@ -1278,7 +1276,7 @@ 
      *
      * @param DAV\INode $node
      * @param string $output
-     * @return bool
+     * @return null|false
      */
     function htmlActionsPanel(DAV\INode $node, &$output) {
 

Spacing +9 added lines, -9 removed lines

@@ -674,15 +674,15 @@
     function initialize(DAV\Server $server) {
 
         $this->server = $server;
-        $server->on('propFind',            [$this, 'propFind'], 20);
-        $server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
-        $server->on('beforeBind',          [$this, 'beforeBind'], 20);
-        $server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
-        $server->on('propPatch',           [$this, 'propPatch']);
-        $server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
-        $server->on('report',              [$this, 'report']);
-        $server->on('method:ACL',          [$this, 'httpAcl']);
-        $server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
+        $server->on('propFind', [$this, 'propFind'], 20);
+        $server->on('beforeMethod', [$this, 'beforeMethod'], 20);
+        $server->on('beforeBind', [$this, 'beforeBind'], 20);
+        $server->on('beforeUnbind', [$this, 'beforeUnbind'], 20);
+        $server->on('propPatch', [$this, 'propPatch']);
+        $server->on('beforeUnlock', [$this, 'beforeUnlock'], 20);
+        $server->on('report', [$this, 'report']);
+        $server->on('method:ACL', [$this, 'httpAcl']);
+        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
 
         array_push($server->protectedProperties,
             '{DAV:}alternate-URI-set',

Braces +49 added lines, -25 removed lines

@@ -184,7 +184,9 @@ 
      */
     function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 
-        if (!is_array($privileges)) $privileges = [$privileges];
+        if (!is_array($privileges)) {
+        	$privileges = [$privileges];
+        }
 
         $acl = $this->getCurrentUserPrivilegeSet($uri);
 
@@ -192,10 +194,11 @@ 
             if ($this->allowAccessToNodesWithoutACL) {
                 return true;
             } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri, $privileges);
-                else
-                    return false;
+                if ($throwExceptions) {
+                                    throw new Exception\NeedPrivileges($uri, $privileges);
+                } else {
+                                    return false;
+                }
 
             }
         }
@@ -210,10 +213,11 @@ 
         }
 
         if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri, $failed);
-            else
-                return false;
+            if ($throwExceptions) {
+                            throw new Exception\NeedPrivileges($uri, $failed);
+            } else {
+                            return false;
+            }
         }
         return true;
 
@@ -230,7 +234,9 @@ 
     function getCurrentUserPrincipal() {
 
         $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
+        if (is_null($authPlugin)) {
+        	return null;
+        }
         /** @var $authPlugin Sabre\DAV\Auth\Plugin */
 
         return $authPlugin->getCurrentPrincipal();
@@ -248,7 +254,9 @@ 
 
         $currentUser = $this->getCurrentUserPrincipal();
 
-        if (is_null($currentUser)) return [];
+        if (is_null($currentUser)) {
+        	return [];
+        }
 
         return array_merge(
             [$currentUser],
@@ -331,8 +339,9 @@ 
         if ($node instanceof IACL) {
             $result = $node->getSupportedPrivilegeSet();
 
-            if ($result)
-                return $result;
+            if ($result) {
+                            return $result;
+            }
         }
 
         return self::getDefaultSupportedPrivilegeSet();
@@ -506,7 +515,9 @@ 
 
         $acl = $this->getACL($node);
 
-        if (is_null($acl)) return null;
+        if (is_null($acl)) {
+        	return null;
+        }
 
         $principals = $this->getCurrentUserPrincipals();
 
@@ -730,7 +741,9 @@ 
         $exists = $this->server->tree->nodeExists($path);
 
         // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
+        if (!$exists) {
+        	return;
+        }
 
         switch ($method) {
 
@@ -891,7 +904,9 @@ 
 
             $val = $this->principalCollectionSet;
             // Ensuring all collections end with a slash
-            foreach ($val as $k => $v) $val[$k] = $v . '/';
+            foreach ($val as $k => $v) {
+            	$val[$k] = $v . '/';
+            }
             return new DAV\Xml\Property\Href($val);
 
         });
@@ -1042,7 +1057,9 @@ 
            not overwritten. */
         foreach ($oldAcl as $oldAce) {
 
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+            if (!isset($oldAce['protected']) || !$oldAce['protected']) {
+            	continue;
+            }
 
             $found = false;
             foreach ($newAcl as $newAce) {
@@ -1050,12 +1067,14 @@ 
                     $newAce['privilege'] === $oldAce['privilege'] &&
                     $newAce['principal'] === $oldAce['principal'] &&
                     $newAce['protected']
-                )
-                $found = true;
+                ) {
+                                $found = true;
+                }
             }
 
-            if (!$found)
-                throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+            if (!$found) {
+                            throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+            }
 
         }
 
@@ -1146,11 +1165,15 @@ 
             foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
 
                 // We're only traversing if sub-properties were requested
-                if (count($childRequestedProperties) === 0) continue;
+                if (count($childRequestedProperties) === 0) {
+                	continue;
+                }
 
                 // We only have to do the expansion if the property was found
                 // and it contains an href element.
-                if (!array_key_exists($propertyName, $node[200])) continue;
+                if (!array_key_exists($propertyName, $node[200])) {
+                	continue;
+                }
 
                 if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
                     continue;
@@ -1282,8 +1305,9 @@ 
      */
     function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof PrincipalCollection)
-            return;
+        if (!$node instanceof PrincipalCollection) {
+                    return;
+        }
 
         $output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new principal</h3>

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\DAV\INode;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\INode;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\Uri;

Indentation +1255 added lines, -1255 removed lines

@@ -25,1265 +25,1265 @@ 
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object.
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere.
-     *
-     * @var array
-     */
-    public $principalCollectionSet = [
-        'principals',
-    ];
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this
-     * to true will cause these nodes to be hidden from directory listings.
-     *
-     * @var bool
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This list of properties are the properties a client can search on using
-     * the {DAV:}principal-property-search report.
-     *
-     * The keys are the property names, values are descriptions.
-     *
-     * @var array
-     */
-    public $principalSearchPropertySet = [
-        '{DAV:}displayname'                     => 'Display name',
-        '{http://sabredav.org/ns}email-address' => 'Email address',
-    ];
-
-    /**
-     * Any principal uri's added here, will automatically be added to the list
-     * of ACL's. They will effectively receive {DAV:}all privileges, as a
-     * protected privilege.
-     *
-     * @var array
-     */
-    public $adminPrincipals = [];
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return ['access-control', 'calendarserver-principal-property-search'];
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getMethods($uri) {
-
-        return ['ACL'];
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return [
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set',
-        ];
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s).
-     *
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't throw exceptions.
-     * @throws Sabre\DAVACL\Exception\NeedPrivileges
-     * @return bool
-     */
-    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = [$privileges];
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri, $privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = [];
-        foreach ($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri, $failed);
-            else
-                return false;
-        }
-        return true;
+	/**
+	 * Recursion constants
+	 *
+	 * This only checks the base node
+	 */
+	const R_PARENT = 1;
+
+	/**
+	 * Recursion constants
+	 *
+	 * This checks every node in the tree
+	 */
+	const R_RECURSIVE = 2;
+
+	/**
+	 * Recursion constants
+	 *
+	 * This checks every parentnode in the tree, but not leaf-nodes.
+	 */
+	const R_RECURSIVEPARENTS = 3;
+
+	/**
+	 * Reference to server object.
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * List of urls containing principal collections.
+	 * Modify this if your principals are located elsewhere.
+	 *
+	 * @var array
+	 */
+	public $principalCollectionSet = [
+		'principals',
+	];
+
+	/**
+	 * By default ACL is only enforced for nodes that have ACL support (the
+	 * ones that implement IACL). For any other node, access is
+	 * always granted.
+	 *
+	 * To override this behaviour you can turn this setting off. This is useful
+	 * if you plan to fully support ACL in the entire tree.
+	 *
+	 * @var bool
+	 */
+	public $allowAccessToNodesWithoutACL = true;
+
+	/**
+	 * By default nodes that are inaccessible by the user, can still be seen
+	 * in directory listings (PROPFIND on parent with Depth: 1)
+	 *
+	 * In certain cases it's desirable to hide inaccessible nodes. Setting this
+	 * to true will cause these nodes to be hidden from directory listings.
+	 *
+	 * @var bool
+	 */
+	public $hideNodesFromListings = false;
+
+	/**
+	 * This list of properties are the properties a client can search on using
+	 * the {DAV:}principal-property-search report.
+	 *
+	 * The keys are the property names, values are descriptions.
+	 *
+	 * @var array
+	 */
+	public $principalSearchPropertySet = [
+		'{DAV:}displayname'                     => 'Display name',
+		'{http://sabredav.org/ns}email-address' => 'Email address',
+	];
+
+	/**
+	 * Any principal uri's added here, will automatically be added to the list
+	 * of ACL's. They will effectively receive {DAV:}all privileges, as a
+	 * protected privilege.
+	 *
+	 * @var array
+	 */
+	public $adminPrincipals = [];
+
+	/**
+	 * Returns a list of features added by this plugin.
+	 *
+	 * This list is used in the response of a HTTP OPTIONS request.
+	 *
+	 * @return array
+	 */
+	public function getFeatures() {
+
+		return ['access-control', 'calendarserver-principal-property-search'];
+
+	}
+
+	/**
+	 * Returns a list of available methods for a given url
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getMethods($uri) {
+
+		return ['ACL'];
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'acl';
+
+	}
+
+	/**
+	 * Returns a list of reports this plugin supports.
+	 *
+	 * This will be used in the {DAV:}supported-report-set property.
+	 * Note that you still need to subscribe to the 'report' event to actually
+	 * implement them
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri) {
+
+		return [
+			'{DAV:}expand-property',
+			'{DAV:}principal-property-search',
+			'{DAV:}principal-search-property-set',
+		];
+
+	}
+
+
+	/**
+	 * Checks if the current user has the specified privilege(s).
+	 *
+	 * You can specify a single privilege, or a list of privileges.
+	 * This method will throw an exception if the privilege is not available
+	 * and return true otherwise.
+	 *
+	 * @param string $uri
+	 * @param array|string $privileges
+	 * @param int $recursion
+	 * @param bool $throwExceptions if set to false, this method won't throw exceptions.
+	 * @throws Sabre\DAVACL\Exception\NeedPrivileges
+	 * @return bool
+	 */
+	public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+
+		if (!is_array($privileges)) $privileges = [$privileges];
+
+		$acl = $this->getCurrentUserPrivilegeSet($uri);
+
+		if (is_null($acl)) {
+			if ($this->allowAccessToNodesWithoutACL) {
+				return true;
+			} else {
+				if ($throwExceptions)
+					throw new Exception\NeedPrivileges($uri, $privileges);
+				else
+					return false;
+
+			}
+		}
+
+		$failed = [];
+		foreach ($privileges as $priv) {
+
+			if (!in_array($priv, $acl)) {
+				$failed[] = $priv;
+			}
+
+		}
+
+		if ($failed) {
+			if ($throwExceptions)
+				throw new Exception\NeedPrivileges($uri, $failed);
+			else
+				return false;
+		}
+		return true;
 
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
-
-        return $authPlugin->getCurrentPrincipal();
-
-    }
-
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership.
-     *
-     * @return array
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return [];
-
-        return array_merge(
-            [$currentUser],
-            $this->getPrincipalMembership($currentUser)
-        );
-
-    }
-
-    /**
-     * This array holds a cache for all the principals that are associated with
-     * a single principal.
-     *
-     * @var array
-     */
-    protected $principalMembershipCache = [];
-
-
-    /**
-     * Returns all the principal groups the specified principal is a member of.
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getPrincipalMembership($mainPrincipal) {
-
-        // First check our cache
-        if (isset($this->principalMembershipCache[$mainPrincipal])) {
-            return $this->principalMembershipCache[$mainPrincipal];
-        }
-
-        $check = [$mainPrincipal];
-        $principals = [];
-
-        while (count($check)) {
-
-            $principal = array_shift($check);
-
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof IPrincipal) {
-                foreach ($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        // Store the result in the cache
-        $this->principalMembershipCache[$mainPrincipal] = $principals;
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
-     *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
-     *
-     * @param string|INode $node
-     * @return array
-     */
-    public function getSupportedPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        if ($node instanceof IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
-        }
-
-        return self::getDefaultSupportedPrivilegeSet();
-
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return [
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => [
-                [
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => false,
-                        ],
-                    ],
-                ], // {DAV:}read
-                [
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => false,
-                        ],
-                    ],
-                ], // {DAV:}write
-            ],
-        ]; // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     *
-     * @param string|INode $node
-     * @return array
-     */
-    final function getFlatPrivilegeSet($node) {
-
-        $privs = $this->getSupportedPrivilegeSet($node);
-
-        $fpsTraverse = null;
-        $fpsTraverse = function($priv, $concrete, &$flat) use (&$fpsTraverse) {
-
-            $myPriv = [
-                'privilege'  => $priv['privilege'],
-                'abstract'   => isset($priv['abstract']) && $priv['abstract'],
-                'aggregates' => [],
-                'concrete'   => isset($priv['abstract']) && $priv['abstract'] ? $concrete : $priv['privilege'],
-            ];
-
-            if (isset($priv['aggregates'])) {
-
-                foreach ($priv['aggregates'] as $subPriv) {
-
-                    $myPriv['aggregates'][] = $subPriv['privilege'];
-
-                }
-
-            }
-
-            $flat[$priv['privilege']] = $myPriv;
-
-            if (isset($priv['aggregates'])) {
-
-                foreach ($priv['aggregates'] as $subPriv) {
-
-                    $fpsTraverse($subPriv, $myPriv['concrete'], $flat);
-
-                }
-
-            }
-
-        };
-
-        $flat = [];
-        $fpsTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if (!$node instanceof IACL) {
-            return null;
-        }
-        $acl = $node->getACL();
-        foreach ($this->adminPrincipals as $adminPrincipal) {
-            $acl[] = [
-                'principal' => $adminPrincipal,
-                'privilege' => '{DAV:}all',
-                'protected' => true,
-            ];
-        }
-        return $acl;
+	}
+
+	/**
+	 * Returns the standard users' principal.
+	 *
+	 * This is one authorative principal url for the current user.
+	 * This method will return null if the user wasn't logged in.
+	 *
+	 * @return string|null
+	 */
+	public function getCurrentUserPrincipal() {
+
+		$authPlugin = $this->server->getPlugin('auth');
+		if (is_null($authPlugin)) return null;
+		/** @var $authPlugin Sabre\DAV\Auth\Plugin */
+
+		return $authPlugin->getCurrentPrincipal();
+
+	}
+
+
+	/**
+	 * Returns a list of principals that's associated to the current
+	 * user, either directly or through group membership.
+	 *
+	 * @return array
+	 */
+	public function getCurrentUserPrincipals() {
+
+		$currentUser = $this->getCurrentUserPrincipal();
+
+		if (is_null($currentUser)) return [];
+
+		return array_merge(
+			[$currentUser],
+			$this->getPrincipalMembership($currentUser)
+		);
+
+	}
+
+	/**
+	 * This array holds a cache for all the principals that are associated with
+	 * a single principal.
+	 *
+	 * @var array
+	 */
+	protected $principalMembershipCache = [];
+
+
+	/**
+	 * Returns all the principal groups the specified principal is a member of.
+	 *
+	 * @param string $principal
+	 * @return array
+	 */
+	public function getPrincipalMembership($mainPrincipal) {
+
+		// First check our cache
+		if (isset($this->principalMembershipCache[$mainPrincipal])) {
+			return $this->principalMembershipCache[$mainPrincipal];
+		}
+
+		$check = [$mainPrincipal];
+		$principals = [];
+
+		while (count($check)) {
+
+			$principal = array_shift($check);
+
+			$node = $this->server->tree->getNodeForPath($principal);
+			if ($node instanceof IPrincipal) {
+				foreach ($node->getGroupMembership() as $groupMember) {
+
+					if (!in_array($groupMember, $principals)) {
+
+						$check[] = $groupMember;
+						$principals[] = $groupMember;
+
+					}
+
+				}
+
+			}
+
+		}
+
+		// Store the result in the cache
+		$this->principalMembershipCache[$mainPrincipal] = $principals;
+
+		return $principals;
+
+	}
+
+	/**
+	 * Returns the supported privilege structure for this ACL plugin.
+	 *
+	 * See RFC3744 for more details. Currently we default on a simple,
+	 * standard structure.
+	 *
+	 * You can either get the list of privileges by a uri (path) or by
+	 * specifying a Node.
+	 *
+	 * @param string|INode $node
+	 * @return array
+	 */
+	public function getSupportedPrivilegeSet($node) {
+
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
+
+		if ($node instanceof IACL) {
+			$result = $node->getSupportedPrivilegeSet();
+
+			if ($result)
+				return $result;
+		}
+
+		return self::getDefaultSupportedPrivilegeSet();
+
+	}
+
+	/**
+	 * Returns a fairly standard set of privileges, which may be useful for
+	 * other systems to use as a basis.
+	 *
+	 * @return array
+	 */
+	static function getDefaultSupportedPrivilegeSet() {
+
+		return [
+			'privilege'  => '{DAV:}all',
+			'abstract'   => true,
+			'aggregates' => [
+				[
+					'privilege'  => '{DAV:}read',
+					'aggregates' => [
+						[
+							'privilege' => '{DAV:}read-acl',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}read-current-user-privilege-set',
+							'abstract'  => false,
+						],
+					],
+				], // {DAV:}read
+				[
+					'privilege'  => '{DAV:}write',
+					'aggregates' => [
+						[
+							'privilege' => '{DAV:}write-acl',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}write-properties',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}write-content',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}bind',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}unbind',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}unlock',
+							'abstract'  => false,
+						],
+					],
+				], // {DAV:}write
+			],
+		]; // {DAV:}all
+
+	}
+
+	/**
+	 * Returns the supported privilege set as a flat list
+	 *
+	 * This is much easier to parse.
+	 *
+	 * The returned list will be index by privilege name.
+	 * The value is a struct containing the following properties:
+	 *   - aggregates
+	 *   - abstract
+	 *   - concrete
+	 *
+	 * @param string|INode $node
+	 * @return array
+	 */
+	final function getFlatPrivilegeSet($node) {
+
+		$privs = $this->getSupportedPrivilegeSet($node);
+
+		$fpsTraverse = null;
+		$fpsTraverse = function($priv, $concrete, &$flat) use (&$fpsTraverse) {
+
+			$myPriv = [
+				'privilege'  => $priv['privilege'],
+				'abstract'   => isset($priv['abstract']) && $priv['abstract'],
+				'aggregates' => [],
+				'concrete'   => isset($priv['abstract']) && $priv['abstract'] ? $concrete : $priv['privilege'],
+			];
+
+			if (isset($priv['aggregates'])) {
+
+				foreach ($priv['aggregates'] as $subPriv) {
+
+					$myPriv['aggregates'][] = $subPriv['privilege'];
+
+				}
+
+			}
+
+			$flat[$priv['privilege']] = $myPriv;
+
+			if (isset($priv['aggregates'])) {
+
+				foreach ($priv['aggregates'] as $subPriv) {
+
+					$fpsTraverse($subPriv, $myPriv['concrete'], $flat);
+
+				}
+
+			}
+
+		};
+
+		$flat = [];
+		$fpsTraverse($privs, null, $flat);
+
+		return $flat;
+
+	}
+
+	/**
+	 * Returns the full ACL list.
+	 *
+	 * Either a uri or a INode may be passed.
+	 *
+	 * null will be returned if the node doesn't support ACLs.
+	 *
+	 * @param string|DAV\INode $node
+	 * @return array
+	 */
+	public function getACL($node) {
+
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
+		if (!$node instanceof IACL) {
+			return null;
+		}
+		$acl = $node->getACL();
+		foreach ($this->adminPrincipals as $adminPrincipal) {
+			$acl[] = [
+				'principal' => $adminPrincipal,
+				'privilege' => '{DAV:}all',
+				'protected' => true,
+			];
+		}
+		return $acl;
 
-    }
+	}
 
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a DAV\INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getCurrentUserPrivilegeSet($node) {
+	/**
+	 * Returns a list of privileges the current user has
+	 * on a particular node.
+	 *
+	 * Either a uri or a DAV\INode may be passed.
+	 *
+	 * null will be returned if the node doesn't support ACLs.
+	 *
+	 * @param string|DAV\INode $node
+	 * @return array
+	 */
+	public function getCurrentUserPrivilegeSet($node) {
 
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
 
-        $acl = $this->getACL($node);
+		$acl = $this->getACL($node);
 
-        if (is_null($acl)) return null;
+		if (is_null($acl)) return null;
 
-        $principals = $this->getCurrentUserPrincipals();
+		$principals = $this->getCurrentUserPrincipals();
 
-        $collected = [];
+		$collected = [];
 
-        foreach ($acl as $ace) {
+		foreach ($acl as $ace) {
 
-            $principal = $ace['principal'];
+			$principal = $ace['principal'];
 
-            switch ($principal) {
+			switch ($principal) {
 
-                case '{DAV:}owner' :
-                    $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
+				case '{DAV:}owner' :
+					$owner = $node->getOwner();
+					if ($owner && in_array($owner, $principals)) {
+						$collected[] = $ace;
+					}
+					break;
 
 
-                // 'all' matches for every user
-                case '{DAV:}all' :
+				// 'all' matches for every user
+				case '{DAV:}all' :
 
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
-                    $collected[] = $ace;
-                    break;
-
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
-                case '{DAV:}unauthenticated' :
-                    break;
-
-                default :
-                    if (in_array($ace['principal'], $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-            }
-
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet($node);
-
-        $collected2 = [];
-        while (count($collected)) {
-
-            $current = array_pop($collected);
-            $collected2[] = $current['privilege'];
-
-            foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
-                $collected2[] = $subPriv;
-                $collected[] = $flat[$subPriv];
-            }
-
-        }
-
-        return array_values(array_unique($collected2));
-
-    }
-
-
-    /**
-     * Returns a principal based on its uri.
-     *
-     * Returns null if the principal could not be found.
-     *
-     * @param string $uri
-     * @return null|string
-     */
-    public function getPrincipalByUri($uri) {
-
-        $result = null;
-        $collections = $this->principalCollectionSet;
-        foreach ($collections as $collection) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($collection);
-            if (!$principalCollection instanceof IPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $result = $principalCollection->findByUri($uri);
-            if ($result) {
-                return $result;
-            }
-
-        }
-
-    }
-
-    /**
-     * Principal property search
-     *
-     * This method can search for principals matching certain values in
-     * properties.
-     *
-     * This method will return a list of properties for the matched properties.
-     *
-     * @param array $searchProperties    The properties to search on. This is a
-     *                                   key-value list. The keys are property
-     *                                   names, and the values the strings to
-     *                                   match them on.
-     * @param array $requestedProperties This is the list of properties to
-     *                                   return for every match.
-     * @param string $collectionUri      The principal collection to search on.
-     *                                   If this is ommitted, the standard
-     *                                   principal collection-set will be used.
-     * @param string $test               "allof" to use AND to search the
-     *                                   properties. 'anyof' for OR.
-     * @return array     This method returns an array structure similar to
-     *                  Sabre\DAV\Server::getPropertiesForPath. Returned
-     *                  properties are index by a HTTP status code.
-     */
-    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null, $test = 'allof') {
-
-        if (!is_null($collectionUri)) {
-            $uris = [$collectionUri];
-        } else {
-            $uris = $this->principalCollectionSet;
-        }
-
-        $lookupResults = [];
-        foreach ($uris as $uri) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($uri);
-            if (!$principalCollection instanceof IPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $results = $principalCollection->searchPrincipals($searchProperties, $test);
-            foreach ($results as $result) {
-                $lookupResults[] = rtrim($uri, '/') . '/' . $result;
-            }
-
-        }
-
-        $matches = [];
-
-        foreach ($lookupResults as $lookupResult) {
-
-            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
-
-        }
-
-        return $matches;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->on('propFind',            [$this, 'propFind'], 20);
-        $server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
-        $server->on('beforeBind',          [$this, 'beforeBind'], 20);
-        $server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
-        $server->on('propPatch',           [$this, 'propPatch']);
-        $server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
-        $server->on('report',              [$this, 'report']);
-        $server->on('method:ACL',          [$this, 'httpAcl']);
-        $server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property
-        // 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';
-        $server->xml->elementMap['{DAV:}principal-property-search'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport';
-        $server->xml->elementMap['{DAV:}principal-search-property-set'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport';
-
-    }
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-
-        $method = $request->getMethod();
-        $path = $request->getPath();
-
-        $exists = $this->server->tree->nodeExists($path);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch ($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($path, '{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' :
-                // This method requires the write-content priv if the node
-                // already exists, and bind on the parent if the node is being
-                // created.
-                // The bind privilege is handled in the beforeBind event.
-                $this->checkPrivileges($path, '{DAV:}write-content');
-                break;
-
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($path, '{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($path, '{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be
-                // checked, however, we're deleting the node beforehand and
-                // creating a new one after, so this is handled by the
-                // beforeUnbind event.
-                //
-                // The creation of the new node is handled by the beforeBind
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if
-                // the sourcenode can be deleted.
-                $this->checkPrivileges($path, '{DAV:}read', self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     *
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri) = Uri\split($uri);
-        $this->checkPrivileges($parentUri, '{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted
-     *
-     * This allows us to check permissions for any operation that will delete
-     * an existing node.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri) = Uri\split($uri);
-        $this->checkPrivileges($parentUri, '{DAV:}unbind', self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked.
-     *
-     * @param string $uri
-     * @param DAV\Locks\LockInfo $lock
-     * @return void
-     */
-    public function beforeUnlock($uri, DAV\Locks\LockInfo $lock) {
-
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return bool
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
-
-        $path = $propFind->getPath();
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false)) {
-            // User is not allowed to read properties
-
-            // Returning false causes the property-fetching system to pretend
-            // that the node does not exist, and will cause it to be hidden
-            // from listings such as PROPFIND or the browser plugin.
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Otherwise we simply mark every property as 403.
-            foreach ($propFind->getRequestedProperties() as $requestedProperty) {
-                $propFind->set($requestedProperty, null, 403);
-            }
-
-            return;
-
-        }
-
-        /* Adding principal properties */
-        if ($node instanceof IPrincipal) {
-
-            $propFind->handle('{DAV:}alternate-URI-set', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getAlternateUriSet());
-            });
-            $propFind->handle('{DAV:}principal-URL', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getPrincipalUrl() . '/');
-            });
-            $propFind->handle('{DAV:}group-member-set', function() use ($node) {
-                $members = $node->getGroupMemberSet();
-                foreach ($members as $k => $member) {
-                    $members[$k] = rtrim($member, '/') . '/';
-                }
-                return new DAV\Xml\Property\Href($members);
-            });
-            $propFind->handle('{DAV:}group-membership', function() use ($node) {
-                $members = $node->getGroupMembership();
-                foreach ($members as $k => $member) {
-                    $members[$k] = rtrim($member, '/') . '/';
-                }
-                return new DAV\Xml\Property\Href($members);
-            });
-            $propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
-
-        }
-
-        $propFind->handle('{DAV:}principal-collection-set', function() {
-
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach ($val as $k => $v) $val[$k] = $v . '/';
-            return new DAV\Xml\Property\Href($val);
-
-        });
-        $propFind->handle('{DAV:}current-user-principal', function() {
-            if ($url = $this->getCurrentUserPrincipal()) {
-                return new Xml\Property\Principal(Xml\Property\Principal::HREF, $url . '/');
-            } else {
-                return new Xml\Property\Principal(Xml\Property\Principal::UNAUTHENTICATED);
-            }
-        });
-        $propFind->handle('{DAV:}supported-privilege-set', function() use ($node) {
-            return new Xml\Property\SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
-        });
-        $propFind->handle('{DAV:}current-user-privilege-set', function() use ($node, $propFind, $path) {
-            if (!$this->checkPrivileges($path, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $propFind->set('{DAV:}current-user-privilege-set', null, 403);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    return new Xml\Property\CurrentUserPrivilegeSet($val);
-                }
-            }
-        });
-        $propFind->handle('{DAV:}acl', function() use ($node, $propFind, $path) {
-            /* The ACL property contains all the permissions */
-            if (!$this->checkPrivileges($path, '{DAV:}read-acl', self::R_PARENT, false)) {
-                $propFind->set('{DAV:}acl', null, 403);
-            } else {
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    return new Xml\Property\Acl($this->getACL($node));
-                }
-            }
-        });
-        $propFind->handle('{DAV:}acl-restrictions', function() {
-            return new Xml\Property\AclRestrictions();
-        });
-
-        /* Adding ACL properties */
-        if ($node instanceof IACL) {
-            $propFind->handle('{DAV:}owner', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getOwner() . '/');
-            });
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the
-     * group-member-set is updated correctly.
-     *
-     * @param string $path
-     * @param DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, DAV\PropPatch $propPatch) {
-
-        $propPatch->handle('{DAV:}group-member-set', function($value) use ($path) {
-            if (is_null($value)) {
-                $memberSet = [];
-            } elseif ($value instanceof DAV\Xml\Property\Href) {
-                $memberSet = array_map(
-                    [$this->server, 'calculateUri'],
-                    $value->getHrefs()
-                );
-            } else {
-                throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
-            }
-            $node = $this->server->tree->getNodeForPath($path);
-            if (!($node instanceof IPrincipal)) {
-                // Fail
-                return false;
-            }
-
-            $node->setGroupMemberSet($memberSet);
-            // We must also clear our cache, just in case
-
-            $this->principalMembershipCache = [];
-
-            return true;
-        });
-
-    }
-
-    /**
-     * This method handles HTTP REPORT requests
-     *
-     * @param string $reportName
-     * @param mixed $report
-     * @param mixed $path
-     * @return bool
-     */
-    public function report($reportName, $report, $path) {
-
-        switch ($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->server->transactionType = 'report-principal-property-search';
-                $this->principalPropertySearchReport($report);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->server->transactionType = 'report-principal-search-property-set';
-                $this->principalSearchPropertySetReport($report);
-                return false;
-            case '{DAV:}expand-property' :
-                $this->server->transactionType = 'report-expand-property';
-                $this->expandPropertyReport($report);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpAcl(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-        $body = $request->getBodyAsString();
-
-        if (!$body) {
-            throw new DAV\Exception\BadRequest('XML body expected in ACL request');
-        }
-
-        $acl = $this->server->xml->expect('{DAV:}acl', $body);
-        $newAcl = $acl->getPrivileges();
-
-        // Normalizing urls
-        foreach ($newAcl as $k => $newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!$node instanceof IACL) {
-            throw new DAV\Exception\MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
-
-        /* Checking if protected principals from the existing principal set are
+				// 'authenticated' matched for every user that's logged in.
+				// Since it's not possible to use ACL while not being logged
+				// in, this is also always true.
+				case '{DAV:}authenticated' :
+					$collected[] = $ace;
+					break;
+
+				// 'unauthenticated' can never occur either, so we simply
+				// ignore these.
+				case '{DAV:}unauthenticated' :
+					break;
+
+				default :
+					if (in_array($ace['principal'], $principals)) {
+						$collected[] = $ace;
+					}
+					break;
+
+			}
+
+
+		}
+
+		// Now we deduct all aggregated privileges.
+		$flat = $this->getFlatPrivilegeSet($node);
+
+		$collected2 = [];
+		while (count($collected)) {
+
+			$current = array_pop($collected);
+			$collected2[] = $current['privilege'];
+
+			foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
+				$collected2[] = $subPriv;
+				$collected[] = $flat[$subPriv];
+			}
+
+		}
+
+		return array_values(array_unique($collected2));
+
+	}
+
+
+	/**
+	 * Returns a principal based on its uri.
+	 *
+	 * Returns null if the principal could not be found.
+	 *
+	 * @param string $uri
+	 * @return null|string
+	 */
+	public function getPrincipalByUri($uri) {
+
+		$result = null;
+		$collections = $this->principalCollectionSet;
+		foreach ($collections as $collection) {
+
+			$principalCollection = $this->server->tree->getNodeForPath($collection);
+			if (!$principalCollection instanceof IPrincipalCollection) {
+				// Not a principal collection, we're simply going to ignore
+				// this.
+				continue;
+			}
+
+			$result = $principalCollection->findByUri($uri);
+			if ($result) {
+				return $result;
+			}
+
+		}
+
+	}
+
+	/**
+	 * Principal property search
+	 *
+	 * This method can search for principals matching certain values in
+	 * properties.
+	 *
+	 * This method will return a list of properties for the matched properties.
+	 *
+	 * @param array $searchProperties    The properties to search on. This is a
+	 *                                   key-value list. The keys are property
+	 *                                   names, and the values the strings to
+	 *                                   match them on.
+	 * @param array $requestedProperties This is the list of properties to
+	 *                                   return for every match.
+	 * @param string $collectionUri      The principal collection to search on.
+	 *                                   If this is ommitted, the standard
+	 *                                   principal collection-set will be used.
+	 * @param string $test               "allof" to use AND to search the
+	 *                                   properties. 'anyof' for OR.
+	 * @return array     This method returns an array structure similar to
+	 *                  Sabre\DAV\Server::getPropertiesForPath. Returned
+	 *                  properties are index by a HTTP status code.
+	 */
+	public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null, $test = 'allof') {
+
+		if (!is_null($collectionUri)) {
+			$uris = [$collectionUri];
+		} else {
+			$uris = $this->principalCollectionSet;
+		}
+
+		$lookupResults = [];
+		foreach ($uris as $uri) {
+
+			$principalCollection = $this->server->tree->getNodeForPath($uri);
+			if (!$principalCollection instanceof IPrincipalCollection) {
+				// Not a principal collection, we're simply going to ignore
+				// this.
+				continue;
+			}
+
+			$results = $principalCollection->searchPrincipals($searchProperties, $test);
+			foreach ($results as $result) {
+				$lookupResults[] = rtrim($uri, '/') . '/' . $result;
+			}
+
+		}
+
+		$matches = [];
+
+		foreach ($lookupResults as $lookupResult) {
+
+			list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
+
+		}
+
+		return $matches;
+
+	}
+
+	/**
+	 * Sets up the plugin
+	 *
+	 * This method is automatically called by the server class.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->on('propFind',            [$this, 'propFind'], 20);
+		$server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
+		$server->on('beforeBind',          [$this, 'beforeBind'], 20);
+		$server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
+		$server->on('propPatch',           [$this, 'propPatch']);
+		$server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
+		$server->on('report',              [$this, 'report']);
+		$server->on('method:ACL',          [$this, 'httpAcl']);
+		$server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
+
+		array_push($server->protectedProperties,
+			'{DAV:}alternate-URI-set',
+			'{DAV:}principal-URL',
+			'{DAV:}group-membership',
+			'{DAV:}principal-collection-set',
+			'{DAV:}current-user-principal',
+			'{DAV:}supported-privilege-set',
+			'{DAV:}current-user-privilege-set',
+			'{DAV:}acl',
+			'{DAV:}acl-restrictions',
+			'{DAV:}inherited-acl-set',
+			'{DAV:}owner',
+			'{DAV:}group'
+		);
+
+		// Automatically mapping nodes implementing IPrincipal to the
+		// {DAV:}principal resourcetype.
+		$server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
+
+		// Mapping the group-member-set property to the HrefList property
+		// 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';
+		$server->xml->elementMap['{DAV:}principal-property-search'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport';
+		$server->xml->elementMap['{DAV:}principal-search-property-set'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport';
+
+	}
+
+	/* {{{ Event handlers */
+
+	/**
+	 * Triggered before any method is handled
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+
+		$method = $request->getMethod();
+		$path = $request->getPath();
+
+		$exists = $this->server->tree->nodeExists($path);
+
+		// If the node doesn't exists, none of these checks apply
+		if (!$exists) return;
+
+		switch ($method) {
+
+			case 'GET' :
+			case 'HEAD' :
+			case 'OPTIONS' :
+				// For these 3 we only need to know if the node is readable.
+				$this->checkPrivileges($path, '{DAV:}read');
+				break;
+
+			case 'PUT' :
+			case 'LOCK' :
+			case 'UNLOCK' :
+				// This method requires the write-content priv if the node
+				// already exists, and bind on the parent if the node is being
+				// created.
+				// The bind privilege is handled in the beforeBind event.
+				$this->checkPrivileges($path, '{DAV:}write-content');
+				break;
+
+
+			case 'PROPPATCH' :
+				$this->checkPrivileges($path, '{DAV:}write-properties');
+				break;
+
+			case 'ACL' :
+				$this->checkPrivileges($path, '{DAV:}write-acl');
+				break;
+
+			case 'COPY' :
+			case 'MOVE' :
+				// Copy requires read privileges on the entire source tree.
+				// If the target exists write-content normally needs to be
+				// checked, however, we're deleting the node beforehand and
+				// creating a new one after, so this is handled by the
+				// beforeUnbind event.
+				//
+				// The creation of the new node is handled by the beforeBind
+				// event.
+				//
+				// If MOVE is used beforeUnbind will also be used to check if
+				// the sourcenode can be deleted.
+				$this->checkPrivileges($path, '{DAV:}read', self::R_RECURSIVE);
+
+				break;
+
+		}
+
+	}
+
+	/**
+	 * Triggered before a new node is created.
+	 *
+	 * This allows us to check permissions for any operation that creates a
+	 * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function beforeBind($uri) {
+
+		list($parentUri) = Uri\split($uri);
+		$this->checkPrivileges($parentUri, '{DAV:}bind');
+
+	}
+
+	/**
+	 * Triggered before a node is deleted
+	 *
+	 * This allows us to check permissions for any operation that will delete
+	 * an existing node.
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function beforeUnbind($uri) {
+
+		list($parentUri) = Uri\split($uri);
+		$this->checkPrivileges($parentUri, '{DAV:}unbind', self::R_RECURSIVEPARENTS);
+
+	}
+
+	/**
+	 * Triggered before a node is unlocked.
+	 *
+	 * @param string $uri
+	 * @param DAV\Locks\LockInfo $lock
+	 * @return void
+	 */
+	public function beforeUnlock($uri, DAV\Locks\LockInfo $lock) {
+
+
+	}
+
+	/**
+	 * Triggered before properties are looked up in specific nodes.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @param array $requestedProperties
+	 * @param array $returnedProperties
+	 * @return bool
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
+
+		$path = $propFind->getPath();
+
+		// Checking the read permission
+		if (!$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false)) {
+			// User is not allowed to read properties
+
+			// Returning false causes the property-fetching system to pretend
+			// that the node does not exist, and will cause it to be hidden
+			// from listings such as PROPFIND or the browser plugin.
+			if ($this->hideNodesFromListings) {
+				return false;
+			}
+
+			// Otherwise we simply mark every property as 403.
+			foreach ($propFind->getRequestedProperties() as $requestedProperty) {
+				$propFind->set($requestedProperty, null, 403);
+			}
+
+			return;
+
+		}
+
+		/* Adding principal properties */
+		if ($node instanceof IPrincipal) {
+
+			$propFind->handle('{DAV:}alternate-URI-set', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getAlternateUriSet());
+			});
+			$propFind->handle('{DAV:}principal-URL', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getPrincipalUrl() . '/');
+			});
+			$propFind->handle('{DAV:}group-member-set', function() use ($node) {
+				$members = $node->getGroupMemberSet();
+				foreach ($members as $k => $member) {
+					$members[$k] = rtrim($member, '/') . '/';
+				}
+				return new DAV\Xml\Property\Href($members);
+			});
+			$propFind->handle('{DAV:}group-membership', function() use ($node) {
+				$members = $node->getGroupMembership();
+				foreach ($members as $k => $member) {
+					$members[$k] = rtrim($member, '/') . '/';
+				}
+				return new DAV\Xml\Property\Href($members);
+			});
+			$propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
+
+		}
+
+		$propFind->handle('{DAV:}principal-collection-set', function() {
+
+			$val = $this->principalCollectionSet;
+			// Ensuring all collections end with a slash
+			foreach ($val as $k => $v) $val[$k] = $v . '/';
+			return new DAV\Xml\Property\Href($val);
+
+		});
+		$propFind->handle('{DAV:}current-user-principal', function() {
+			if ($url = $this->getCurrentUserPrincipal()) {
+				return new Xml\Property\Principal(Xml\Property\Principal::HREF, $url . '/');
+			} else {
+				return new Xml\Property\Principal(Xml\Property\Principal::UNAUTHENTICATED);
+			}
+		});
+		$propFind->handle('{DAV:}supported-privilege-set', function() use ($node) {
+			return new Xml\Property\SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
+		});
+		$propFind->handle('{DAV:}current-user-privilege-set', function() use ($node, $propFind, $path) {
+			if (!$this->checkPrivileges($path, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
+				$propFind->set('{DAV:}current-user-privilege-set', null, 403);
+			} else {
+				$val = $this->getCurrentUserPrivilegeSet($node);
+				if (!is_null($val)) {
+					return new Xml\Property\CurrentUserPrivilegeSet($val);
+				}
+			}
+		});
+		$propFind->handle('{DAV:}acl', function() use ($node, $propFind, $path) {
+			/* The ACL property contains all the permissions */
+			if (!$this->checkPrivileges($path, '{DAV:}read-acl', self::R_PARENT, false)) {
+				$propFind->set('{DAV:}acl', null, 403);
+			} else {
+				$acl = $this->getACL($node);
+				if (!is_null($acl)) {
+					return new Xml\Property\Acl($this->getACL($node));
+				}
+			}
+		});
+		$propFind->handle('{DAV:}acl-restrictions', function() {
+			return new Xml\Property\AclRestrictions();
+		});
+
+		/* Adding ACL properties */
+		if ($node instanceof IACL) {
+			$propFind->handle('{DAV:}owner', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getOwner() . '/');
+			});
+		}
+
+	}
+
+	/**
+	 * This method intercepts PROPPATCH methods and make sure the
+	 * group-member-set is updated correctly.
+	 *
+	 * @param string $path
+	 * @param DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, DAV\PropPatch $propPatch) {
+
+		$propPatch->handle('{DAV:}group-member-set', function($value) use ($path) {
+			if (is_null($value)) {
+				$memberSet = [];
+			} elseif ($value instanceof DAV\Xml\Property\Href) {
+				$memberSet = array_map(
+					[$this->server, 'calculateUri'],
+					$value->getHrefs()
+				);
+			} else {
+				throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
+			}
+			$node = $this->server->tree->getNodeForPath($path);
+			if (!($node instanceof IPrincipal)) {
+				// Fail
+				return false;
+			}
+
+			$node->setGroupMemberSet($memberSet);
+			// We must also clear our cache, just in case
+
+			$this->principalMembershipCache = [];
+
+			return true;
+		});
+
+	}
+
+	/**
+	 * This method handles HTTP REPORT requests
+	 *
+	 * @param string $reportName
+	 * @param mixed $report
+	 * @param mixed $path
+	 * @return bool
+	 */
+	public function report($reportName, $report, $path) {
+
+		switch ($reportName) {
+
+			case '{DAV:}principal-property-search' :
+				$this->server->transactionType = 'report-principal-property-search';
+				$this->principalPropertySearchReport($report);
+				return false;
+			case '{DAV:}principal-search-property-set' :
+				$this->server->transactionType = 'report-principal-search-property-set';
+				$this->principalSearchPropertySetReport($report);
+				return false;
+			case '{DAV:}expand-property' :
+				$this->server->transactionType = 'report-expand-property';
+				$this->expandPropertyReport($report);
+				return false;
+
+		}
+
+	}
+
+	/**
+	 * This method is responsible for handling the 'ACL' event.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpAcl(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+		$body = $request->getBodyAsString();
+
+		if (!$body) {
+			throw new DAV\Exception\BadRequest('XML body expected in ACL request');
+		}
+
+		$acl = $this->server->xml->expect('{DAV:}acl', $body);
+		$newAcl = $acl->getPrivileges();
+
+		// Normalizing urls
+		foreach ($newAcl as $k => $newAce) {
+			$newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
+		}
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!$node instanceof IACL) {
+			throw new DAV\Exception\MethodNotAllowed('This node does not support the ACL method');
+		}
+
+		$oldAcl = $this->getACL($node);
+
+		$supportedPrivileges = $this->getFlatPrivilegeSet($node);
+
+		/* Checking if protected principals from the existing principal set are
            not overwritten. */
-        foreach ($oldAcl as $oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
-
-            $found = false;
-            foreach ($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                )
-                $found = true;
-            }
-
-            if (!$found)
-                throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
+		foreach ($oldAcl as $oldAce) {
+
+			if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+
+			$found = false;
+			foreach ($newAcl as $newAce) {
+				if (
+					$newAce['privilege'] === $oldAce['privilege'] &&
+					$newAce['principal'] === $oldAce['principal'] &&
+					$newAce['protected']
+				)
+				$found = true;
+			}
+
+			if (!$found)
+				throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+
+		}
 
-        foreach ($newAcl as $newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Exception\NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Exception\NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (DAV\Exception\NotFound $e) {
-                throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof IPrincipal)) {
-                throw new Exception\NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            }
+		foreach ($newAcl as $newAce) {
+
+			// Do we recognize the privilege
+			if (!isset($supportedPrivileges[$newAce['privilege']])) {
+				throw new Exception\NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
+			}
+
+			if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
+				throw new Exception\NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
+			}
+
+			// Looking up the principal
+			try {
+				$principal = $this->server->tree->getNodeForPath($newAce['principal']);
+			} catch (DAV\Exception\NotFound $e) {
+				throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
+			}
+			if (!($principal instanceof IPrincipal)) {
+				throw new Exception\NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
+			}
 
-        }
-        $node->setACL($newAcl);
+		}
+		$node->setACL($newAcl);
 
-        $response->setStatus(200);
-
-        // Breaking the event chain, because we handled this method.
-        return false;
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8.
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param Xml\Request\ExpandPropertyReport $report
-     * @return void
-     */
-    protected function expandPropertyReport($report) {
+		$response->setStatus(200);
+
+		// Breaking the event chain, because we handled this method.
+		return false;
+
+	}
+
+	/* }}} */
+
+	/* Reports {{{ */
+
+	/**
+	 * The expand-property report is defined in RFC3253 section 3-8.
+	 *
+	 * This report is very similar to a standard PROPFIND. The difference is
+	 * that it has the additional ability to look at properties containing a
+	 * {DAV:}href element, follow that property and grab additional elements
+	 * there.
+	 *
+	 * Other rfc's, such as ACL rely on this report, so it made sense to put
+	 * it in this plugin.
+	 *
+	 * @param Xml\Request\ExpandPropertyReport $report
+	 * @return void
+	 */
+	protected function expandPropertyReport($report) {
 
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
+		$depth = $this->server->getHTTPDepth(0);
+		$requestUri = $this->server->getRequestUri();
 
-        $result = $this->expandProperties($requestUri, $report->properties, $depth);
+		$result = $this->expandProperties($requestUri, $report->properties, $depth);
 
-        $xml = $this->server->xml->write(
-            '{DAV:}multistatus',
-            new DAV\Xml\Response\MultiStatus($result),
-            $this->server->getBaseUri()
-        );
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setBody($xml);
+		$xml = $this->server->xml->write(
+			'{DAV:}multistatus',
+			new DAV\Xml\Response\MultiStatus($result),
+			$this->server->getBaseUri()
+		);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setBody($xml);
 
-    }
+	}
 
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param int $depth
-     * @return array
-     */
-    protected function expandProperties($path, array $requestedProperties, $depth) {
+	/**
+	 * This method expands all the properties and returns
+	 * a list with property values
+	 *
+	 * @param array $path
+	 * @param array $requestedProperties the list of required properties
+	 * @param int $depth
+	 * @return array
+	 */
+	protected function expandProperties($path, array $requestedProperties, $depth) {
 
-        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
+		$foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
 
-        $result = [];
+		$result = [];
 
-        foreach ($foundProperties as $node) {
-
-            foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if (count($childRequestedProperties) === 0) continue;
-
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName, $node[200])) continue;
-
-                if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
-                    continue;
-                }
-
-                $childHrefs = $node[200][$propertyName]->getHrefs();
-                $childProps = [];
-
-                foreach ($childHrefs as $href) {
-                    // Gathering the result of the children
-                    $childProps[] = [
-                        'name'  => '{DAV:}response',
-                        'value' => $this->expandProperties($href, $childRequestedProperties, 0)[0]
-                    ];
-                }
-
-                // Replacing the property with its expannded form.
-                $node[200][$propertyName] = $childProps;
-
-            }
-            $result[] = new DAV\Xml\Element\Response($node['href'], $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     *
-     * @param Xml\Request\PrincipalSearchPropertySetReport $report
-     * @return void
-     */
-    protected function principalSearchPropertySetReport($report) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth !== 0) {
-            throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $writer = $this->server->xml->getWriter();
-        $writer->openMemory();
-        $writer->startDocument();
-
-        $writer->startElement('{DAV:}principal-search-property-set');
-
-        foreach ($this->principalSearchPropertySet as $propertyName => $description) {
-
-            $writer->startElement('{DAV:}principal-search-property');
-            $writer->startElement('{DAV:}prop');
-
-            $writer->writeElement($propertyName);
-
-            $writer->endElement(); // prop
-
-            if ($description) {
-                $writer->write([[
-                    'name'       => '{DAV:}description',
-                    'value'      => $description,
-                    'attributes' => ['xml:lang' => 'en']
-                ]]);
-            }
-
-            $writer->endElement(); // principal-search-property
-
-
-        }
-
-        $writer->endElement(); // principal-search-property-set
-
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setBody($writer->outputMemory());
-
-    }
+		foreach ($foundProperties as $node) {
+
+			foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
+
+				// We're only traversing if sub-properties were requested
+				if (count($childRequestedProperties) === 0) continue;
+
+				// We only have to do the expansion if the property was found
+				// and it contains an href element.
+				if (!array_key_exists($propertyName, $node[200])) continue;
+
+				if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
+					continue;
+				}
+
+				$childHrefs = $node[200][$propertyName]->getHrefs();
+				$childProps = [];
+
+				foreach ($childHrefs as $href) {
+					// Gathering the result of the children
+					$childProps[] = [
+						'name'  => '{DAV:}response',
+						'value' => $this->expandProperties($href, $childRequestedProperties, 0)[0]
+					];
+				}
+
+				// Replacing the property with its expannded form.
+				$node[200][$propertyName] = $childProps;
+
+			}
+			$result[] = new DAV\Xml\Element\Response($node['href'], $node);
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * principalSearchPropertySetReport
+	 *
+	 * This method responsible for handing the
+	 * {DAV:}principal-search-property-set report. This report returns a list
+	 * of properties the client may search on, using the
+	 * {DAV:}principal-property-search report.
+	 *
+	 * @param Xml\Request\PrincipalSearchPropertySetReport $report
+	 * @return void
+	 */
+	protected function principalSearchPropertySetReport($report) {
+
+		$httpDepth = $this->server->getHTTPDepth(0);
+		if ($httpDepth !== 0) {
+			throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
+		}
+
+		$writer = $this->server->xml->getWriter();
+		$writer->openMemory();
+		$writer->startDocument();
+
+		$writer->startElement('{DAV:}principal-search-property-set');
+
+		foreach ($this->principalSearchPropertySet as $propertyName => $description) {
+
+			$writer->startElement('{DAV:}principal-search-property');
+			$writer->startElement('{DAV:}prop');
+
+			$writer->writeElement($propertyName);
+
+			$writer->endElement(); // prop
+
+			if ($description) {
+				$writer->write([[
+					'name'       => '{DAV:}description',
+					'value'      => $description,
+					'attributes' => ['xml:lang' => 'en']
+				]]);
+			}
+
+			$writer->endElement(); // principal-search-property
+
+
+		}
+
+		$writer->endElement(); // principal-search-property-set
+
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setBody($writer->outputMemory());
+
+	}
 
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is responsible for handing the
-     * {DAV:}principal-property-search report. This report can be used for
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     *
-     * @param Xml\Request\PrincipalPropertySearchReport $report
-     * @return void
-     */
-    protected function principalPropertySearchReport($report) {
-
-        $uri = null;
-        if (!$report->applyToPrincipalCollectionSet) {
-            $uri = $this->server->httpRequest->getPath();
-        }
-        if ($this->server->getHttpDepth('0') !== 0) {
-            throw new BadRequest('Depth must be 0');
-        }
-        $result = $this->principalSearch(
-            $report->searchProperties,
-            $report->properties,
-            $uri,
-            $report->test
-        );
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param DAV\INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof PrincipalCollection)
-            return;
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	/**
+	 * principalPropertySearchReport
+	 *
+	 * This method is responsible for handing the
+	 * {DAV:}principal-property-search report. This report can be used for
+	 * clients to search for groups of principals, based on the value of one
+	 * or more properties.
+	 *
+	 * @param Xml\Request\PrincipalPropertySearchReport $report
+	 * @return void
+	 */
+	protected function principalPropertySearchReport($report) {
+
+		$uri = null;
+		if (!$report->applyToPrincipalCollectionSet) {
+			$uri = $this->server->httpRequest->getPath();
+		}
+		if ($this->server->getHttpDepth('0') !== 0) {
+			throw new BadRequest('Depth must be 0');
+		}
+		$result = $this->principalSearch(
+			$report->searchProperties,
+			$report->properties,
+			$uri,
+			$report->test
+		);
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
+
+	}
+
+	/* }}} */
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * DAV\Browser\Plugin. This allows us to generate an interface users
+	 * can use to create new calendars.
+	 *
+	 * @param DAV\INode $node
+	 * @param string $output
+	 * @return bool
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output) {
+
+		if (!$node instanceof PrincipalCollection)
+			return;
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new principal</h3>
             <input type="hidden" name="sabreAction" value="mkcol" />
             <input type="hidden" name="resourceType" value="{DAV:}principal" />
@@ -1294,28 +1294,28 @@ 
             </form>
             </td></tr>';
 
-        return false;
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds support for WebDAV ACL (rfc3744)',
-            'link'        => 'http://sabre.io/dav/acl/',
-        ];
-
-    }
+		return false;
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds support for WebDAV ACL (rfc3744)',
+			'link'        => 'http://sabre.io/dav/acl/',
+		];
+
+	}
 }

libraries/SabreDAV/DAVACL/Principal.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * Creates the principal object
      *
-     * @param IPrincipalBackend $principalBackend
+     * @param PrincipalBackend\BackendInterface $principalBackend
      * @param array $principalProperties
      */
     function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = []) {

Indentation +262 added lines, -262 removed lines

@@ -22,267 +22,267 @@
  */
 class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
 
-    /**
-     * Struct with principal information.
-     *
-     * @var array
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object
-     *
-     * @param IPrincipalBackend $principalBackend
-     * @param array $principalProperties
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = []) {
-
-        if (!isset($principalProperties['uri'])) {
-            throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalProperties['uri'];
-
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        $uris = [];
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris);
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $groupMembers
-     * @return void
-     */
-    public function setGroupMemberSet(array $groupMembers) {
-
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = URLUtil::splitPath($uri);
-        return $name;
-
-    }
-
-    /**
-     * Returns the name of the user
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-
-    }
-
-    /**
-     * Returns a list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $newProperties = [];
-        foreach ($requestedProperties as $propName) {
-
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * Updates properties on this node.
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * To update specific properties, call the 'handle' method on this object.
-     * Read the PropPatch documentation for more information.
-     *
-     * @param DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch(DAV\PropPatch $propPatch) {
-
-        return $this->principalBackend->updatePrincipal(
-            $this->principalProperties['uri'],
-            $propPatch
-        );
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalProperties['uri'];
-
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * Struct with principal information.
+	 *
+	 * @var array
+	 */
+	protected $principalProperties;
+
+	/**
+	 * Principal backend
+	 *
+	 * @var PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * Creates the principal object
+	 *
+	 * @param IPrincipalBackend $principalBackend
+	 * @param array $principalProperties
+	 */
+	public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = []) {
+
+		if (!isset($principalProperties['uri'])) {
+			throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
+		}
+		$this->principalBackend = $principalBackend;
+		$this->principalProperties = $principalProperties;
+
+	}
+
+	/**
+	 * Returns the full principal url
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl() {
+
+		return $this->principalProperties['uri'];
+
+	}
+
+	/**
+	 * Returns a list of alternative urls for a principal
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet() {
+
+		$uris = [];
+		if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
+
+			$uris = $this->principalProperties['{DAV:}alternate-URI-set'];
+
+		}
+
+		if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+			$uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+		}
+
+		return array_unique($uris);
+
+	}
+
+	/**
+	 * Returns the list of group members
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet() {
+
+		return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
+
+	}
+
+	/**
+	 * Returns the list of groups this principal is member of
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership() {
+
+		return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
+
+	}
+
+	/**
+	 * Sets a list of group members
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 *
+	 * @param array $groupMembers
+	 * @return void
+	 */
+	public function setGroupMemberSet(array $groupMembers) {
+
+		$this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
+
+	}
+
+	/**
+	 * Returns this principals name.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		$uri = $this->principalProperties['uri'];
+		list(, $name) = URLUtil::splitPath($uri);
+		return $name;
+
+	}
+
+	/**
+	 * Returns the name of the user
+	 *
+	 * @return string
+	 */
+	public function getDisplayName() {
+
+		if (isset($this->principalProperties['{DAV:}displayname'])) {
+			return $this->principalProperties['{DAV:}displayname'];
+		} else {
+			return $this->getName();
+		}
+
+	}
+
+	/**
+	 * Returns a list of properties
+	 *
+	 * @param array $requestedProperties
+	 * @return array
+	 */
+	public function getProperties($requestedProperties) {
+
+		$newProperties = [];
+		foreach ($requestedProperties as $propName) {
+
+			if (isset($this->principalProperties[$propName])) {
+				$newProperties[$propName] = $this->principalProperties[$propName];
+			}
+
+		}
+
+		return $newProperties;
+
+	}
+
+	/**
+	 * Updates properties on this node.
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * To update specific properties, call the 'handle' method on this object.
+	 * Read the PropPatch documentation for more information.
+	 *
+	 * @param DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch(DAV\PropPatch $propPatch) {
+
+		return $this->principalBackend->updatePrincipal(
+			$this->principalProperties['uri'],
+			$propPatch
+		);
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->principalProperties['uri'];
+
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+
+		return [
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => '{DAV:}authenticated',
+				'protected' => true,
+			],
+		];
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new DAV\Exception\MethodNotAllowed('Updating ACLs is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

libraries/SabreDAV/DAVACL/PrincipalBackend/PDO.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     /**
      * Sets up the backend.
      *
-     * @param PDO $pdo
+     * @param \PDO $pdo
      */
     function __construct(\PDO $pdo) {
 

Spacing +4 added lines, -4 removed lines

@@ -240,7 +240,7 @@ 
      * @return array
      */
     function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-        if (count($searchProperties) == 0) return [];    //No criteria
+        if (count($searchProperties) == 0) return []; //No criteria
 
         $query = sprintf('SELECT uri FROM %s WHERE ', $this->tableName);
         $values = [];
@@ -303,11 +303,11 @@ 
         if ($value == null) return null;
 
         $uri = null;
-        switch ($scheme){
+        switch ($scheme) {
             case "mailto":
                 $query = sprintf('SELECT uri FROM %s WHERE lower(email)=lower(?)', $this->tableName);
                 $stmt = $this->pdo->prepare($query);
-                $stmt->execute([ $value ]);
+                $stmt->execute([$value]);
             
                 while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
                     // Checking if the principal is in the prefix
@@ -383,7 +383,7 @@ 
     function setGroupMemberSet($principal, array $members) {
 
         // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare(sprintf('SELECT id, uri FROM %s WHERE uri IN (? %s);',$this->tableName, str_repeat(', ? ', count($members))));
+        $stmt = $this->pdo->prepare(sprintf('SELECT id, uri FROM %s WHERE uri IN (? %s);', $this->tableName, str_repeat(', ? ', count($members))));
         $stmt->execute(array_merge([$principal], $members));
 
         $memberIds = [];

Indentation +405 added lines, -405 removed lines

@@ -19,415 +19,415 @@
  */
 class PDO extends AbstractBackend implements CreatePrincipalSupport {
 
-    /**
-     * PDO table name for 'principals'
-     *
-     * @var string
-     */
-    public $tableName = 'principals';
-
-    /**
-     * PDO table name for 'group members'
-     *
-     * @var string
-     */
-    public $groupMembersTableName = 'groupmembers';
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * A list of additional fields to support
-     *
-     * @var array
-     */
-    protected $fieldMap = [
-
-        /**
-         * This property can be used to display the users' real name.
-         */
-        '{DAV:}displayname' => [
-            'dbField' => 'displayname',
-        ],
-
-        /**
-         * This is the users' primary email-address.
-         */
-        '{http://sabredav.org/ns}email-address' => [
-            'dbField' => 'email',
-        ],
-    ];
-
-    /**
-     * Sets up the backend.
-     *
-     * @param PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    public function getPrincipalsByPrefix($prefixPath) {
-
-        $fields = [
-            'uri',
-        ];
-
-        foreach ($this->fieldMap as $key => $value) {
-            $fields[] = $value['dbField'];
-        }
-        $result = $this->pdo->query(sprintf('SELECT %s FROM %s', implode(',', $fields), $this->tableName));
-
-        $principals = [];
-
-        while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principal = [
-                'uri' => $row['uri'],
-            ];
-            foreach ($this->fieldMap as $key => $value) {
-                if ($row[$value['dbField']]) {
-                    $principal[$key] = $row[$value['dbField']];
-                }
-            }
-            $principals[] = $principal;
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getPrincipalByPath($path) {
-
-        $fields = [
-            'id',
-            'uri',
-        ];
-
-        foreach ($this->fieldMap as $key => $value) {
-            $fields[] = $value['dbField'];
-        }
-        $stmt = $this->pdo->prepare(sprintf('SELECT %s FROM %s WHERE uri = ?', implode(',', $fields), $this->tableName));
-        $stmt->execute([$path]);
-
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-        if (!$row) return;
-
-        $principal = [
-            'id'  => $row['id'],
-            'uri' => $row['uri'],
-        ];
-        foreach ($this->fieldMap as $key => $value) {
-            if ($row[$value['dbField']]) {
-                $principal[$key] = $row[$value['dbField']];
-            }
-        }
-        return $principal;
-
-    }
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documenation for more info and examples.
-     *
-     * @param string $path
-     * @param DAV\PropPatch $propPatch
-     */
-    public function updatePrincipal($path, DAV\PropPatch $propPatch) {
-
-        $propPatch->handle(array_keys($this->fieldMap), function($properties) use ($path) {
-
-            $query = sprintf('UPDATE %s SET ', $this->tableName);
-            $first = true;
-
-            $values = [];
-
-            foreach ($properties as $key => $value) {
-
-                $dbField = $this->fieldMap[$key]['dbField'];
-
-                if (!$first) {
-                    $query .= ', ';
-                }
-                $first = false;
-                $query .= $dbField . ' = :' . $dbField;
-                $values[$dbField] = $value;
-
-            }
-
-            $query .= " WHERE uri = :uri";
-            $values['uri'] = $path;
-
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute($values);
-
-            return true;
-
-        });
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * By default, if multiple properties are submitted to this method, the
-     * various properties should be combined with 'AND'. If $test is set to
-     * 'anyof', it should be combined using 'OR'.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @param string $test
-     * @return array
-     */
-    public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-        if (count($searchProperties) == 0) return [];    //No criteria
-
-        $query = sprintf('SELECT uri FROM %s WHERE ', $this->tableName);
-        $values = [];
-        foreach ($searchProperties as $property => $value) {
-            switch ($property) {
-                case '{DAV:}displayname' :
-                    $column = "displayname";
-                    break;
-                case '{http://sabredav.org/ns}email-address' :
-                    $column = "email";
-                    break;
-                default :
-                    // Unsupported property
-                    return [];
-            }
-            if (count($values) > 0) $query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
-            $query .= 'lower(' . $column . ') LIKE lower(?)';
-            $values[] = '%' . $value . '%';
-
-        }
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $principals = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principals[] = $row['uri'];
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Finds a principal by its URI.
-     *
-     * This method may receive any type of uri, but mailto: addresses will be
-     * the most common.
-     *
-     * Implementation of this API is optional. It is currently used by the
-     * CalDAV system to find principals based on their email addresses. If this
-     * API is not implemented, some features may not work correctly.
-     *
-     * This method must return a relative principal path, or null, if the
-     * principal was not found or you refuse to find it.
-     *
-     * @param string $uri
-     * @param string $principalPrefix
-     * @return string
-     */
-    public function findByUri($uri, $principalPrefix) {
-        $value = null;
-        $scheme = null;
-        list($scheme, $value) = explode(":", $uri, 2);
-        if ($value === null) return null;
-
-        $uri = null;
-        switch ($scheme){
-            case "mailto":
-                $query = sprintf('SELECT uri FROM %s WHERE lower(email)=lower(?)', $this->tableName);
-                $stmt = $this->pdo->prepare($query);
-                $stmt->execute([ $value ]);
+	/**
+	 * PDO table name for 'principals'
+	 *
+	 * @var string
+	 */
+	public $tableName = 'principals';
+
+	/**
+	 * PDO table name for 'group members'
+	 *
+	 * @var string
+	 */
+	public $groupMembersTableName = 'groupmembers';
+
+	/**
+	 * pdo
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * A list of additional fields to support
+	 *
+	 * @var array
+	 */
+	protected $fieldMap = [
+
+		/**
+		 * This property can be used to display the users' real name.
+		 */
+		'{DAV:}displayname' => [
+			'dbField' => 'displayname',
+		],
+
+		/**
+		 * This is the users' primary email-address.
+		 */
+		'{http://sabredav.org/ns}email-address' => [
+			'dbField' => 'email',
+		],
+	];
+
+	/**
+	 * Sets up the backend.
+	 *
+	 * @param PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * Returns a list of principals based on a prefix.
+	 *
+	 * This prefix will often contain something like 'principals'. You are only
+	 * expected to return principals that are in this base path.
+	 *
+	 * You are expected to return at least a 'uri' for every user, you can
+	 * return any additional properties if you wish so. Common properties are:
+	 *   {DAV:}displayname
+	 *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
+	 *     field that's actualy injected in a number of other properties. If
+	 *     you have an email address, use this property.
+	 *
+	 * @param string $prefixPath
+	 * @return array
+	 */
+	public function getPrincipalsByPrefix($prefixPath) {
+
+		$fields = [
+			'uri',
+		];
+
+		foreach ($this->fieldMap as $key => $value) {
+			$fields[] = $value['dbField'];
+		}
+		$result = $this->pdo->query(sprintf('SELECT %s FROM %s', implode(',', $fields), $this->tableName));
+
+		$principals = [];
+
+		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
+
+			// Checking if the principal is in the prefix
+			list($rowPrefix) = URLUtil::splitPath($row['uri']);
+			if ($rowPrefix !== $prefixPath) continue;
+
+			$principal = [
+				'uri' => $row['uri'],
+			];
+			foreach ($this->fieldMap as $key => $value) {
+				if ($row[$value['dbField']]) {
+					$principal[$key] = $row[$value['dbField']];
+				}
+			}
+			$principals[] = $principal;
+
+		}
+
+		return $principals;
+
+	}
+
+	/**
+	 * Returns a specific principal, specified by it's path.
+	 * The returned structure should be the exact same as from
+	 * getPrincipalsByPrefix.
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function getPrincipalByPath($path) {
+
+		$fields = [
+			'id',
+			'uri',
+		];
+
+		foreach ($this->fieldMap as $key => $value) {
+			$fields[] = $value['dbField'];
+		}
+		$stmt = $this->pdo->prepare(sprintf('SELECT %s FROM %s WHERE uri = ?', implode(',', $fields), $this->tableName));
+		$stmt->execute([$path]);
+
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+		if (!$row) return;
+
+		$principal = [
+			'id'  => $row['id'],
+			'uri' => $row['uri'],
+		];
+		foreach ($this->fieldMap as $key => $value) {
+			if ($row[$value['dbField']]) {
+				$principal[$key] = $row[$value['dbField']];
+			}
+		}
+		return $principal;
+
+	}
+
+	/**
+	 * Updates one ore more webdav properties on a principal.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documenation for more info and examples.
+	 *
+	 * @param string $path
+	 * @param DAV\PropPatch $propPatch
+	 */
+	public function updatePrincipal($path, DAV\PropPatch $propPatch) {
+
+		$propPatch->handle(array_keys($this->fieldMap), function($properties) use ($path) {
+
+			$query = sprintf('UPDATE %s SET ', $this->tableName);
+			$first = true;
+
+			$values = [];
+
+			foreach ($properties as $key => $value) {
+
+				$dbField = $this->fieldMap[$key]['dbField'];
+
+				if (!$first) {
+					$query .= ', ';
+				}
+				$first = false;
+				$query .= $dbField . ' = :' . $dbField;
+				$values[$dbField] = $value;
+
+			}
+
+			$query .= " WHERE uri = :uri";
+			$values['uri'] = $path;
+
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute($values);
+
+			return true;
+
+		});
+
+	}
+
+	/**
+	 * This method is used to search for principals matching a set of
+	 * properties.
+	 *
+	 * This search is specifically used by RFC3744's principal-property-search
+	 * REPORT.
+	 *
+	 * The actual search should be a unicode-non-case-sensitive search. The
+	 * keys in searchProperties are the WebDAV property names, while the values
+	 * are the property values to search on.
+	 *
+	 * By default, if multiple properties are submitted to this method, the
+	 * various properties should be combined with 'AND'. If $test is set to
+	 * 'anyof', it should be combined using 'OR'.
+	 *
+	 * This method should simply return an array with full principal uri's.
+	 *
+	 * If somebody attempted to search on a property the backend does not
+	 * support, you should simply return 0 results.
+	 *
+	 * You can also just return 0 results if you choose to not support
+	 * searching at all, but keep in mind that this may stop certain features
+	 * from working.
+	 *
+	 * @param string $prefixPath
+	 * @param array $searchProperties
+	 * @param string $test
+	 * @return array
+	 */
+	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+		if (count($searchProperties) == 0) return [];    //No criteria
+
+		$query = sprintf('SELECT uri FROM %s WHERE ', $this->tableName);
+		$values = [];
+		foreach ($searchProperties as $property => $value) {
+			switch ($property) {
+				case '{DAV:}displayname' :
+					$column = "displayname";
+					break;
+				case '{http://sabredav.org/ns}email-address' :
+					$column = "email";
+					break;
+				default :
+					// Unsupported property
+					return [];
+			}
+			if (count($values) > 0) $query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
+			$query .= 'lower(' . $column . ') LIKE lower(?)';
+			$values[] = '%' . $value . '%';
+
+		}
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute($values);
+
+		$principals = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			// Checking if the principal is in the prefix
+			list($rowPrefix) = URLUtil::splitPath($row['uri']);
+			if ($rowPrefix !== $prefixPath) continue;
+
+			$principals[] = $row['uri'];
+
+		}
+
+		return $principals;
+
+	}
+
+	/**
+	 * Finds a principal by its URI.
+	 *
+	 * This method may receive any type of uri, but mailto: addresses will be
+	 * the most common.
+	 *
+	 * Implementation of this API is optional. It is currently used by the
+	 * CalDAV system to find principals based on their email addresses. If this
+	 * API is not implemented, some features may not work correctly.
+	 *
+	 * This method must return a relative principal path, or null, if the
+	 * principal was not found or you refuse to find it.
+	 *
+	 * @param string $uri
+	 * @param string $principalPrefix
+	 * @return string
+	 */
+	public function findByUri($uri, $principalPrefix) {
+		$value = null;
+		$scheme = null;
+		list($scheme, $value) = explode(":", $uri, 2);
+		if ($value === null) return null;
+
+		$uri = null;
+		switch ($scheme){
+			case "mailto":
+				$query = sprintf('SELECT uri FROM %s WHERE lower(email)=lower(?)', $this->tableName);
+				$stmt = $this->pdo->prepare($query);
+				$stmt->execute([ $value ]);
             
-                while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-                    // Checking if the principal is in the prefix
-                    list($rowPrefix) = URLUtil::splitPath($row['uri']);
-                    if ($rowPrefix !== $principalPrefix) continue;
+				while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					// Checking if the principal is in the prefix
+					list($rowPrefix) = URLUtil::splitPath($row['uri']);
+					if ($rowPrefix !== $principalPrefix) continue;
                     
-                    $uri = $row['uri'];
-                    break; //Stop on first match
-                }
-                break;
-            default:
-                //unsupported uri scheme
-                return null;
-        }
-        return $uri;
-    }
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMemberSet($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
+					$uri = $row['uri'];
+					break; //Stop on first match
+				}
+				break;
+			default:
+				//unsupported uri scheme
+				return null;
+		}
+		return $uri;
+	}
+
+	/**
+	 * Returns the list of members for a group-principal
+	 *
+	 * @param string $principal
+	 * @return array
+	 */
+	public function getGroupMemberSet($principal) {
+
+		$principal = $this->getPrincipalByPath($principal);
+		if (!$principal) throw new DAV\Exception('Principal not found');
 
 		$query = 'SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?';
-        $query = sprintf($query, $this->groupMembersTableName, $this->tableName);
+		$query = sprintf($query, $this->groupMembersTableName, $this->tableName);
 		$stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principal['id']]);
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMembership($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare(sprintf('SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?', $this->groupMembersTableName, $this->tableName));
-        $stmt->execute([$principal['id']]);
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members) {
-
-        // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare(sprintf('SELECT id, uri FROM %s WHERE uri IN (? %s);',$this->tableName, str_repeat(', ? ', count($members))));
-        $stmt->execute(array_merge([$principal], $members));
-
-        $memberIds = [];
-        $principalId = null;
-
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            if ($row['uri'] == $principal) {
-                $principalId = $row['id'];
-            } else {
-                $memberIds[] = $row['id'];
-            }
-        }
-        if (!$principalId) throw new DAV\Exception('Principal not found');
-
-        // Wiping out old members
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE principal_id = ?;', $this->groupMembersTableName));
-        $stmt->execute([$principalId]);
-
-        foreach ($memberIds as $memberId) {
-
-            $stmt = $this->pdo->prepare('INSERT INTO ' . $this->groupMembersTableName . ' (principal_id, member_id) VALUES (?, ?);');
-            $stmt->execute([$principalId, $memberId]);
-
-        }
-
-    }
-
-    /**
-     * Creates a new principal.
-     *
-     * This method receives a full path for the new principal. The mkCol object
-     * contains any additional webdav properties specified during the creation
-     * of the principal.
-     *
-     * @param string $path
-     * @param MkCol $mkCol
-     * @return void
-     */
-    public function createPrincipal($path, MkCol $mkCol) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->tableName . ' (uri) VALUES (?)');
-        $stmt->execute([$path]);
-        $this->updatePrincipal($path, $mkCol);
-
-    }
+		$stmt->execute([$principal['id']]);
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$result[] = $row['uri'];
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Returns the list of groups a principal is a member of
+	 *
+	 * @param string $principal
+	 * @return array
+	 */
+	public function getGroupMembership($principal) {
+
+		$principal = $this->getPrincipalByPath($principal);
+		if (!$principal) throw new DAV\Exception('Principal not found');
+
+		$stmt = $this->pdo->prepare(sprintf('SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?', $this->groupMembersTableName, $this->tableName));
+		$stmt->execute([$principal['id']]);
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$result[] = $row['uri'];
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Updates the list of group members for a group principal.
+	 *
+	 * The principals should be passed as a list of uri's.
+	 *
+	 * @param string $principal
+	 * @param array $members
+	 * @return void
+	 */
+	public function setGroupMemberSet($principal, array $members) {
+
+		// Grabbing the list of principal id's.
+		$stmt = $this->pdo->prepare(sprintf('SELECT id, uri FROM %s WHERE uri IN (? %s);',$this->tableName, str_repeat(', ? ', count($members))));
+		$stmt->execute(array_merge([$principal], $members));
+
+		$memberIds = [];
+		$principalId = null;
+
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			if ($row['uri'] == $principal) {
+				$principalId = $row['id'];
+			} else {
+				$memberIds[] = $row['id'];
+			}
+		}
+		if (!$principalId) throw new DAV\Exception('Principal not found');
+
+		// Wiping out old members
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE principal_id = ?;', $this->groupMembersTableName));
+		$stmt->execute([$principalId]);
+
+		foreach ($memberIds as $memberId) {
+
+			$stmt = $this->pdo->prepare('INSERT INTO ' . $this->groupMembersTableName . ' (principal_id, member_id) VALUES (?, ?);');
+			$stmt->execute([$principalId, $memberId]);
+
+		}
+
+	}
+
+	/**
+	 * Creates a new principal.
+	 *
+	 * This method receives a full path for the new principal. The mkCol object
+	 * contains any additional webdav properties specified during the creation
+	 * of the principal.
+	 *
+	 * @param string $path
+	 * @param MkCol $mkCol
+	 * @return void
+	 */
+	public function createPrincipal($path, MkCol $mkCol) {
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->tableName . ' (uri) VALUES (?)');
+		$stmt->execute([$path]);
+		$this->updatePrincipal($path, $mkCol);
+
+	}
 
 }

Braces +31 added lines, -10 removed lines

@@ -106,7 +106,9 @@ 
 
             // Checking if the principal is in the prefix
             list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
+            if ($rowPrefix !== $prefixPath) {
+            	continue;
+            }
 
             $principal = [
                 'uri' => $row['uri'],
@@ -146,7 +148,9 @@ 
         $stmt->execute([$path]);
 
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-        if (!$row) return;
+        if (!$row) {
+        	return;
+        }
 
         $principal = [
             'id'  => $row['id'],
@@ -240,7 +244,10 @@ 
      * @return array
      */
     public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-        if (count($searchProperties) == 0) return [];    //No criteria
+        if (count($searchProperties) == 0) {
+        	return [];
+        }
+        //No criteria
 
         $query = sprintf('SELECT uri FROM %s WHERE ', $this->tableName);
         $values = [];
@@ -256,7 +263,9 @@ 
                     // Unsupported property
                     return [];
             }
-            if (count($values) > 0) $query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
+            if (count($values) > 0) {
+            	$query .= (strcmp($test, "anyof") == 0 ? " || " : " && ");
+            }
             $query .= 'lower(' . $column . ') LIKE lower(?)';
             $values[] = '%' . $value . '%';
 
@@ -269,7 +278,9 @@ 
 
             // Checking if the principal is in the prefix
             list($rowPrefix) = URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
+            if ($rowPrefix !== $prefixPath) {
+            	continue;
+            }
 
             $principals[] = $row['uri'];
 
@@ -300,7 +311,9 @@ 
         $value = null;
         $scheme = null;
         list($scheme, $value) = explode(":", $uri, 2);
-        if ($value === null) return null;
+        if ($value === null) {
+        	return null;
+        }
 
         $uri = null;
         switch ($scheme){
@@ -312,7 +325,9 @@ 
                 while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
                     // Checking if the principal is in the prefix
                     list($rowPrefix) = URLUtil::splitPath($row['uri']);
-                    if ($rowPrefix !== $principalPrefix) continue;
+                    if ($rowPrefix !== $principalPrefix) {
+                    	continue;
+                    }
                     
                     $uri = $row['uri'];
                     break; //Stop on first match
@@ -334,7 +349,9 @@ 
     public function getGroupMemberSet($principal) {
 
         $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
+        if (!$principal) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
 		$query = 'SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?';
         $query = sprintf($query, $this->groupMembersTableName, $this->tableName);
@@ -358,7 +375,9 @@ 
     public function getGroupMembership($principal) {
 
         $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
+        if (!$principal) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
         $stmt = $this->pdo->prepare(sprintf('SELECT principals.uri as uri FROM %s AS groupmembers LEFT JOIN %s AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?', $this->groupMembersTableName, $this->tableName));
         $stmt->execute([$principal['id']]);
@@ -396,7 +415,9 @@ 
                 $memberIds[] = $row['id'];
             }
         }
-        if (!$principalId) throw new DAV\Exception('Principal not found');
+        if (!$principalId) {
+        	throw new DAV\Exception('Principal not found');
+        }
 
         // Wiping out old members
         $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE principal_id = ?;', $this->groupMembersTableName));

libraries/SabreDAV/DAVACL/Xml/Property/Acl.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return Acl
      */
     static function xmlDeserialize(Reader $reader) {
 

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 
         $privileges = [];
 
-        foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
+        foreach ((array) $reader->parseInnerTree($elementMap) as $element) {
 
             if ($element['name'] !== '{DAV:}ace') {
                 continue;

Braces +3 added lines, -1 removed lines

@@ -136,7 +136,9 @@
             }
             echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
             echo '<td>';
-            if (!empty($privilege['protected'])) echo '(protected)';
+            if (!empty($privilege['protected'])) {
+            	echo '(protected)';
+            }
             echo '</td>';
             echo '</tr>';
 

Indentation +246 added lines, -246 removed lines

@@ -27,251 +27,251 @@
  */
 class Acl implements Element, HtmlOutput {
 
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    protected $privileges;
-
-    /**
-     * Whether or not the server base url is required to be prefixed when
-     * serializing the property.
-     *
-     * @var bool
-     */
-    protected $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from
-     * Sabre\DAVACL\Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a
-     * 'principal' property. A privilege may have a 'protected' property as
-     * well.
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls
-     * are already full urls. If this is kept to true, the servers base url
-     * will automatically be prefixed.
-     *
-     * @param array $privileges
-     * @param bool $prefixBaseUrl
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property
-     *
-     * @return array
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->privileges as $ace) {
-
-            $this->serializeAce($writer, $ace);
-
-        }
-
-    }
-
-    /**
-     * Generate html representation for this value.
-     *
-     * The html output is 100% trusted, and no effort is being made to sanitize
-     * it. It's up to the implementor to sanitize user provided values.
-     *
-     * The output must be in UTF-8.
-     *
-     * The baseUri parameter is a url to the root of the application, and can
-     * be used to construct local links.
-     *
-     * @param HtmlOutputHelper $html
-     * @return string
-     */
-    public function toHtml(HtmlOutputHelper $html) {
-
-        ob_start();
-        echo "<table>";
-        echo "<tr><th>Principal</th><th>Privilege</th><th></th></tr>";
-        foreach ($this->privileges as $privilege) {
-
-            echo '<tr>';
-            // if it starts with a {, it's a special principal
-            if ($privilege['principal'][0] === '{') {
-                echo '<td>', $html->xmlName($privilege['principal']), '</td>';
-            } else {
-                echo '<td>', $html->link($privilege['principal']), '</td>';
-            }
-            echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
-            echo '<td>';
-            if (!empty($privilege['protected'])) echo '(protected)';
-            echo '</td>';
-            echo '</tr>';
-
-        }
-        echo "</table>";
-        return ob_get_clean();
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elementMap = [
-            '{DAV:}ace'       => 'Sabre\Xml\Element\KeyValue',
-            '{DAV:}privilege' => 'Sabre\Xml\Element\Elements',
-            '{DAV:}principal' => 'Sabre\DAVACL\Xml\Property\Principal',
-        ];
-
-        $privileges = [];
-
-        foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
-
-            if ($element['name'] !== '{DAV:}ace') {
-                continue;
-            }
-            $ace = $element['value'];
-
-            if (empty($ace['{DAV:}principal'])) {
-                throw new DAV\Exception\BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = $ace['{DAV:}principal'];
-
-            switch ($principal->getType()) {
-                case Principal::HREF :
-                    $principal = $principal->getHref();
-                    break;
-                case Principal::AUTHENTICATED :
-                    $principal = '{DAV:}authenticated';
-                    break;
-                case Principal::UNAUTHENTICATED :
-                    $principal = '{DAV:}unauthenticated';
-                    break;
-                case Principal::ALL :
-                    $principal = '{DAV:}all';
-                    break;
-
-            }
-
-            $protected = array_key_exists('{DAV:}protected', $ace);
-
-            if (!isset($ace['{DAV:}grant'])) {
-                throw new DAV\Exception\NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            foreach ($ace['{DAV:}grant'] as $elem) {
-                if ($elem['name'] !== '{DAV:}privilege') {
-                    continue;
-                }
-
-                foreach ($elem['value'] as $priv) {
-                    $privileges[] = [
-                        'principal' => $principal,
-                        'protected' => $protected,
-                        'privilege' => $priv,
-                    ];
-                }
-
-            }
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry.
-     *
-     * @param Writer $writer
-     * @param array $ace
-     * @return void
-     */
-    private function serializeAce(Writer $writer, array $ace) {
-
-        $writer->startElement('{DAV:}ace');
-
-        switch ($ace['principal']) {
-            case '{DAV:}authenticated' :
-                $principal = new Principal(Principal::AUTHENTICATED);
-                break;
-            case '{DAV:}unauthenticated' :
-                $principal = new Principal(Principal::UNAUTHENTICATED);
-                break;
-            case '{DAV:}all' :
-                $principal = new Principal(Principal::ALL);
-                break;
-            default:
-                $principal = new Principal(Principal::HREF, $ace['principal']);
-                break;
-        }
-
-        $writer->writeElement('{DAV:}principal', $principal);
-        $writer->startElement('{DAV:}grant');
-        $writer->startElement('{DAV:}privilege');
-
-        $writer->writeElement($ace['privilege']);
-
-        $writer->endElement(); // privilege
-        $writer->endElement(); // grant
-
-        if (!empty($ace['protected'])) {
-            $writer->writeElement('{DAV:}protected');
-        }
-
-        $writer->endElement(); // ace
-
-    }
+	/**
+	 * List of privileges
+	 *
+	 * @var array
+	 */
+	protected $privileges;
+
+	/**
+	 * Whether or not the server base url is required to be prefixed when
+	 * serializing the property.
+	 *
+	 * @var bool
+	 */
+	protected $prefixBaseUrl;
+
+	/**
+	 * Constructor
+	 *
+	 * This object requires a structure similar to the return value from
+	 * Sabre\DAVACL\Plugin::getACL().
+	 *
+	 * Each privilege is a an array with at least a 'privilege' property, and a
+	 * 'principal' property. A privilege may have a 'protected' property as
+	 * well.
+	 *
+	 * The prefixBaseUrl should be set to false, if the supplied principal urls
+	 * are already full urls. If this is kept to true, the servers base url
+	 * will automatically be prefixed.
+	 *
+	 * @param array $privileges
+	 * @param bool $prefixBaseUrl
+	 */
+	public function __construct(array $privileges, $prefixBaseUrl = true) {
+
+		$this->privileges = $privileges;
+		$this->prefixBaseUrl = $prefixBaseUrl;
+
+	}
+
+	/**
+	 * Returns the list of privileges for this property
+	 *
+	 * @return array
+	 */
+	public function getPrivileges() {
+
+		return $this->privileges;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->privileges as $ace) {
+
+			$this->serializeAce($writer, $ace);
+
+		}
+
+	}
+
+	/**
+	 * Generate html representation for this value.
+	 *
+	 * The html output is 100% trusted, and no effort is being made to sanitize
+	 * it. It's up to the implementor to sanitize user provided values.
+	 *
+	 * The output must be in UTF-8.
+	 *
+	 * The baseUri parameter is a url to the root of the application, and can
+	 * be used to construct local links.
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @return string
+	 */
+	public function toHtml(HtmlOutputHelper $html) {
+
+		ob_start();
+		echo "<table>";
+		echo "<tr><th>Principal</th><th>Privilege</th><th></th></tr>";
+		foreach ($this->privileges as $privilege) {
+
+			echo '<tr>';
+			// if it starts with a {, it's a special principal
+			if ($privilege['principal'][0] === '{') {
+				echo '<td>', $html->xmlName($privilege['principal']), '</td>';
+			} else {
+				echo '<td>', $html->link($privilege['principal']), '</td>';
+			}
+			echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
+			echo '<td>';
+			if (!empty($privilege['protected'])) echo '(protected)';
+			echo '</td>';
+			echo '</tr>';
+
+		}
+		echo "</table>";
+		return ob_get_clean();
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elementMap = [
+			'{DAV:}ace'       => 'Sabre\Xml\Element\KeyValue',
+			'{DAV:}privilege' => 'Sabre\Xml\Element\Elements',
+			'{DAV:}principal' => 'Sabre\DAVACL\Xml\Property\Principal',
+		];
+
+		$privileges = [];
+
+		foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
+
+			if ($element['name'] !== '{DAV:}ace') {
+				continue;
+			}
+			$ace = $element['value'];
+
+			if (empty($ace['{DAV:}principal'])) {
+				throw new DAV\Exception\BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
+			}
+			$principal = $ace['{DAV:}principal'];
+
+			switch ($principal->getType()) {
+				case Principal::HREF :
+					$principal = $principal->getHref();
+					break;
+				case Principal::AUTHENTICATED :
+					$principal = '{DAV:}authenticated';
+					break;
+				case Principal::UNAUTHENTICATED :
+					$principal = '{DAV:}unauthenticated';
+					break;
+				case Principal::ALL :
+					$principal = '{DAV:}all';
+					break;
+
+			}
+
+			$protected = array_key_exists('{DAV:}protected', $ace);
+
+			if (!isset($ace['{DAV:}grant'])) {
+				throw new DAV\Exception\NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
+			}
+			foreach ($ace['{DAV:}grant'] as $elem) {
+				if ($elem['name'] !== '{DAV:}privilege') {
+					continue;
+				}
+
+				foreach ($elem['value'] as $priv) {
+					$privileges[] = [
+						'principal' => $principal,
+						'protected' => $protected,
+						'privilege' => $priv,
+					];
+				}
+
+			}
+
+		}
+
+		return new self($privileges);
+
+	}
+
+	/**
+	 * Serializes a single access control entry.
+	 *
+	 * @param Writer $writer
+	 * @param array $ace
+	 * @return void
+	 */
+	private function serializeAce(Writer $writer, array $ace) {
+
+		$writer->startElement('{DAV:}ace');
+
+		switch ($ace['principal']) {
+			case '{DAV:}authenticated' :
+				$principal = new Principal(Principal::AUTHENTICATED);
+				break;
+			case '{DAV:}unauthenticated' :
+				$principal = new Principal(Principal::UNAUTHENTICATED);
+				break;
+			case '{DAV:}all' :
+				$principal = new Principal(Principal::ALL);
+				break;
+			default:
+				$principal = new Principal(Principal::HREF, $ace['principal']);
+				break;
+		}
+
+		$writer->writeElement('{DAV:}principal', $principal);
+		$writer->startElement('{DAV:}grant');
+		$writer->startElement('{DAV:}privilege');
+
+		$writer->writeElement($ace['privilege']);
+
+		$writer->endElement(); // privilege
+		$writer->endElement(); // grant
+
+		if (!empty($ace['protected'])) {
+			$writer->writeElement('{DAV:}protected');
+		}
+
+		$writer->endElement(); // ace
+
+	}
 
 }

libraries/SabreDAV/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return CurrentUserPrivilegeSet
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +134 added lines, -134 removed lines

@@ -20,140 +20,140 @@
  */
 class CurrentUserPrivilegeSet implements Element, HtmlOutput {
 
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->privileges as $privName) {
-
-            $writer->startElement('{DAV:}privilege');
-            $writer->writeElement($privName);
-            $writer->endElement();
-
-        }
-
-
-    }
-
-    /**
-     * Returns true or false, whether the specified principal appears in the
-     * list.
-     *
-     * @param string $privilegeName
-     * @return bool
-     */
-    public function has($privilegeName) {
-
-        return in_array($privilegeName, $this->privileges);
-
-    }
-
-    /**
-     * Returns the list of privileges.
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $result = [];
-
-        $tree = $reader->parseInnerTree(['{DAV:}privilege' => 'Sabre\\Xml\\Element\\Elements']);
-        foreach ($tree as $element) {
-            if ($element['name'] !== '{DAV:}privilege') {
-                continue;
-            }
-            $result[] = $element['value'][0];
-        }
-        return new self($result);
-
-    }
-
-    /**
-     * Generate html representation for this value.
-     *
-     * The html output is 100% trusted, and no effort is being made to sanitize
-     * it. It's up to the implementor to sanitize user provided values.
-     *
-     * The output must be in UTF-8.
-     *
-     * The baseUri parameter is a url to the root of the application, and can
-     * be used to construct local links.
-     *
-     * @param HtmlOutputHelper $html
-     * @return string
-     */
-    public function toHtml(HtmlOutputHelper $html) {
-
-        return implode(
-            ', ',
-            array_map([$html, 'xmlName'], $this->getValue())
-        );
-
-    }
+	/**
+	 * List of privileges
+	 *
+	 * @var array
+	 */
+	private $privileges;
+
+	/**
+	 * Creates the object
+	 *
+	 * Pass the privileges in clark-notation
+	 *
+	 * @param array $privileges
+	 */
+	public function __construct(array $privileges) {
+
+		$this->privileges = $privileges;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->privileges as $privName) {
+
+			$writer->startElement('{DAV:}privilege');
+			$writer->writeElement($privName);
+			$writer->endElement();
+
+		}
+
+
+	}
+
+	/**
+	 * Returns true or false, whether the specified principal appears in the
+	 * list.
+	 *
+	 * @param string $privilegeName
+	 * @return bool
+	 */
+	public function has($privilegeName) {
+
+		return in_array($privilegeName, $this->privileges);
+
+	}
+
+	/**
+	 * Returns the list of privileges.
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->privileges;
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$result = [];
+
+		$tree = $reader->parseInnerTree(['{DAV:}privilege' => 'Sabre\\Xml\\Element\\Elements']);
+		foreach ($tree as $element) {
+			if ($element['name'] !== '{DAV:}privilege') {
+				continue;
+			}
+			$result[] = $element['value'][0];
+		}
+		return new self($result);
+
+	}
+
+	/**
+	 * Generate html representation for this value.
+	 *
+	 * The html output is 100% trusted, and no effort is being made to sanitize
+	 * it. It's up to the implementor to sanitize user provided values.
+	 *
+	 * The output must be in UTF-8.
+	 *
+	 * The baseUri parameter is a url to the root of the application, and can
+	 * be used to construct local links.
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @return string
+	 */
+	public function toHtml(HtmlOutputHelper $html) {
+
+		return implode(
+			', ',
+			array_map([$html, 'xmlName'], $this->getValue())
+		);
+
+	}
 
 
 }

libraries/SabreDAV/DAVACL/Xml/Property/Principal.php

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return Principal
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +172 added lines, -172 removed lines

@@ -20,177 +20,177 @@
  */
 class Principal extends DAV\Xml\Property\Href {
 
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICATED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific principals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Everybody, basically
-     */
-    const ALL = 4;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     *
-     * @param int $type
-     * @param string|null $href
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-        if ($type === self::HREF && is_null($href)) {
-            throw new DAV\Exception('The href argument must be specified for the HREF principal type.');
-        }
-        if ($href) {
-            $href = rtrim($href, '/') . '/';
-            parent::__construct($href);
-        }
-
-    }
-
-    /**
-     * Returns the principal type
-     *
-     * @return int
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        switch ($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $writer->writeElement('{DAV:}unauthenticated');
-                break;
-            case self::AUTHENTICATED :
-                $writer->writeElement('{DAV:}authenticated');
-                break;
-            case self::HREF :
-                parent::xmlSerialize($writer);
-                break;
-            case self::ALL :
-                $writer->writeElement('{DAV:}all');
-                break;
-        }
-
-    }
-
-    /**
-     * Generate html representation for this value.
-     *
-     * The html output is 100% trusted, and no effort is being made to sanitize
-     * it. It's up to the implementor to sanitize user provided values.
-     *
-     * The output must be in UTF-8.
-     *
-     * The baseUri parameter is a url to the root of the application, and can
-     * be used to construct local links.
-     *
-     * @param HtmlOutputHelper $html
-     * @return string
-     */
-    public function toHtml(HtmlOutputHelper $html) {
-
-        switch ($this->type) {
-
-            case self::UNAUTHENTICATED :
-                return '<em>unauthenticated</em>';
-            case self::AUTHENTICATED :
-                return '<em>authenticated</em>';
-            case self::HREF :
-                return parent::toHtml($html);
-            case self::ALL :
-                return '<em>all</em>';
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called staticly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $tree = $reader->parseInnerTree()[0];
-
-        switch ($tree['name']) {
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $tree['value']);
-            case '{DAV:}all':
-                return new self(self::ALL);
-            default :
-                throw new BadRequest('Unknown or unsupported principal type: ' . $tree['name']);
-        }
-
-    }
+	/**
+	 * To specify a not-logged-in user, use the UNAUTHENTICATED principal
+	 */
+	const UNAUTHENTICATED = 1;
+
+	/**
+	 * To specify any principal that is logged in, use AUTHENTICATED
+	 */
+	const AUTHENTICATED = 2;
+
+	/**
+	 * Specific principals can be specified with the HREF
+	 */
+	const HREF = 3;
+
+	/**
+	 * Everybody, basically
+	 */
+	const ALL = 4;
+
+	/**
+	 * Principal-type
+	 *
+	 * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+	 *
+	 * @var int
+	 */
+	protected $type;
+
+	/**
+	 * Creates the property.
+	 *
+	 * The 'type' argument must be one of the type constants defined in this class.
+	 *
+	 * 'href' is only required for the HREF type.
+	 *
+	 * @param int $type
+	 * @param string|null $href
+	 */
+	public function __construct($type, $href = null) {
+
+		$this->type = $type;
+		if ($type === self::HREF && is_null($href)) {
+			throw new DAV\Exception('The href argument must be specified for the HREF principal type.');
+		}
+		if ($href) {
+			$href = rtrim($href, '/') . '/';
+			parent::__construct($href);
+		}
+
+	}
+
+	/**
+	 * Returns the principal type
+	 *
+	 * @return int
+	 */
+	public function getType() {
+
+		return $this->type;
+
+	}
+
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		switch ($this->type) {
+
+			case self::UNAUTHENTICATED :
+				$writer->writeElement('{DAV:}unauthenticated');
+				break;
+			case self::AUTHENTICATED :
+				$writer->writeElement('{DAV:}authenticated');
+				break;
+			case self::HREF :
+				parent::xmlSerialize($writer);
+				break;
+			case self::ALL :
+				$writer->writeElement('{DAV:}all');
+				break;
+		}
+
+	}
+
+	/**
+	 * Generate html representation for this value.
+	 *
+	 * The html output is 100% trusted, and no effort is being made to sanitize
+	 * it. It's up to the implementor to sanitize user provided values.
+	 *
+	 * The output must be in UTF-8.
+	 *
+	 * The baseUri parameter is a url to the root of the application, and can
+	 * be used to construct local links.
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @return string
+	 */
+	public function toHtml(HtmlOutputHelper $html) {
+
+		switch ($this->type) {
+
+			case self::UNAUTHENTICATED :
+				return '<em>unauthenticated</em>';
+			case self::AUTHENTICATED :
+				return '<em>authenticated</em>';
+			case self::HREF :
+				return parent::toHtml($html);
+			case self::ALL :
+				return '<em>all</em>';
+		}
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called staticly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$tree = $reader->parseInnerTree()[0];
+
+		switch ($tree['name']) {
+			case '{DAV:}unauthenticated' :
+				return new self(self::UNAUTHENTICATED);
+			case '{DAV:}authenticated' :
+				return new self(self::AUTHENTICATED);
+			case '{DAV:}href':
+				return new self(self::HREF, $tree['value']);
+			case '{DAV:}all':
+				return new self(self::ALL);
+			default :
+				throw new BadRequest('Unknown or unsupported principal type: ' . $tree['name']);
+		}
+
+	}
 
 }

libraries/SabreDAV/DAVACL/Xml/Request/ExpandPropertyReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return ExpandPropertyReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +81 added lines, -81 removed lines

@@ -18,86 +18,86 @@
  */
 class ExpandPropertyReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * The requested properties will be used as keys in this array. The value
-     * is normally null.
-     *
-     * If the value is an array though, it means the property must be expanded.
-     * Within the array, the sub-properties, which themselves may be null or
-     * arrays.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree();
-
-        $obj = new self();
-        $obj->properties = self::traverse($elems);
-
-        return $obj;
-
-    }
-
-    /**
-     * This method is used by deserializeXml, to recursively parse the
-     * {DAV:}property elements.
-     *
-     * @param array $elems
-     * @return void
-     */
-    private static function traverse($elems) {
-
-        $result = [];
-
-        foreach ($elems as $elem) {
-
-            if ($elem['name'] !== '{DAV:}property') {
-                continue;
-            }
-
-            $namespace = isset($elem['attributes']['namespace']) ?
-                $elem['attributes']['namespace'] :
-                'DAV:';
-
-            $propName = '{' . $namespace . '}' . $elem['attributes']['name'];
-
-            $value = null;
-            if (is_array($elem['value'])) {
-                $value = self::traverse($elem['value']);
-            }
-
-            $result[$propName] = $value;
-
-        }
-
-        return $result;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * The requested properties will be used as keys in this array. The value
+	 * is normally null.
+	 *
+	 * If the value is an array though, it means the property must be expanded.
+	 * Within the array, the sub-properties, which themselves may be null or
+	 * arrays.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree();
+
+		$obj = new self();
+		$obj->properties = self::traverse($elems);
+
+		return $obj;
+
+	}
+
+	/**
+	 * This method is used by deserializeXml, to recursively parse the
+	 * {DAV:}property elements.
+	 *
+	 * @param array $elems
+	 * @return void
+	 */
+	private static function traverse($elems) {
+
+		$result = [];
+
+		foreach ($elems as $elem) {
+
+			if ($elem['name'] !== '{DAV:}property') {
+				continue;
+			}
+
+			$namespace = isset($elem['attributes']['namespace']) ?
+				$elem['attributes']['namespace'] :
+				'DAV:';
+
+			$propName = '{' . $namespace . '}' . $elem['attributes']['name'];
+
+			$value = null;
+			if (is_array($elem['value'])) {
+				$value = self::traverse($elem['value']);
+			}
+
+			$result[$propName] = $value;
+
+		}
+
+		return $result;
+
+	}
 
 }

Spacing +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
             }
 
             $namespace = isset($elem['attributes']['namespace']) ?
-                $elem['attributes']['namespace'] :
-                'DAV:';
+                $elem['attributes']['namespace'] : 'DAV:';
 
             $propName = '{' . $namespace . '}' . $elem['attributes']['name'];
 

libraries/SabreDAV/DAVACL/Xml/Request/PrincipalPropertySearchReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return PrincipalPropertySearchReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +102 added lines, -102 removed lines

@@ -20,108 +20,108 @@
  */
 class PrincipalPropertySearchReport implements XmlDeserializable {
 
-    /**
-     * The requested properties.
-     *
-     * @var array|null
-     */
-    public $properties;
-
-    /**
-     * searchProperties
-     *
-     * @var array
-     */
-    public $searchProperties = [];
-
-    /**
-     * By default the property search will be conducted on the url of the http
-     * request. If this is set to true, it will be applied to the principal
-     * collection set instead.
-     *
-     * @var bool
-     */
-    public $applyToPrincipalCollectionSet = false;
-
-    /**
-     * Search for principals matching ANY of the properties (OR) or a ALL of
-     * the properties (AND).
-     *
-     * This property is either "anyof" or "allof".
-     *
-     * @var string
-     */
-    public $test;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $self = new self();
-
-        $foundSearchProp = false;
-        $self->test = 'allof';
-        if ($reader->getAttribute('test') === 'anyof') {
-            $self->test = 'anyof';
-        }
-
-        $elemMap = [
-            '{DAV:}property-search' => 'Sabre\\Xml\\Element\\KeyValue',
-            '{DAV:}prop'            => 'Sabre\\Xml\\Element\\KeyValue',
-        ];
+	/**
+	 * The requested properties.
+	 *
+	 * @var array|null
+	 */
+	public $properties;
+
+	/**
+	 * searchProperties
+	 *
+	 * @var array
+	 */
+	public $searchProperties = [];
+
+	/**
+	 * By default the property search will be conducted on the url of the http
+	 * request. If this is set to true, it will be applied to the principal
+	 * collection set instead.
+	 *
+	 * @var bool
+	 */
+	public $applyToPrincipalCollectionSet = false;
+
+	/**
+	 * Search for principals matching ANY of the properties (OR) or a ALL of
+	 * the properties (AND).
+	 *
+	 * This property is either "anyof" or "allof".
+	 *
+	 * @var string
+	 */
+	public $test;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$self = new self();
+
+		$foundSearchProp = false;
+		$self->test = 'allof';
+		if ($reader->getAttribute('test') === 'anyof') {
+			$self->test = 'anyof';
+		}
+
+		$elemMap = [
+			'{DAV:}property-search' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{DAV:}prop'            => 'Sabre\\Xml\\Element\\KeyValue',
+		];
         
-        foreach ($reader->parseInnerTree($elemMap) as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $self->properties = array_keys($elem['value']);
-                    break;
-                case '{DAV:}property-search' :
-                    $foundSearchProp = true;
-                    // This property has two sub-elements:
-                    //   {DAV:}prop - The property to be searched on. This may
-                    //                also be more than one
-                    //   {DAV:}match - The value to match with
-                    if (!isset($elem['value']['{DAV:}prop']) || !isset($elem['value']['{DAV:}match'])) {
-                        throw new BadRequest('The {DAV:}property-search element must contain one {DAV:}match and one {DAV:}prop element');
-                    }
-                    foreach ($elem['value']['{DAV:}prop'] as $propName => $discard) {
-                        $self->searchProperties[$propName] = $elem['value']['{DAV:}match'];
-                    }
-                    break;
-                case '{DAV:}apply-to-principal-collection-set' :
-                    $self->applyToPrincipalCollectionSet = true;
-                    break;
-
-            }
-
-        }
-        if (!$foundSearchProp) {
-            throw new BadRequest('The {DAV:}principal-property-search report must contain at least 1 {DAV:}property-search element');
-        }
-
-        return $self;
-
-    }
+		foreach ($reader->parseInnerTree($elemMap) as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$self->properties = array_keys($elem['value']);
+					break;
+				case '{DAV:}property-search' :
+					$foundSearchProp = true;
+					// This property has two sub-elements:
+					//   {DAV:}prop - The property to be searched on. This may
+					//                also be more than one
+					//   {DAV:}match - The value to match with
+					if (!isset($elem['value']['{DAV:}prop']) || !isset($elem['value']['{DAV:}match'])) {
+						throw new BadRequest('The {DAV:}property-search element must contain one {DAV:}match and one {DAV:}prop element');
+					}
+					foreach ($elem['value']['{DAV:}prop'] as $propName => $discard) {
+						$self->searchProperties[$propName] = $elem['value']['{DAV:}match'];
+					}
+					break;
+				case '{DAV:}apply-to-principal-collection-set' :
+					$self->applyToPrincipalCollectionSet = true;
+					break;
+
+			}
+
+		}
+		if (!$foundSearchProp) {
+			throw new BadRequest('The {DAV:}principal-property-search report must contain at least 1 {DAV:}property-search element');
+		}
+
+		return $self;
+
+	}
 
 }

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.

libraries/SabreDAV/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return PrincipalSearchPropertySetReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +34 added lines, -34 removed lines

@@ -20,39 +20,39 @@
  */
 class PrincipalSearchPropertySetReport implements XmlDeserializable {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        if (!$reader->isEmptyElement) {
-            throw new BadRequest('The {DAV:}principal-search-property-set element must be empty');
-        }
-
-        // The element is actually empty, so there's not much to do.
-        $reader->next();
-
-        $self = new self();
-        return $self;
-
-    }
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		if (!$reader->isEmptyElement) {
+			throw new BadRequest('The {DAV:}principal-search-property-set element must be empty');
+		}
+
+		// The element is actually empty, so there's not much to do.
+		$reader->next();
+
+		$self = new self();
+		return $self;
+
+	}
 
 }

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.