YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAV/Locks/Backend/File.php

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
 
         // Checking if we can remove any of these locks
         foreach ($newLocks as $k => $lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+            if (time() > $lock->timeout + $lock->created) {
+            	unset($newLocks[$k]);
+            }
         }
         return $newLocks;
 
@@ -140,7 +142,9 @@ 
      */
     protected function getData() {
 
-        if (!file_exists($this->locksFile)) return [];
+        if (!file_exists($this->locksFile)) {
+        	return [];
+        }
 
         // opening up the file, and creating a shared lock
         $handle = fopen($this->locksFile, 'r');
@@ -155,7 +159,9 @@ 
 
         // Unserializing and checking if the resource file contains data for this file
         $data = unserialize($data);
-        if (!$data) return [];
+        if (!$data) {
+        	return [];
+        }
         return $data;
 
     }

Indentation +160 added lines, -160 removed lines

@@ -19,167 +19,167 @@
  */
 class File extends AbstractBackend {
 
-    /**
-     * The storage file
-     *
-     * @var string
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = [];
-
-        $locks = $this->getData();
-
-        foreach ($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth != 0 && strpos($uri, $lock->uri . '/') === 0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/') === 0))) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach ($newLocks as $k => $lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getData();
-
-        foreach ($locks as $k => $lock) {
-            if (
-                ($lock->token == $lockInfo->token) ||
-                (time() > $lock->timeout + $lock->created)
-            ) {
-                unset($locks[$k]);
-            }
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $locks = $this->getData();
-        foreach ($locks as $k => $lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return [];
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile, 'r');
-        flock($handle, LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
+	/**
+	 * The storage file
+	 *
+	 * @var string
+	 */
+	private $locksFile;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $locksFile path to file
+	 */
+	public function __construct($locksFile) {
+
+		$this->locksFile = $locksFile;
+
+	}
+
+	/**
+	 * Returns a list of Sabre\DAV\Locks\LockInfo objects
+	 *
+	 * This method should return all the locks for a particular uri, including
+	 * locks that might be set on a parent uri.
+	 *
+	 * If returnChildLocks is set to true, this method should also look for
+	 * any locks in the subtree of the uri for locks.
+	 *
+	 * @param string $uri
+	 * @param bool $returnChildLocks
+	 * @return array
+	 */
+	public function getLocks($uri, $returnChildLocks) {
+
+		$newLocks = [];
+
+		$locks = $this->getData();
+
+		foreach ($locks as $lock) {
+
+			if ($lock->uri === $uri ||
+				//deep locks on parents
+				($lock->depth != 0 && strpos($uri, $lock->uri . '/') === 0) ||
+
+				// locks on children
+				($returnChildLocks && (strpos($lock->uri, $uri . '/') === 0))) {
+
+				$newLocks[] = $lock;
+
+			}
+
+		}
+
+		// Checking if we can remove any of these locks
+		foreach ($newLocks as $k => $lock) {
+			if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+		}
+		return $newLocks;
+
+	}
+
+	/**
+	 * Locks a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function lock($uri, LockInfo $lockInfo) {
+
+		// We're making the lock timeout 30 minutes
+		$lockInfo->timeout = 1800;
+		$lockInfo->created = time();
+		$lockInfo->uri = $uri;
+
+		$locks = $this->getData();
+
+		foreach ($locks as $k => $lock) {
+			if (
+				($lock->token == $lockInfo->token) ||
+				(time() > $lock->timeout + $lock->created)
+			) {
+				unset($locks[$k]);
+			}
+		}
+		$locks[] = $lockInfo;
+		$this->putData($locks);
+		return true;
+
+	}
+
+	/**
+	 * Removes a lock from a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function unlock($uri, LockInfo $lockInfo) {
+
+		$locks = $this->getData();
+		foreach ($locks as $k => $lock) {
+
+			if ($lock->token == $lockInfo->token) {
+
+				unset($locks[$k]);
+				$this->putData($locks);
+				return true;
+
+			}
+		}
+		return false;
+
+	}
+
+	/**
+	 * Loads the lockdata from the filesystem.
+	 *
+	 * @return array
+	 */
+	protected function getData() {
+
+		if (!file_exists($this->locksFile)) return [];
+
+		// opening up the file, and creating a shared lock
+		$handle = fopen($this->locksFile, 'r');
+		flock($handle, LOCK_SH);
+
+		// Reading data until the eof
+		$data = stream_get_contents($handle);
 
-        // We're all good
-        flock($handle, LOCK_UN);
-        fclose($handle);
+		// We're all good
+		flock($handle, LOCK_UN);
+		fclose($handle);
 
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return [];
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile, 'a+');
-        flock($handle, LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle, 0);
-        rewind($handle);
-
-        fwrite($handle, serialize($newData));
-        flock($handle, LOCK_UN);
-        fclose($handle);
-
-    }
+		// Unserializing and checking if the resource file contains data for this file
+		$data = unserialize($data);
+		if (!$data) return [];
+		return $data;
+
+	}
+
+	/**
+	 * Saves the lockdata
+	 *
+	 * @param array $newData
+	 * @return void
+	 */
+	protected function putData(array $newData) {
+
+		// opening up the file, and creating an exclusive lock
+		$handle = fopen($this->locksFile, 'a+');
+		flock($handle, LOCK_EX);
+
+		// We can only truncate and rewind once the lock is acquired.
+		ftruncate($handle, 0);
+		rewind($handle);
+
+		fwrite($handle, serialize($newData));
+		flock($handle, LOCK_UN);
+		fclose($handle);
+
+	}
 
 }

libraries/SabreDAV/DAV/Client.php

Spacing +2 added lines, -2 removed lines

@@ -229,7 +229,7 @@ 
 
         $response = $this->send($request);
 
-        if ((int)$response->getStatus() >= 400) {
+        if ((int) $response->getStatus() >= 400) {
             throw new \Sabre\HTTP\ClientHttpException($response);
         }
 
@@ -372,7 +372,7 @@ 
         $response = $this->send(new HTTP\Request($method, $url, $headers, $body));
         return [
             'body'       => $response->getBodyAsString(),
-            'statusCode' => (int)$response->getStatus(),
+            'statusCode' => (int) $response->getStatus(),
             'headers'    => array_change_key_case($response->getHeaders()),
         ];
 

Indentation +426 added lines, -426 removed lines

@@ -18,431 +18,431 @@
  */
 class Client extends HTTP\Client {
 
-    /**
-     * The xml service.
-     *
-     * Uset this service to configure the property and namespace maps.
-     *
-     * @var mixed
-     */
-    public $xml;
-
-    /**
-     * The elementMap
-     *
-     * This property is linked via reference to $this->xml->elementMap.
-     * It's deprecated as of version 3.0.0, and should no longer be used.
-     *
-     * @deprecated
-     * @var array
-     */
-    public $propertyMap = [];
-
-    /**
-     * Base URI
-     *
-     * This URI will be used to resolve relative urls.
-     *
-     * @var string
-     */
-    protected $baseUri;
-
-    /**
-     * Basic authentication
-     */
-    const AUTH_BASIC = 1;
-
-    /**
-     * Digest authentication
-     */
-    const AUTH_DIGEST = 2;
-
-    /**
-     * NTLM authentication
-     */
-    const AUTH_NTLM = 4;
-
-    /**
-     * Identity encoding, which basically does not nothing.
-     */
-    const ENCODING_IDENTITY = 1;
-
-    /**
-     * Deflate encoding
-     */
-    const ENCODING_DEFLATE = 2;
-
-    /**
-     * Gzip encoding
-     */
-    const ENCODING_GZIP = 4;
-
-    /**
-     * Sends all encoding headers.
-     */
-    const ENCODING_ALL = 7;
-
-    /**
-     * Content-encoding
-     *
-     * @var int
-     */
-    protected $encoding = self::ENCODING_IDENTITY;
-
-    /**
-     * Constructor
-     *
-     * Settings are provided through the 'settings' argument. The following
-     * settings are supported:
-     *
-     *   * baseUri
-     *   * userName (optional)
-     *   * password (optional)
-     *   * proxy (optional)
-     *   * authType (optional)
-     *   * encoding (optional)
-     *
-     *  authType must be a bitmap, using self::AUTH_BASIC, self::AUTH_DIGEST
-     *  and self::AUTH_NTLM. If you know which authentication method will be
-     *  used, it's recommended to set it, as it will save a great deal of
-     *  requests to 'discover' this information.
-     *
-     *  Encoding is a bitmap with one of the ENCODING constants.
-     *
-     * @param array $settings
-     */
-    public function __construct(array $settings) {
-
-        if (!isset($settings['baseUri'])) {
-            throw new \InvalidArgumentException('A baseUri must be provided');
-        }
-
-        parent::__construct();
-
-        $this->baseUri = $settings['baseUri'];
-
-        if (isset($settings['proxy'])) {
-            $this->addCurlSetting(CURLOPT_PROXY, $settings['proxy']);
-        }
-
-        if (isset($settings['userName'])) {
-            $userName = $settings['userName'];
-            $password = isset($settings['password']) ? $settings['password'] : '';
-
-            if (isset($settings['authType'])) {
-                $curlType = 0;
-                if ($settings['authType'] & self::AUTH_BASIC) {
-                    $curlType |= CURLAUTH_BASIC;
-                }
-                if ($settings['authType'] & self::AUTH_DIGEST) {
-                    $curlType |= CURLAUTH_DIGEST;
-                }
-                if ($settings['authType'] & self::AUTH_NTLM) {
-                    $curlType |= CURLAUTH_NTLM;
-                }
-            } else {
-                $curlType = CURLAUTH_BASIC | CURLAUTH_DIGEST;
-            }
-
-            $this->addCurlSetting(CURLOPT_HTTPAUTH, $curlType);
-            $this->addCurlSetting(CURLOPT_USERPWD, $userName . ':' . $password);
-
-        }
-
-        if (isset($settings['encoding'])) {
-            $encoding = $settings['encoding'];
-
-            $encodings = [];
-            if ($encoding & self::ENCODING_IDENTITY) {
-                $encodings[] = 'identity';
-            }
-            if ($encoding & self::ENCODING_DEFLATE) {
-                $encodings[] = 'deflate';
-            }
-            if ($encoding & self::ENCODING_GZIP) {
-                $encodings[] = 'gzip';
-            }
-            $this->addCurlSetting(CURLOPT_ENCODING, implode(',', $encodings));
-        }
-
-        $this->addCurlSetting(CURLOPT_USERAGENT, 'sabre-dav/' . Version::VERSION . ' (http://sabre.io/)');
-
-        $this->xml = new Xml\Service();
-        // BC
-        $this->propertyMap = & $this->xml->elementMap;
-
-    }
-
-    /**
-     * Does a PROPFIND request
-     *
-     * The list of requested properties must be specified as an array, in clark
-     * notation.
-     *
-     * The returned array will contain a list of filenames as keys, and
-     * properties as values.
-     *
-     * The properties array will contain the list of properties. Only properties
-     * that are actually returned from the server (without error) will be
-     * returned, anything else is discarded.
-     *
-     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
-     * made to the server to also return all child resources.
-     *
-     * @param string $url
-     * @param array $properties
-     * @param int $depth
-     * @return array
-     */
-    public function propFind($url, array $properties, $depth = 0) {
-
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $root = $dom->createElementNS('DAV:', 'd:propfind');
-        $prop = $dom->createElement('d:prop');
-
-        foreach ($properties as $property) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = \Sabre\Xml\Service::parseClarkNotation($property);
-
-            if ($namespace === 'DAV:') {
-                $element = $dom->createElement('d:' . $elementName);
-            } else {
-                $element = $dom->createElementNS($namespace, 'x:' . $elementName);
-            }
-
-            $prop->appendChild($element);
-        }
-
-        $dom->appendChild($root)->appendChild($prop);
-        $body = $dom->saveXML();
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $request = new HTTP\Request('PROPFIND', $url, [
-            'Depth'        => $depth,
-            'Content-Type' => 'application/xml'
-        ], $body);
-
-        $response = $this->send($request);
-
-        if ((int)$response->getStatus() >= 400) {
-            throw new \Sabre\HTTP\ClientHttpException($response);
-        }
-
-        $result = $this->parseMultiStatus($response->getBodyAsString());
-
-        // If depth was 0, we only return the top item
-        if ($depth === 0) {
-            reset($result);
-            $result = current($result);
-            return isset($result[200]) ? $result[200] : [];
-        }
-
-        $newResult = [];
-        foreach ($result as $href => $statusList) {
-
-            $newResult[$href] = isset($statusList[200]) ? $statusList[200] : [];
-
-        }
-
-        return $newResult;
-
-    }
-
-    /**
-     * Updates a list of properties on the server
-     *
-     * The list of properties must have clark-notation properties for the keys,
-     * and the actual (string) value for the value. If the value is null, an
-     * attempt is made to delete the property.
-     *
-     * @param string $url
-     * @param array $properties
-     * @return bool
-     */
-    public function propPatch($url, array $properties) {
-
-        $propPatch = new Xml\Request\PropPatch();
-        $propPatch->properties = $properties;
-        $xml = $this->xml->write(
-            '{DAV:}propertyupdate',
-            $propPatch
-        );
-
-        $url = $this->getAbsoluteUrl($url);
-        $request = new HTTP\Request('PROPPATCH', $url, [
-            'Content-Type' => 'application/xml',
-        ], $xml);
-        $response = $this->send($request);
-
-        if ($response->getStatus() >= 400) {
-            throw new \Sabre\HTTP\ClientHttpException($response);
-        }
-
-        if ($response->getStatus() === 207) {
-            // If it's a 207, the request could still have failed, but the
-            // information is hidden in the response body.
-            $result = $this->parseMultiStatus($response->getBodyAsString());
-
-            $errorProperties = [];
-            foreach ($result as $href => $statusList) {
-                foreach ($statusList as $status => $properties) {
-
-                    if ($status >= 400) {
-                        foreach ($properties as $propName => $propValue) {
-                            $errorProperties[] = $propName . ' (' . $status . ')';
-                        }
-                    }
-
-                }
-            }
-            if ($errorProperties) {
-
-                throw new \Sabre\HTTP\ClientException('PROPPATCH failed. The following properties errored: ' . implode(', ', $errorProperties));
-            }
-        }
-        return true;
-
-    }
-
-    /**
-     * Performs an HTTP options request
-     *
-     * This method returns all the features from the 'DAV:' header as an array.
-     * If there was no DAV header, or no contents this method will return an
-     * empty array.
-     *
-     * @return array
-     */
-    public function options() {
-
-        $request = new HTTP\Request('OPTIONS', $this->getAbsoluteUrl(''));
-        $response = $this->send($request);
-
-        $dav = $response->getHeader('Dav');
-        if (!$dav) {
-            return [];
-        }
-
-        $features = explode(',', $dav);
-        foreach ($features as &$v) {
-            $v = trim($v);
-        }
-        return $features;
-
-    }
-
-    /**
-     * Performs an actual HTTP request, and returns the result.
-     *
-     * If the specified url is relative, it will be expanded based on the base
-     * url.
-     *
-     * The returned array contains 3 keys:
-     *   * body - the response body
-     *   * httpCode - a HTTP code (200, 404, etc)
-     *   * headers - a list of response http headers. The header names have
-     *     been lowercased.
-     *
-     * For large uploads, it's highly recommended to specify body as a stream
-     * resource. You can easily do this by simply passing the result of
-     * fopen(..., 'r').
-     *
-     * This method will throw an exception if an HTTP error was received. Any
-     * HTTP status code above 399 is considered an error.
-     *
-     * Note that it is no longer recommended to use this method, use the send()
-     * method instead.
-     *
-     * @param string $method
-     * @param string $url
-     * @param string|resource|null $body
-     * @param array $headers
-     * @throws ClientException, in case a curl error occurred.
-     * @return array
-     */
-    public function request($method, $url = '', $body = null, array $headers = []) {
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $response = $this->send(new HTTP\Request($method, $url, $headers, $body));
-        return [
-            'body'       => $response->getBodyAsString(),
-            'statusCode' => (int)$response->getStatus(),
-            'headers'    => array_change_key_case($response->getHeaders()),
-        ];
-
-    }
-
-    /**
-     * Returns the full url based on the given url (which may be relative). All
-     * urls are expanded based on the base url as given by the server.
-     *
-     * @param string $url
-     * @return string
-     */
-    public function getAbsoluteUrl($url) {
-
-        // If the url starts with http:// or https://, the url is already absolute.
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off
-        // the root of the base url.
-        if (strpos($url, '/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port']) ? ':' . $parts['port'] : '') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
-
-    }
-
-    /**
-     * Parses a WebDAV multistatus response body
-     *
-     * This method returns an array with the following structure
-     *
-     * [
-     *   'url/to/resource' => [
-     *     '200' => [
-     *        '{DAV:}property1' => 'value1',
-     *        '{DAV:}property2' => 'value2',
-     *     ],
-     *     '404' => [
-     *        '{DAV:}property1' => null,
-     *        '{DAV:}property2' => null,
-     *     ],
-     *   ],
-     *   'url/to/resource2' => [
-     *      .. etc ..
-     *   ]
-     * ]
-     *
-     *
-     * @param string $body xml body
-     * @return array
-     */
-    public function parseMultiStatus($body) {
-
-        $multistatus = $this->xml->expect('{DAV:}multistatus', $body);
-
-        $result = [];
-
-        foreach ($multistatus->getResponses() as $response) {
-
-            $result[$response->getHref()] = $response->getResponseProperties();
-
-        }
-
-        return $result;
-
-    }
+	/**
+	 * The xml service.
+	 *
+	 * Uset this service to configure the property and namespace maps.
+	 *
+	 * @var mixed
+	 */
+	public $xml;
+
+	/**
+	 * The elementMap
+	 *
+	 * This property is linked via reference to $this->xml->elementMap.
+	 * It's deprecated as of version 3.0.0, and should no longer be used.
+	 *
+	 * @deprecated
+	 * @var array
+	 */
+	public $propertyMap = [];
+
+	/**
+	 * Base URI
+	 *
+	 * This URI will be used to resolve relative urls.
+	 *
+	 * @var string
+	 */
+	protected $baseUri;
+
+	/**
+	 * Basic authentication
+	 */
+	const AUTH_BASIC = 1;
+
+	/**
+	 * Digest authentication
+	 */
+	const AUTH_DIGEST = 2;
+
+	/**
+	 * NTLM authentication
+	 */
+	const AUTH_NTLM = 4;
+
+	/**
+	 * Identity encoding, which basically does not nothing.
+	 */
+	const ENCODING_IDENTITY = 1;
+
+	/**
+	 * Deflate encoding
+	 */
+	const ENCODING_DEFLATE = 2;
+
+	/**
+	 * Gzip encoding
+	 */
+	const ENCODING_GZIP = 4;
+
+	/**
+	 * Sends all encoding headers.
+	 */
+	const ENCODING_ALL = 7;
+
+	/**
+	 * Content-encoding
+	 *
+	 * @var int
+	 */
+	protected $encoding = self::ENCODING_IDENTITY;
+
+	/**
+	 * Constructor
+	 *
+	 * Settings are provided through the 'settings' argument. The following
+	 * settings are supported:
+	 *
+	 *   * baseUri
+	 *   * userName (optional)
+	 *   * password (optional)
+	 *   * proxy (optional)
+	 *   * authType (optional)
+	 *   * encoding (optional)
+	 *
+	 *  authType must be a bitmap, using self::AUTH_BASIC, self::AUTH_DIGEST
+	 *  and self::AUTH_NTLM. If you know which authentication method will be
+	 *  used, it's recommended to set it, as it will save a great deal of
+	 *  requests to 'discover' this information.
+	 *
+	 *  Encoding is a bitmap with one of the ENCODING constants.
+	 *
+	 * @param array $settings
+	 */
+	public function __construct(array $settings) {
+
+		if (!isset($settings['baseUri'])) {
+			throw new \InvalidArgumentException('A baseUri must be provided');
+		}
+
+		parent::__construct();
+
+		$this->baseUri = $settings['baseUri'];
+
+		if (isset($settings['proxy'])) {
+			$this->addCurlSetting(CURLOPT_PROXY, $settings['proxy']);
+		}
+
+		if (isset($settings['userName'])) {
+			$userName = $settings['userName'];
+			$password = isset($settings['password']) ? $settings['password'] : '';
+
+			if (isset($settings['authType'])) {
+				$curlType = 0;
+				if ($settings['authType'] & self::AUTH_BASIC) {
+					$curlType |= CURLAUTH_BASIC;
+				}
+				if ($settings['authType'] & self::AUTH_DIGEST) {
+					$curlType |= CURLAUTH_DIGEST;
+				}
+				if ($settings['authType'] & self::AUTH_NTLM) {
+					$curlType |= CURLAUTH_NTLM;
+				}
+			} else {
+				$curlType = CURLAUTH_BASIC | CURLAUTH_DIGEST;
+			}
+
+			$this->addCurlSetting(CURLOPT_HTTPAUTH, $curlType);
+			$this->addCurlSetting(CURLOPT_USERPWD, $userName . ':' . $password);
+
+		}
+
+		if (isset($settings['encoding'])) {
+			$encoding = $settings['encoding'];
+
+			$encodings = [];
+			if ($encoding & self::ENCODING_IDENTITY) {
+				$encodings[] = 'identity';
+			}
+			if ($encoding & self::ENCODING_DEFLATE) {
+				$encodings[] = 'deflate';
+			}
+			if ($encoding & self::ENCODING_GZIP) {
+				$encodings[] = 'gzip';
+			}
+			$this->addCurlSetting(CURLOPT_ENCODING, implode(',', $encodings));
+		}
+
+		$this->addCurlSetting(CURLOPT_USERAGENT, 'sabre-dav/' . Version::VERSION . ' (http://sabre.io/)');
+
+		$this->xml = new Xml\Service();
+		// BC
+		$this->propertyMap = & $this->xml->elementMap;
+
+	}
+
+	/**
+	 * Does a PROPFIND request
+	 *
+	 * The list of requested properties must be specified as an array, in clark
+	 * notation.
+	 *
+	 * The returned array will contain a list of filenames as keys, and
+	 * properties as values.
+	 *
+	 * The properties array will contain the list of properties. Only properties
+	 * that are actually returned from the server (without error) will be
+	 * returned, anything else is discarded.
+	 *
+	 * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+	 * made to the server to also return all child resources.
+	 *
+	 * @param string $url
+	 * @param array $properties
+	 * @param int $depth
+	 * @return array
+	 */
+	public function propFind($url, array $properties, $depth = 0) {
+
+		$dom = new \DOMDocument('1.0', 'UTF-8');
+		$dom->formatOutput = true;
+		$root = $dom->createElementNS('DAV:', 'd:propfind');
+		$prop = $dom->createElement('d:prop');
+
+		foreach ($properties as $property) {
+
+			list(
+				$namespace,
+				$elementName
+			) = \Sabre\Xml\Service::parseClarkNotation($property);
+
+			if ($namespace === 'DAV:') {
+				$element = $dom->createElement('d:' . $elementName);
+			} else {
+				$element = $dom->createElementNS($namespace, 'x:' . $elementName);
+			}
+
+			$prop->appendChild($element);
+		}
+
+		$dom->appendChild($root)->appendChild($prop);
+		$body = $dom->saveXML();
+
+		$url = $this->getAbsoluteUrl($url);
+
+		$request = new HTTP\Request('PROPFIND', $url, [
+			'Depth'        => $depth,
+			'Content-Type' => 'application/xml'
+		], $body);
+
+		$response = $this->send($request);
+
+		if ((int)$response->getStatus() >= 400) {
+			throw new \Sabre\HTTP\ClientHttpException($response);
+		}
+
+		$result = $this->parseMultiStatus($response->getBodyAsString());
+
+		// If depth was 0, we only return the top item
+		if ($depth === 0) {
+			reset($result);
+			$result = current($result);
+			return isset($result[200]) ? $result[200] : [];
+		}
+
+		$newResult = [];
+		foreach ($result as $href => $statusList) {
+
+			$newResult[$href] = isset($statusList[200]) ? $statusList[200] : [];
+
+		}
+
+		return $newResult;
+
+	}
+
+	/**
+	 * Updates a list of properties on the server
+	 *
+	 * The list of properties must have clark-notation properties for the keys,
+	 * and the actual (string) value for the value. If the value is null, an
+	 * attempt is made to delete the property.
+	 *
+	 * @param string $url
+	 * @param array $properties
+	 * @return bool
+	 */
+	public function propPatch($url, array $properties) {
+
+		$propPatch = new Xml\Request\PropPatch();
+		$propPatch->properties = $properties;
+		$xml = $this->xml->write(
+			'{DAV:}propertyupdate',
+			$propPatch
+		);
+
+		$url = $this->getAbsoluteUrl($url);
+		$request = new HTTP\Request('PROPPATCH', $url, [
+			'Content-Type' => 'application/xml',
+		], $xml);
+		$response = $this->send($request);
+
+		if ($response->getStatus() >= 400) {
+			throw new \Sabre\HTTP\ClientHttpException($response);
+		}
+
+		if ($response->getStatus() === 207) {
+			// If it's a 207, the request could still have failed, but the
+			// information is hidden in the response body.
+			$result = $this->parseMultiStatus($response->getBodyAsString());
+
+			$errorProperties = [];
+			foreach ($result as $href => $statusList) {
+				foreach ($statusList as $status => $properties) {
+
+					if ($status >= 400) {
+						foreach ($properties as $propName => $propValue) {
+							$errorProperties[] = $propName . ' (' . $status . ')';
+						}
+					}
+
+				}
+			}
+			if ($errorProperties) {
+
+				throw new \Sabre\HTTP\ClientException('PROPPATCH failed. The following properties errored: ' . implode(', ', $errorProperties));
+			}
+		}
+		return true;
+
+	}
+
+	/**
+	 * Performs an HTTP options request
+	 *
+	 * This method returns all the features from the 'DAV:' header as an array.
+	 * If there was no DAV header, or no contents this method will return an
+	 * empty array.
+	 *
+	 * @return array
+	 */
+	public function options() {
+
+		$request = new HTTP\Request('OPTIONS', $this->getAbsoluteUrl(''));
+		$response = $this->send($request);
+
+		$dav = $response->getHeader('Dav');
+		if (!$dav) {
+			return [];
+		}
+
+		$features = explode(',', $dav);
+		foreach ($features as &$v) {
+			$v = trim($v);
+		}
+		return $features;
+
+	}
+
+	/**
+	 * Performs an actual HTTP request, and returns the result.
+	 *
+	 * If the specified url is relative, it will be expanded based on the base
+	 * url.
+	 *
+	 * The returned array contains 3 keys:
+	 *   * body - the response body
+	 *   * httpCode - a HTTP code (200, 404, etc)
+	 *   * headers - a list of response http headers. The header names have
+	 *     been lowercased.
+	 *
+	 * For large uploads, it's highly recommended to specify body as a stream
+	 * resource. You can easily do this by simply passing the result of
+	 * fopen(..., 'r').
+	 *
+	 * This method will throw an exception if an HTTP error was received. Any
+	 * HTTP status code above 399 is considered an error.
+	 *
+	 * Note that it is no longer recommended to use this method, use the send()
+	 * method instead.
+	 *
+	 * @param string $method
+	 * @param string $url
+	 * @param string|resource|null $body
+	 * @param array $headers
+	 * @throws ClientException, in case a curl error occurred.
+	 * @return array
+	 */
+	public function request($method, $url = '', $body = null, array $headers = []) {
+
+		$url = $this->getAbsoluteUrl($url);
+
+		$response = $this->send(new HTTP\Request($method, $url, $headers, $body));
+		return [
+			'body'       => $response->getBodyAsString(),
+			'statusCode' => (int)$response->getStatus(),
+			'headers'    => array_change_key_case($response->getHeaders()),
+		];
+
+	}
+
+	/**
+	 * Returns the full url based on the given url (which may be relative). All
+	 * urls are expanded based on the base url as given by the server.
+	 *
+	 * @param string $url
+	 * @return string
+	 */
+	public function getAbsoluteUrl($url) {
+
+		// If the url starts with http:// or https://, the url is already absolute.
+		if (preg_match('/^http(s?):\/\//', $url)) {
+			return $url;
+		}
+
+		// If the url starts with a slash, we must calculate the url based off
+		// the root of the base url.
+		if (strpos($url, '/') === 0) {
+			$parts = parse_url($this->baseUri);
+			return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port']) ? ':' . $parts['port'] : '') . $url;
+		}
+
+		// Otherwise...
+		return $this->baseUri . $url;
+
+	}
+
+	/**
+	 * Parses a WebDAV multistatus response body
+	 *
+	 * This method returns an array with the following structure
+	 *
+	 * [
+	 *   'url/to/resource' => [
+	 *     '200' => [
+	 *        '{DAV:}property1' => 'value1',
+	 *        '{DAV:}property2' => 'value2',
+	 *     ],
+	 *     '404' => [
+	 *        '{DAV:}property1' => null,
+	 *        '{DAV:}property2' => null,
+	 *     ],
+	 *   ],
+	 *   'url/to/resource2' => [
+	 *      .. etc ..
+	 *   ]
+	 * ]
+	 *
+	 *
+	 * @param string $body xml body
+	 * @return array
+	 */
+	public function parseMultiStatus($body) {
+
+		$multistatus = $this->xml->expect('{DAV:}multistatus', $body);
+
+		$result = [];
+
+		foreach ($multistatus->getResponses() as $response) {
+
+			$result[$response->getHref()] = $response->getResponseProperties();
+
+		}
+
+		return $result;
+
+	}
 
 }

libraries/SabreDAV/DAV/Server.php

Spacing +3 added lines, -3 removed lines

@@ -593,7 +593,7 @@ 
         // If its an unknown value. we'll grab the default
         if (!ctype_digit($depth)) return $default;
 
-        return (int)$depth;
+        return (int) $depth;
 
     }
 
@@ -914,7 +914,7 @@ 
         $path = trim($path, '/');
 
         $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS;
-        $propFind = new PropFind($path, (array)$propertyNames, $depth, $propFindType);
+        $propFind = new PropFind($path, (array) $propertyNames, $depth, $propFindType);
 
         $parentNode = $this->tree->getNodeForPath($path);
 
@@ -1399,7 +1399,7 @@ 
         // Plugins are responsible for validating all the tokens.
         // If a plugin deemed a token 'valid', it will set 'validToken' to
         // true.
-        $this->emit('validateTokens', [ $request, &$ifConditions ]);
+        $this->emit('validateTokens', [$request, &$ifConditions]);
 
         // Now we're going to analyze the result.
 

Indentation +1601 added lines, -1601 removed lines

@@ -18,1610 +18,1610 @@
  */
 class Server extends EventEmitter {
 
-    /**
-     * Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
-     */
-    const DEPTH_INFINITY = -1;
-
-    /**
-     * XML namespace for all SabreDAV related elements
-     */
-    const NS_SABREDAV = 'http://sabredav.org/ns';
-
-    /**
-     * The tree object
-     *
-     * @var Sabre\DAV\Tree
-     */
-    public $tree;
-
-    /**
-     * The base uri
-     *
-     * @var string
-     */
-    protected $baseUri = null;
-
-    /**
-     * httpResponse
-     *
-     * @var Sabre\HTTP\Response
-     */
-    public $httpResponse;
-
-    /**
-     * httpRequest
-     *
-     * @var Sabre\HTTP\Request
-     */
-    public $httpRequest;
-
-    /**
-     * PHP HTTP Sapi
-     *
-     * @var Sabre\HTTP\Sapi
-     */
-    public $sapi;
-
-    /**
-     * The list of plugins
-     *
-     * @var array
-     */
-    protected $plugins = [];
-
-    /**
-     * This property will be filled with a unique string that describes the
-     * transaction. This is useful for performance measuring and logging
-     * purposes.
-     *
-     * By default it will just fill it with a lowercased HTTP method name, but
-     * plugins override this. For example, the WebDAV-Sync sync-collection
-     * report will set this to 'report-sync-collection'.
-     *
-     * @var string
-     */
-    public $transactionType;
-
-    /**
-     * This is a list of properties that are always server-controlled, and
-     * must not get modified with PROPPATCH.
-     *
-     * Plugins may add to this list.
-     *
-     * @var string[]
-     */
-    public $protectedProperties = [
-
-        // RFC4918
-        '{DAV:}getcontentlength',
-        '{DAV:}getetag',
-        '{DAV:}getlastmodified',
-        '{DAV:}lockdiscovery',
-        '{DAV:}supportedlock',
-
-        // RFC4331
-        '{DAV:}quota-available-bytes',
-        '{DAV:}quota-used-bytes',
-
-        // RFC3744
-        '{DAV:}supported-privilege-set',
-        '{DAV:}current-user-privilege-set',
-        '{DAV:}acl',
-        '{DAV:}acl-restrictions',
-        '{DAV:}inherited-acl-set',
-
-        // RFC3253
-        '{DAV:}supported-method-set',
-        '{DAV:}supported-report-set',
-
-        // RFC6578
-        '{DAV:}sync-token',
-
-        // calendarserver.org extensions
-        '{http://calendarserver.org/ns/}ctag',
-
-        // sabredav extensions
-        '{http://sabredav.org/ns}sync-token',
-
-    ];
-
-    /**
-     * This is a flag that allow or not showing file, line and code
-     * of the exception in the returned XML
-     *
-     * @var bool
-     */
-    public $debugExceptions = false;
-
-    /**
-     * This property allows you to automatically add the 'resourcetype' value
-     * based on a node's classname or interface.
-     *
-     * The preset ensures that {DAV:}collection is automatically added for nodes
-     * implementing Sabre\DAV\ICollection.
-     *
-     * @var array
-     */
-    public $resourceTypeMapping = [
-        'Sabre\\DAV\\ICollection' => '{DAV:}collection',
-    ];
-
-    /**
-     * This property allows the usage of Depth: infinity on PROPFIND requests.
-     *
-     * By default Depth: infinity is treated as Depth: 1. Allowing Depth:
-     * infinity is potentially risky, as it allows a single client to do a full
-     * index of the webdav server, which is an easy DoS attack vector.
-     *
-     * Only turn this on if you know what you're doing.
-     *
-     * @var bool
-     */
-    public $enablePropfindDepthInfinity = false;
-
-    /**
-     * Reference to the XML utility object.
-     *
-     * @var Xml\Service
-     */
-    public $xml;
-
-    /**
-     * If this setting is turned off, SabreDAV's version number will be hidden
-     * from various places.
-     *
-     * Some people feel this is a good security measure.
-     *
-     * @var bool
-     */
-    static $exposeVersion = true;
-
-    /**
-     * Sets up the server
-     *
-     * If a Sabre\DAV\Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre\DAV\INode is passed, it
-     * will create a Sabre\DAV\Tree and use the node as the root.
-     *
-     * If nothing is passed, a Sabre\DAV\SimpleCollection is created in
-     * a Sabre\DAV\Tree.
-     *
-     * If an array is passed, we automatically create a root node, and use
-     * the nodes in the array as top-level children.
-     *
-     * @param Tree|INode|array|null $treeOrNode The tree object
-     */
-    public function __construct($treeOrNode = null) {
-
-        if ($treeOrNode instanceof Tree) {
-            $this->tree = $treeOrNode;
-        } elseif ($treeOrNode instanceof INode) {
-            $this->tree = new Tree($treeOrNode);
-        } elseif (is_array($treeOrNode)) {
-
-            // If it's an array, a list of nodes was passed, and we need to
-            // create the root node.
-            foreach ($treeOrNode as $node) {
-                if (!($node instanceof INode)) {
-                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre\\DAV\\INode');
-                }
-            }
-
-            $root = new SimpleCollection('root', $treeOrNode);
-            $this->tree = new Tree($root);
-
-        } elseif (is_null($treeOrNode)) {
-            $root = new SimpleCollection('root');
-            $this->tree = new Tree($root);
-        } else {
-            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
-        }
-
-        $this->xml = new Xml\Service();
-        $this->sapi = new HTTP\Sapi();
-        $this->httpResponse = new HTTP\Response();
-        $this->httpRequest = $this->sapi->getRequest();
-        $this->addPlugin(new CorePlugin());
-
-    }
-
-    /**
-     * Starts the DAV Server
-     *
-     * @return void
-     */
-    public function exec() {
-
-        try {
-
-            // If nginx (pre-1.2) is used as a proxy server, and SabreDAV as an
-            // origin, we must make sure we send back HTTP/1.0 if this was
-            // requested.
-            // This is mainly because nginx doesn't support Chunked Transfer
-            // Encoding, and this forces the webserver SabreDAV is running on,
-            // to buffer entire responses to calculate Content-Length.
-            $this->httpResponse->setHTTPVersion($this->httpRequest->getHTTPVersion());
-
-            // Setting the base url
-            $this->httpRequest->setBaseUrl($this->getBaseUri());
-            $this->invokeMethod($this->httpRequest, $this->httpResponse);
-
-        } catch (\Exception $e) {
-
-            try {
-                $this->emit('exception', [$e]);
-            } catch (\Exception $ignore) {
-            }
-            $DOM = new \DOMDocument('1.0', 'utf-8');
-            $DOM->formatOutput = true;
-
-            $error = $DOM->createElementNS('DAV:', 'd:error');
-            $error->setAttribute('xmlns:s', self::NS_SABREDAV);
-            $DOM->appendChild($error);
-
-            $h = function($v) {
-
-                return htmlspecialchars($v, ENT_NOQUOTES, 'UTF-8');
-
-            };
-
-            if (self::$exposeVersion) {
-                $error->appendChild($DOM->createElement('s:sabredav-version', $h(Version::VERSION)));
-            }
-
-            $error->appendChild($DOM->createElement('s:exception', $h(get_class($e))));
-            $error->appendChild($DOM->createElement('s:message', $h($e->getMessage())));
-            if ($this->debugExceptions) {
-                $error->appendChild($DOM->createElement('s:file', $h($e->getFile())));
-                $error->appendChild($DOM->createElement('s:line', $h($e->getLine())));
-                $error->appendChild($DOM->createElement('s:code', $h($e->getCode())));
-                $error->appendChild($DOM->createElement('s:stacktrace', $h($e->getTraceAsString())));
-            }
-
-            if ($this->debugExceptions) {
-                $previous = $e;
-                while ($previous = $previous->getPrevious()) {
-                    $xPrevious = $DOM->createElement('s:previous-exception');
-                    $xPrevious->appendChild($DOM->createElement('s:exception', $h(get_class($previous))));
-                    $xPrevious->appendChild($DOM->createElement('s:message', $h($previous->getMessage())));
-                    $xPrevious->appendChild($DOM->createElement('s:file', $h($previous->getFile())));
-                    $xPrevious->appendChild($DOM->createElement('s:line', $h($previous->getLine())));
-                    $xPrevious->appendChild($DOM->createElement('s:code', $h($previous->getCode())));
-                    $xPrevious->appendChild($DOM->createElement('s:stacktrace', $h($previous->getTraceAsString())));
-                    $error->appendChild($xPrevious);
-                }
-            }
-
-
-            if ($e instanceof Exception) {
-
-                $httpCode = $e->getHTTPCode();
-                $e->serialize($this, $error);
-                $headers = $e->getHTTPHeaders($this);
-
-            } else {
-
-                $httpCode = 500;
-                $headers = [];
-
-            }
-            $headers['Content-Type'] = 'application/xml; charset=utf-8';
-
-            $this->httpResponse->setStatus($httpCode);
-            $this->httpResponse->setHeaders($headers);
-            $this->httpResponse->setBody($DOM->saveXML());
-            $this->sapi->sendResponse($this->httpResponse);
-
-        }
-
-    }
-
-    /**
-     * Sets the base server uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function setBaseUri($uri) {
-
-        // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri) - 1] !== '/')
-            $uri .= '/';
-
-        $this->baseUri = $uri;
-
-    }
-
-    /**
-     * Returns the base responding uri
-     *
-     * @return string
-     */
-    public function getBaseUri() {
-
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
-        return $this->baseUri;
-
-    }
-
-    /**
-     * This method attempts to detect the base uri.
-     * Only the PATH_INFO variable is considered.
-     *
-     * If this variable is not set, the root (/) is assumed.
-     *
-     * @return string
-     */
-    public function guessBaseUri() {
-
-        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
-        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
-
-        // If PATH_INFO is found, we can assume it's accurate.
-        if (!empty($pathInfo)) {
-
-            // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri, '?'))
-                $uri = substr($uri, 0, $pos);
-
-            // PATH_INFO is only set for urls, such as: /example.php/path
-            // in that case PATH_INFO contains '/path'.
-            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
-            // not, Therefore they are only comparable if we first decode
-            // REQUEST_INFO as well.
-            $decodedUri = URLUtil::decodePath($uri);
-
-            // A simple sanity check:
-            if (substr($decodedUri, strlen($decodedUri) - strlen($pathInfo)) === $pathInfo) {
-                $baseUri = substr($decodedUri, 0, strlen($decodedUri) - strlen($pathInfo));
-                return rtrim($baseUri, '/') . '/';
-            }
-
-            throw new Exception('The REQUEST_URI (' . $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
-
-        }
-
-        // The last fallback is that we're just going to assume the server root.
-        return '/';
-
-    }
-
-    /**
-     * Adds a plugin to the server
-     *
-     * For more information, console the documentation of Sabre\DAV\ServerPlugin
-     *
-     * @param ServerPlugin $plugin
-     * @return void
-     */
-    public function addPlugin(ServerPlugin $plugin) {
-
-        $this->plugins[$plugin->getPluginName()] = $plugin;
-        $plugin->initialize($this);
-
-    }
-
-    /**
-     * Returns an initialized plugin by it's name.
-     *
-     * This function returns null if the plugin was not found.
-     *
-     * @param string $name
-     * @return ServerPlugin
-     */
-    public function getPlugin($name) {
-
-        if (isset($this->plugins[$name]))
-            return $this->plugins[$name];
-
-        return null;
-
-    }
-
-    /**
-     * Returns all plugins
-     *
-     * @return array
-     */
-    public function getPlugins() {
-
-        return $this->plugins;
-
-    }
-
-    /**
-     * Handles a http request, and execute a method based on its name
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @param $sendResponse Whether to send the HTTP response to the DAV client.
-     * @return void
-     */
-    public function invokeMethod(RequestInterface $request, ResponseInterface $response, $sendResponse = true) {
-
-        $method = $request->getMethod();
-
-        if (!$this->emit('beforeMethod:' . $method, [$request, $response])) return;
-        if (!$this->emit('beforeMethod', [$request, $response])) return;
-
-        if (self::$exposeVersion) {
-            $response->setHeader('X-Sabre-Version', Version::VERSION);
-        }
-
-        $this->transactionType = strtolower($method);
-
-        if (!$this->checkPreconditions($request, $response)) {
-            $this->sapi->sendResponse($response);
-            return;
-        }
-
-        if ($this->emit('method:' . $method, [$request, $response])) {
-            if ($this->emit('method', [$request, $response])) {
-                $exMessage = "There was no plugin in the system that was willing to handle this " . $method . " method.";
-                if ($method === "GET") {
-                    $exMessage .= " Enable the Browser plugin to get a better result here.";
-                }
-
-                // Unsupported method
-                throw new Exception\NotImplemented($exMessage);
-            }
-        }
-
-        if (!$this->emit('afterMethod:' . $method, [$request, $response])) return;
-        if (!$this->emit('afterMethod', [$request, $response])) return;
+	/**
+	 * Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
+	 */
+	const DEPTH_INFINITY = -1;
+
+	/**
+	 * XML namespace for all SabreDAV related elements
+	 */
+	const NS_SABREDAV = 'http://sabredav.org/ns';
+
+	/**
+	 * The tree object
+	 *
+	 * @var Sabre\DAV\Tree
+	 */
+	public $tree;
+
+	/**
+	 * The base uri
+	 *
+	 * @var string
+	 */
+	protected $baseUri = null;
+
+	/**
+	 * httpResponse
+	 *
+	 * @var Sabre\HTTP\Response
+	 */
+	public $httpResponse;
+
+	/**
+	 * httpRequest
+	 *
+	 * @var Sabre\HTTP\Request
+	 */
+	public $httpRequest;
+
+	/**
+	 * PHP HTTP Sapi
+	 *
+	 * @var Sabre\HTTP\Sapi
+	 */
+	public $sapi;
+
+	/**
+	 * The list of plugins
+	 *
+	 * @var array
+	 */
+	protected $plugins = [];
+
+	/**
+	 * This property will be filled with a unique string that describes the
+	 * transaction. This is useful for performance measuring and logging
+	 * purposes.
+	 *
+	 * By default it will just fill it with a lowercased HTTP method name, but
+	 * plugins override this. For example, the WebDAV-Sync sync-collection
+	 * report will set this to 'report-sync-collection'.
+	 *
+	 * @var string
+	 */
+	public $transactionType;
+
+	/**
+	 * This is a list of properties that are always server-controlled, and
+	 * must not get modified with PROPPATCH.
+	 *
+	 * Plugins may add to this list.
+	 *
+	 * @var string[]
+	 */
+	public $protectedProperties = [
+
+		// RFC4918
+		'{DAV:}getcontentlength',
+		'{DAV:}getetag',
+		'{DAV:}getlastmodified',
+		'{DAV:}lockdiscovery',
+		'{DAV:}supportedlock',
+
+		// RFC4331
+		'{DAV:}quota-available-bytes',
+		'{DAV:}quota-used-bytes',
+
+		// RFC3744
+		'{DAV:}supported-privilege-set',
+		'{DAV:}current-user-privilege-set',
+		'{DAV:}acl',
+		'{DAV:}acl-restrictions',
+		'{DAV:}inherited-acl-set',
+
+		// RFC3253
+		'{DAV:}supported-method-set',
+		'{DAV:}supported-report-set',
+
+		// RFC6578
+		'{DAV:}sync-token',
+
+		// calendarserver.org extensions
+		'{http://calendarserver.org/ns/}ctag',
+
+		// sabredav extensions
+		'{http://sabredav.org/ns}sync-token',
+
+	];
+
+	/**
+	 * This is a flag that allow or not showing file, line and code
+	 * of the exception in the returned XML
+	 *
+	 * @var bool
+	 */
+	public $debugExceptions = false;
+
+	/**
+	 * This property allows you to automatically add the 'resourcetype' value
+	 * based on a node's classname or interface.
+	 *
+	 * The preset ensures that {DAV:}collection is automatically added for nodes
+	 * implementing Sabre\DAV\ICollection.
+	 *
+	 * @var array
+	 */
+	public $resourceTypeMapping = [
+		'Sabre\\DAV\\ICollection' => '{DAV:}collection',
+	];
+
+	/**
+	 * This property allows the usage of Depth: infinity on PROPFIND requests.
+	 *
+	 * By default Depth: infinity is treated as Depth: 1. Allowing Depth:
+	 * infinity is potentially risky, as it allows a single client to do a full
+	 * index of the webdav server, which is an easy DoS attack vector.
+	 *
+	 * Only turn this on if you know what you're doing.
+	 *
+	 * @var bool
+	 */
+	public $enablePropfindDepthInfinity = false;
+
+	/**
+	 * Reference to the XML utility object.
+	 *
+	 * @var Xml\Service
+	 */
+	public $xml;
+
+	/**
+	 * If this setting is turned off, SabreDAV's version number will be hidden
+	 * from various places.
+	 *
+	 * Some people feel this is a good security measure.
+	 *
+	 * @var bool
+	 */
+	static $exposeVersion = true;
+
+	/**
+	 * Sets up the server
+	 *
+	 * If a Sabre\DAV\Tree object is passed as an argument, it will
+	 * use it as the directory tree. If a Sabre\DAV\INode is passed, it
+	 * will create a Sabre\DAV\Tree and use the node as the root.
+	 *
+	 * If nothing is passed, a Sabre\DAV\SimpleCollection is created in
+	 * a Sabre\DAV\Tree.
+	 *
+	 * If an array is passed, we automatically create a root node, and use
+	 * the nodes in the array as top-level children.
+	 *
+	 * @param Tree|INode|array|null $treeOrNode The tree object
+	 */
+	public function __construct($treeOrNode = null) {
+
+		if ($treeOrNode instanceof Tree) {
+			$this->tree = $treeOrNode;
+		} elseif ($treeOrNode instanceof INode) {
+			$this->tree = new Tree($treeOrNode);
+		} elseif (is_array($treeOrNode)) {
+
+			// If it's an array, a list of nodes was passed, and we need to
+			// create the root node.
+			foreach ($treeOrNode as $node) {
+				if (!($node instanceof INode)) {
+					throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre\\DAV\\INode');
+				}
+			}
+
+			$root = new SimpleCollection('root', $treeOrNode);
+			$this->tree = new Tree($root);
+
+		} elseif (is_null($treeOrNode)) {
+			$root = new SimpleCollection('root');
+			$this->tree = new Tree($root);
+		} else {
+			throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
+		}
+
+		$this->xml = new Xml\Service();
+		$this->sapi = new HTTP\Sapi();
+		$this->httpResponse = new HTTP\Response();
+		$this->httpRequest = $this->sapi->getRequest();
+		$this->addPlugin(new CorePlugin());
+
+	}
+
+	/**
+	 * Starts the DAV Server
+	 *
+	 * @return void
+	 */
+	public function exec() {
+
+		try {
+
+			// If nginx (pre-1.2) is used as a proxy server, and SabreDAV as an
+			// origin, we must make sure we send back HTTP/1.0 if this was
+			// requested.
+			// This is mainly because nginx doesn't support Chunked Transfer
+			// Encoding, and this forces the webserver SabreDAV is running on,
+			// to buffer entire responses to calculate Content-Length.
+			$this->httpResponse->setHTTPVersion($this->httpRequest->getHTTPVersion());
+
+			// Setting the base url
+			$this->httpRequest->setBaseUrl($this->getBaseUri());
+			$this->invokeMethod($this->httpRequest, $this->httpResponse);
+
+		} catch (\Exception $e) {
+
+			try {
+				$this->emit('exception', [$e]);
+			} catch (\Exception $ignore) {
+			}
+			$DOM = new \DOMDocument('1.0', 'utf-8');
+			$DOM->formatOutput = true;
+
+			$error = $DOM->createElementNS('DAV:', 'd:error');
+			$error->setAttribute('xmlns:s', self::NS_SABREDAV);
+			$DOM->appendChild($error);
+
+			$h = function($v) {
+
+				return htmlspecialchars($v, ENT_NOQUOTES, 'UTF-8');
+
+			};
+
+			if (self::$exposeVersion) {
+				$error->appendChild($DOM->createElement('s:sabredav-version', $h(Version::VERSION)));
+			}
+
+			$error->appendChild($DOM->createElement('s:exception', $h(get_class($e))));
+			$error->appendChild($DOM->createElement('s:message', $h($e->getMessage())));
+			if ($this->debugExceptions) {
+				$error->appendChild($DOM->createElement('s:file', $h($e->getFile())));
+				$error->appendChild($DOM->createElement('s:line', $h($e->getLine())));
+				$error->appendChild($DOM->createElement('s:code', $h($e->getCode())));
+				$error->appendChild($DOM->createElement('s:stacktrace', $h($e->getTraceAsString())));
+			}
+
+			if ($this->debugExceptions) {
+				$previous = $e;
+				while ($previous = $previous->getPrevious()) {
+					$xPrevious = $DOM->createElement('s:previous-exception');
+					$xPrevious->appendChild($DOM->createElement('s:exception', $h(get_class($previous))));
+					$xPrevious->appendChild($DOM->createElement('s:message', $h($previous->getMessage())));
+					$xPrevious->appendChild($DOM->createElement('s:file', $h($previous->getFile())));
+					$xPrevious->appendChild($DOM->createElement('s:line', $h($previous->getLine())));
+					$xPrevious->appendChild($DOM->createElement('s:code', $h($previous->getCode())));
+					$xPrevious->appendChild($DOM->createElement('s:stacktrace', $h($previous->getTraceAsString())));
+					$error->appendChild($xPrevious);
+				}
+			}
+
+
+			if ($e instanceof Exception) {
+
+				$httpCode = $e->getHTTPCode();
+				$e->serialize($this, $error);
+				$headers = $e->getHTTPHeaders($this);
+
+			} else {
+
+				$httpCode = 500;
+				$headers = [];
+
+			}
+			$headers['Content-Type'] = 'application/xml; charset=utf-8';
+
+			$this->httpResponse->setStatus($httpCode);
+			$this->httpResponse->setHeaders($headers);
+			$this->httpResponse->setBody($DOM->saveXML());
+			$this->sapi->sendResponse($this->httpResponse);
+
+		}
+
+	}
+
+	/**
+	 * Sets the base server uri
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function setBaseUri($uri) {
+
+		// If the baseUri does not end with a slash, we must add it
+		if ($uri[strlen($uri) - 1] !== '/')
+			$uri .= '/';
+
+		$this->baseUri = $uri;
+
+	}
+
+	/**
+	 * Returns the base responding uri
+	 *
+	 * @return string
+	 */
+	public function getBaseUri() {
+
+		if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+		return $this->baseUri;
+
+	}
+
+	/**
+	 * This method attempts to detect the base uri.
+	 * Only the PATH_INFO variable is considered.
+	 *
+	 * If this variable is not set, the root (/) is assumed.
+	 *
+	 * @return string
+	 */
+	public function guessBaseUri() {
+
+		$pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
+		$uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
+
+		// If PATH_INFO is found, we can assume it's accurate.
+		if (!empty($pathInfo)) {
+
+			// We need to make sure we ignore the QUERY_STRING part
+			if ($pos = strpos($uri, '?'))
+				$uri = substr($uri, 0, $pos);
+
+			// PATH_INFO is only set for urls, such as: /example.php/path
+			// in that case PATH_INFO contains '/path'.
+			// Note that REQUEST_URI is percent encoded, while PATH_INFO is
+			// not, Therefore they are only comparable if we first decode
+			// REQUEST_INFO as well.
+			$decodedUri = URLUtil::decodePath($uri);
+
+			// A simple sanity check:
+			if (substr($decodedUri, strlen($decodedUri) - strlen($pathInfo)) === $pathInfo) {
+				$baseUri = substr($decodedUri, 0, strlen($decodedUri) - strlen($pathInfo));
+				return rtrim($baseUri, '/') . '/';
+			}
+
+			throw new Exception('The REQUEST_URI (' . $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
+
+		}
+
+		// The last fallback is that we're just going to assume the server root.
+		return '/';
+
+	}
+
+	/**
+	 * Adds a plugin to the server
+	 *
+	 * For more information, console the documentation of Sabre\DAV\ServerPlugin
+	 *
+	 * @param ServerPlugin $plugin
+	 * @return void
+	 */
+	public function addPlugin(ServerPlugin $plugin) {
+
+		$this->plugins[$plugin->getPluginName()] = $plugin;
+		$plugin->initialize($this);
+
+	}
+
+	/**
+	 * Returns an initialized plugin by it's name.
+	 *
+	 * This function returns null if the plugin was not found.
+	 *
+	 * @param string $name
+	 * @return ServerPlugin
+	 */
+	public function getPlugin($name) {
+
+		if (isset($this->plugins[$name]))
+			return $this->plugins[$name];
+
+		return null;
+
+	}
+
+	/**
+	 * Returns all plugins
+	 *
+	 * @return array
+	 */
+	public function getPlugins() {
+
+		return $this->plugins;
+
+	}
+
+	/**
+	 * Handles a http request, and execute a method based on its name
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @param $sendResponse Whether to send the HTTP response to the DAV client.
+	 * @return void
+	 */
+	public function invokeMethod(RequestInterface $request, ResponseInterface $response, $sendResponse = true) {
+
+		$method = $request->getMethod();
+
+		if (!$this->emit('beforeMethod:' . $method, [$request, $response])) return;
+		if (!$this->emit('beforeMethod', [$request, $response])) return;
+
+		if (self::$exposeVersion) {
+			$response->setHeader('X-Sabre-Version', Version::VERSION);
+		}
+
+		$this->transactionType = strtolower($method);
+
+		if (!$this->checkPreconditions($request, $response)) {
+			$this->sapi->sendResponse($response);
+			return;
+		}
+
+		if ($this->emit('method:' . $method, [$request, $response])) {
+			if ($this->emit('method', [$request, $response])) {
+				$exMessage = "There was no plugin in the system that was willing to handle this " . $method . " method.";
+				if ($method === "GET") {
+					$exMessage .= " Enable the Browser plugin to get a better result here.";
+				}
+
+				// Unsupported method
+				throw new Exception\NotImplemented($exMessage);
+			}
+		}
+
+		if (!$this->emit('afterMethod:' . $method, [$request, $response])) return;
+		if (!$this->emit('afterMethod', [$request, $response])) return;
 
-        if ($response->getStatus() === null) {
-            throw new Exception('No subsystem set a valid HTTP status code. Something must have interrupted the request without providing further detail.');
-        }
-        if ($sendResponse) {
-            $this->sapi->sendResponse($response);
-            $this->emit('afterResponse', [$request, $response]);
-        }
-
-    }
-
-    // {{{ HTTP/WebDAV protocol helpers
-
-    /**
-     * Returns an array with all the supported HTTP methods for a specific uri.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getAllowedMethods($path) {
-
-        $methods = [
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        ];
-
-        // The MKCOL is only allowed on an unmapped uri
-        try {
-            $this->tree->getNodeForPath($path);
-        } catch (Exception\NotFound $e) {
-            $methods[] = 'MKCOL';
-        }
-
-        // We're also checking if any of the plugins register any new methods
-        foreach ($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($path));
-        array_unique($methods);
-
-        return $methods;
-
-    }
-
-    /**
-     * Gets the uri for the request, keeping the base uri into consideration
-     *
-     * @return string
-     */
-    public function getRequestUri() {
+		if ($response->getStatus() === null) {
+			throw new Exception('No subsystem set a valid HTTP status code. Something must have interrupted the request without providing further detail.');
+		}
+		if ($sendResponse) {
+			$this->sapi->sendResponse($response);
+			$this->emit('afterResponse', [$request, $response]);
+		}
+
+	}
+
+	// {{{ HTTP/WebDAV protocol helpers
+
+	/**
+	 * Returns an array with all the supported HTTP methods for a specific uri.
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function getAllowedMethods($path) {
+
+		$methods = [
+			'OPTIONS',
+			'GET',
+			'HEAD',
+			'DELETE',
+			'PROPFIND',
+			'PUT',
+			'PROPPATCH',
+			'COPY',
+			'MOVE',
+			'REPORT'
+		];
+
+		// The MKCOL is only allowed on an unmapped uri
+		try {
+			$this->tree->getNodeForPath($path);
+		} catch (Exception\NotFound $e) {
+			$methods[] = 'MKCOL';
+		}
+
+		// We're also checking if any of the plugins register any new methods
+		foreach ($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($path));
+		array_unique($methods);
+
+		return $methods;
+
+	}
+
+	/**
+	 * Gets the uri for the request, keeping the base uri into consideration
+	 *
+	 * @return string
+	 */
+	public function getRequestUri() {
 
-        return $this->calculateUri($this->httpRequest->getUrl());
+		return $this->calculateUri($this->httpRequest->getUrl());
 
-    }
+	}
 
-    /**
-     * Turns a URI such as the REQUEST_URI into a local path.
-     *
-     * This method:
-     *   * strips off the base path
-     *   * normalizes the path
-     *   * uri-decodes the path
-     *
-     * @param string $uri
-     * @throws Exception\Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
-     * @return string
-     */
-    public function calculateUri($uri) {
-
-        if ($uri[0] != '/' && strpos($uri, '://')) {
-
-            $uri = parse_url($uri, PHP_URL_PATH);
-
-        }
-
-        $uri = Uri\normalize(str_replace('//', '/', $uri));
-        $baseUri = Uri\normalize($this->getBaseUri());
-
-        if (strpos($uri, $baseUri) === 0) {
-
-            return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
-
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        } elseif ($uri . '/' === $baseUri) {
-
-            return '';
-
-        } else {
-
-            throw new Exception\Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
-
-        }
-
-    }
-
-    /**
-     * Returns the HTTP depth header
-     *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre\DAV\Server::DEPTH_INFINITY object
-     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
-     *
-     * @param mixed $default
-     * @return int
-     */
-    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
-
-        // If its not set, we'll grab the default
-        $depth = $this->httpRequest->getHeader('Depth');
-
-        if (is_null($depth)) return $default;
-
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
-
-
-        // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
-
-        return (int)$depth;
-
-    }
-
-    /**
-     * Returns the HTTP range header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header or array($start, $end).
-     *
-     * The first number is the offset of the first byte in the range.
-     * The second number is the offset of the last byte in the range.
-     *
-     * If the second offset is null, it should be treated as the offset of the last byte of the entity
-     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
-     *
-     * @return array|null
-     */
-    public function getHTTPRange() {
-
-        $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null;
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i', $range, $matches)) return null;
-
-        if ($matches[1] === '' && $matches[2] === '') return null;
-
-        return [
-            $matches[1] !== '' ? $matches[1] : null,
-            $matches[2] !== '' ? $matches[2] : null,
-        ];
-
-    }
-
-    /**
-     * Returns the HTTP Prefer header information.
-     *
-     * The prefer header is defined in:
-     * http://tools.ietf.org/html/draft-snell-http-prefer-14
-     *
-     * This method will return an array with options.
-     *
-     * Currently, the following options may be returned:
-     *  [
-     *      'return-asynch'         => true,
-     *      'return-minimal'        => true,
-     *      'return-representation' => true,
-     *      'wait'                  => 30,
-     *      'strict'                => true,
-     *      'lenient'               => true,
-     *  ]
-     *
-     * This method also supports the Brief header, and will also return
-     * 'return-minimal' if the brief header was set to 't'.
-     *
-     * For the boolean options, false will be returned if the headers are not
-     * specified. For the integer options it will be 'null'.
-     *
-     * @return array
-     */
-    public function getHTTPPrefer() {
-
-        $result = [
-            // can be true or false
-            'respond-async' => false,
-            // Could be set to 'representation' or 'minimal'.
-            'return'        => null,
-            // Used as a timeout, is usually a number.
-            'wait'          => null,
-            // can be 'strict' or 'lenient'.
-            'handling'      => false,
-        ];
-
-        if ($prefer = $this->httpRequest->getHeader('Prefer')) {
-
-            $result = array_merge(
-                $result,
-                \Sabre\HTTP\parsePrefer($prefer)
-            );
-
-        } elseif ($this->httpRequest->getHeader('Brief') == 't') {
-            $result['return'] = 'minimal';
-        }
-
-        return $result;
-
-    }
-
-
-    /**
-     * Returns information about Copy and Move requests
-     *
-     * This function is created to help getting information about the source and the destination for the
-     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
-     *
-     * The returned value is an array with the following keys:
-     *   * destination - Destination path
-     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
-     *
-     * @param RequestInterface $request
-     * @throws Exception\BadRequest upon missing or broken request headers
-     * @throws Exception\UnsupportedMediaType when trying to copy into a
-     *         non-collection.
-     * @throws Exception\PreconditionFailed If overwrite is set to false, but
-     *         the destination exists.
-     * @throws Exception\Forbidden when source and destination paths are
-     *         identical.
-     * @throws Exception\Conflict When trying to copy a node into its own
-     *         subtree.
-     * @return array
-     */
-    public function getCopyAndMoveInfo(RequestInterface $request) {
-
-        // Collecting the relevant HTTP headers
-        if (!$request->getHeader('Destination')) throw new Exception\BadRequest('The destination header was not supplied');
-        $destination = $this->calculateUri($request->getHeader('Destination'));
-        $overwrite = $request->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite) == 'T') $overwrite = true;
-        elseif (strtoupper($overwrite) == 'F') $overwrite = false;
-        // We need to throw a bad request exception, if the header was invalid
-        else throw new Exception\BadRequest('The HTTP Overwrite header should be either T or F');
-
-        list($destinationDir) = URLUtil::splitPath($destination);
-
-        try {
-            $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof ICollection)) throw new Exception\UnsupportedMediaType('The destination node is not a collection');
-        } catch (Exception\NotFound $e) {
-
-            // If the destination parent node is not found, we throw a 409
-            throw new Exception\Conflict('The destination node is not found');
-        }
-
-        try {
-
-            $destinationNode = $this->tree->getNodeForPath($destination);
-
-            // If this succeeded, it means the destination already exists
-            // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Exception\PreconditionFailed('The destination node already exists, and the overwrite header is set to false', 'Overwrite');
-
-        } catch (Exception\NotFound $e) {
-
-            // Destination didn't exist, we're all good
-            $destinationNode = false;
-
-        }
-
-        $requestPath = $request->getPath();
-        if ($destination === $requestPath) {
-            throw new Exception\Forbidden('Source and destination uri are identical.');
-        }
-        if (substr($destination, 0, strlen($requestPath) + 1) === $requestPath . '/') {
-            throw new Exception\Conflict('The destination may not be part of the same subtree as the source path.');
-        }
-
-        // These are the three relevant properties we need to return
-        return [
-            'destination'       => $destination,
-            'destinationExists' => !!$destinationNode,
-            'destinationNode'   => $destinationNode,
-        ];
-
-    }
-
-    /**
-     * Returns a list of properties for a path
-     *
-     * This is a simplified version getPropertiesForPath. If you aren't
-     * interested in status codes, but you just want to have a flat list of
-     * properties, use this method.
-     *
-     * Please note though that any problems related to retrieving properties,
-     * such as permission issues will just result in an empty array being
-     * returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     */
-    public function getProperties($path, $propertyNames) {
-
-        $result = $this->getPropertiesForPath($path, $propertyNames, 0);
-        if (isset($result[0][200])) {
-            return $result[0][200];
-        } else {
-            return [];
-        }
-
-    }
-
-    /**
-     * A kid-friendly way to fetch properties for a node's children.
-     *
-     * The returned array will be indexed by the path of the of child node.
-     * Only properties that are actually found will be returned.
-     *
-     * The parent node will not be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @return array
-     */
-    public function getPropertiesForChildren($path, $propertyNames) {
-
-        $result = [];
-        foreach ($this->getPropertiesForPath($path, $propertyNames, 1) as $k => $row) {
-
-            // Skipping the parent path
-            if ($k === 0) continue;
-
-            $result[$row['href']] = $row[200];
-
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns a list of HTTP headers for a particular resource
-     *
-     * The generated http headers are based on properties provided by the
-     * resource. The method basically provides a simple mapping between
-     * DAV property and HTTP header.
-     *
-     * The headers are intended to be used for HEAD and GET requests.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getHTTPHeaders($path) {
-
-        $propertyMap = [
-            '{DAV:}getcontenttype'   => 'Content-Type',
-            '{DAV:}getcontentlength' => 'Content-Length',
-            '{DAV:}getlastmodified'  => 'Last-Modified',
-            '{DAV:}getetag'          => 'ETag',
-        ];
-
-        $properties = $this->getProperties($path, array_keys($propertyMap));
-
-        $headers = [];
-        foreach ($propertyMap as $property => $header) {
-            if (!isset($properties[$property])) continue;
-
-            if (is_scalar($properties[$property])) {
-                $headers[$header] = $properties[$property];
-
-            // GetLastModified gets special cased
-            } elseif ($properties[$property] instanceof Xml\Property\GetLastModified) {
-                $headers[$header] = HTTP\Util::toHTTPDate($properties[$property]->getTime());
-            }
-
-        }
-
-        return $headers;
-
-    }
-
-    /**
-     * Small helper to support PROPFIND with DEPTH_INFINITY.
-     *
-     * @param array[] $propFindRequests
-     * @param PropFind $propFind
-     * @return void
-     */
-    private function addPathNodesRecursively(&$propFindRequests, PropFind $propFind) {
-
-        $newDepth = $propFind->getDepth();
-        $path = $propFind->getPath();
-
-        if ($newDepth !== self::DEPTH_INFINITY) {
-            $newDepth--;
-        }
-
-        foreach ($this->tree->getChildren($path) as $childNode) {
-            $subPropFind = clone $propFind;
-            $subPropFind->setDepth($newDepth);
-            if ($path !== '') {
-                $subPath = $path . '/' . $childNode->getName();
-            } else {
-                $subPath = $childNode->getName();
-            }
-            $subPropFind->setPath($subPath);
-
-            $propFindRequests[] = [
-                $subPropFind,
-                $childNode
-            ];
-
-            if (($newDepth === self::DEPTH_INFINITY || $newDepth >= 1) && $childNode instanceof ICollection) {
-                $this->addPathNodesRecursively($propFindRequests, $subPropFind);
-            }
-
-        }
-    }
-
-    /**
-     * Returns a list of properties for a given path
-     *
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * If a depth of 1 is requested child elements will also be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @param int $depth
-     * @return array
-     */
-    public function getPropertiesForPath($path, $propertyNames = [], $depth = 0) {
-
-        // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
-        if (!$this->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
-
-        $path = trim($path, '/');
-
-        $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS;
-        $propFind = new PropFind($path, (array)$propertyNames, $depth, $propFindType);
-
-        $parentNode = $this->tree->getNodeForPath($path);
-
-        $propFindRequests = [[
-            $propFind,
-            $parentNode
-        ]];
-
-        if (($depth > 0 || $depth === self::DEPTH_INFINITY) && $parentNode instanceof ICollection) {
-            $this->addPathNodesRecursively($propFindRequests, $propFind);
-        }
-
-        $returnPropertyList = [];
-
-        foreach ($propFindRequests as $propFindRequest) {
-
-            list($propFind, $node) = $propFindRequest;
-            $r = $this->getPropertiesByNode($propFind, $node);
-            if ($r) {
-                $result = $propFind->getResultForMultiStatus();
-                $result['href'] = $propFind->getPath();
-
-                // WebDAV recommends adding a slash to the path, if the path is
-                // a collection.
-                // Furthermore, iCal also demands this to be the case for
-                // principals. This is non-standard, but we support it.
-                $resourceType = $this->getResourceTypeForNode($node);
-                if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-                    $result['href'] .= '/';
-                }
-                $returnPropertyList[] = $result;
-            }
-
-        }
-
-        return $returnPropertyList;
-
-    }
-
-    /**
-     * Returns a list of properties for a list of paths.
-     *
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * The result is returned as an array, with paths for it's keys.
-     * The result may be returned out of order.
-     *
-     * @param array $paths
-     * @param array $propertyNames
-     * @return array
-     */
-    public function getPropertiesForMultiplePaths(array $paths, array $propertyNames = []) {
-
-        $result = [
-        ];
-
-        $nodes = $this->tree->getMultipleNodes($paths);
-
-        foreach ($nodes as $path => $node) {
-
-            $propFind = new PropFind($path, $propertyNames);
-            $r = $this->getPropertiesByNode($propFind, $node);
-            if ($r) {
-                $result[$path] = $propFind->getResultForMultiStatus();
-                $result[$path]['href'] = $path;
-
-                $resourceType = $this->getResourceTypeForNode($node);
-                if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-                    $result[$path]['href'] .= '/';
-                }
-            }
-
-        }
-
-        return $result;
-
-    }
-
-
-    /**
-     * Determines all properties for a node.
-     *
-     * This method tries to grab all properties for a node. This method is used
-     * internally getPropertiesForPath and a few others.
-     *
-     * It could be useful to call this, if you already have an instance of your
-     * target node and simply want to run through the system to get a correct
-     * list of properties.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return bool
-     */
-    public function getPropertiesByNode(PropFind $propFind, INode $node) {
-
-        return $this->emit('propFind', [$propFind, $node]);
-
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new file.
-     *
-     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
-     * It was important to get this done through a centralized function,
-     * allowing plugins to intercept this using the beforeCreateFile event.
-     *
-     * This method will return true if the file was actually created
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param string   $etag
-     * @return bool
-     */
-    public function createFile($uri, $data, &$etag = null) {
-
-        list($dir, $name) = URLUtil::splitPath($uri);
-
-        if (!$this->emit('beforeBind', [$uri])) return false;
-
-        $parent = $this->tree->getNodeForPath($dir);
-        if (!$parent instanceof ICollection) {
-            throw new Exception\Conflict('Files can only be created as children of collections');
-        }
-
-        // It is possible for an event handler to modify the content of the
-        // body, before it gets written. If this is the case, $modified
-        // should be set to true.
-        //
-        // If $modified is true, we must not send back an ETag.
-        $modified = false;
-        if (!$this->emit('beforeCreateFile', [$uri, &$data, $parent, &$modified])) return false;
-
-        $etag = $parent->createFile($name, $data);
-
-        if ($modified) $etag = null;
-
-        $this->tree->markDirty($dir . '/' . $name);
-
-        $this->emit('afterBind', [$uri]);
-        $this->emit('afterCreateFile', [$uri, $parent]);
-
-        return true;
-    }
-
-    /**
-     * This method is invoked by sub-systems updating a file.
-     *
-     * This method will return true if the file was actually updated
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param string   $etag
-     * @return bool
-     */
-    public function updateFile($uri, $data, &$etag = null) {
-
-        $node = $this->tree->getNodeForPath($uri);
-
-        // It is possible for an event handler to modify the content of the
-        // body, before it gets written. If this is the case, $modified
-        // should be set to true.
-        //
-        // If $modified is true, we must not send back an ETag.
-        $modified = false;
-        if (!$this->emit('beforeWriteContent', [$uri, $node, &$data, &$modified])) return false;
-
-        $etag = $node->put($data);
-        if ($modified) $etag = null;
-        $this->emit('afterWriteContent', [$uri, $node]);
-
-        return true;
-    }
-
-
-
-    /**
-     * This method is invoked by sub-systems creating a new directory.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function createDirectory($uri) {
-
-        $this->createCollection($uri, new MkCol(['{DAV:}collection'], []));
-
-    }
-
-    /**
-     * Use this method to create a new collection
-     *
-     * @param string $uri The new uri
-     * @param MkCol $mkCol
-     * @return array|null
-     */
-    public function createCollection($uri, MkCol $mkCol) {
-
-        list($parentUri, $newName) = URLUtil::splitPath($uri);
-
-        // Making sure the parent exists
-        try {
-            $parent = $this->tree->getNodeForPath($parentUri);
-
-        } catch (Exception\NotFound $e) {
-            throw new Exception\Conflict('Parent node does not exist');
-
-        }
-
-        // Making sure the parent is a collection
-        if (!$parent instanceof ICollection) {
-            throw new Exception\Conflict('Parent node is not a collection');
-        }
-
-        // Making sure the child does not already exist
-        try {
-            $parent->getChild($newName);
-
-            // If we got here.. it means there's already a node on that url, and we need to throw a 405
-            throw new Exception\MethodNotAllowed('The resource you tried to create already exists');
-
-        } catch (Exception\NotFound $e) {
-            // NotFound is the expected behavior.
-        }
-
-
-        if (!$this->emit('beforeBind', [$uri])) return;
-
-        if ($parent instanceof IExtendedCollection) {
-
-            /**
-             * If the parent is an instance of IExtendedCollection, it means that
-             * we can pass the MkCol object directly as it may be able to store
-             * properties immediately.
-             */
-            $parent->createExtendedCollection($newName, $mkCol);
-
-        } else {
-
-            /**
-             * If the parent is a standard ICollection, it means only
-             * 'standard' collections can be created, so we should fail any
-             * MKCOL operation that carries extra resourcetypes.
-             */
-            if (count($mkCol->getResourceType()) > 1) {
-                throw new Exception\InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
-            }
-
-            $parent->createDirectory($newName);
-
-        }
-
-        // If there are any properties that have not been handled/stored,
-        // we ask the 'propPatch' event to handle them. This will allow for
-        // example the propertyStorage system to store properties upon MKCOL.
-        if ($mkCol->getRemainingMutations()) {
-            $this->emit('propPatch', [$uri, $mkCol]);
-        }
-        $success = $mkCol->commit();
-
-        if (!$success) {
-            $result = $mkCol->getResult();
-            // generateMkCol needs the href key to exist.
-            $result['href'] = $uri;
-            return $result;
-        }
-
-        $this->tree->markDirty($parentUri);
-        $this->emit('afterBind', [$uri]);
-
-    }
-
-    /**
-     * This method updates a resource's properties
-     *
-     * The properties array must be a list of properties. Array-keys are
-     * property names in clarknotation, array-values are it's values.
-     * If a property must be deleted, the value should be null.
-     *
-     * Note that this request should either completely succeed, or
-     * completely fail.
-     *
-     * The response is an array with properties for keys, and http status codes
-     * as their values.
-     *
-     * @param string $path
-     * @param array $properties
-     * @return array
-     */
-    public function updateProperties($path, array $properties) {
-
-        $propPatch = new PropPatch($properties);
-        $this->emit('propPatch', [$path, $propPatch]);
-        $propPatch->commit();
-
-        return $propPatch->getResult();
-
-    }
-
-    /**
-     * This method checks the main HTTP preconditions.
-     *
-     * Currently these are:
-     *   * If-Match
-     *   * If-None-Match
-     *   * If-Modified-Since
-     *   * If-Unmodified-Since
-     *
-     * The method will return true if all preconditions are met
-     * The method will return false, or throw an exception if preconditions
-     * failed. If false is returned the operation should be aborted, and
-     * the appropriate HTTP response headers are already set.
-     *
-     * Normally this method will throw 412 Precondition Failed for failures
-     * related to If-None-Match, If-Match and If-Unmodified Since. It will
-     * set the status to 304 Not Modified for If-Modified_since.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function checkPreconditions(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-        $node = null;
-        $lastMod = null;
-        $etag = null;
-
-        if ($ifMatch = $request->getHeader('If-Match')) {
-
-            // If-Match contains an entity tag. Only if the entity-tag
-            // matches we are allowed to make the request succeed.
-            // If the entity-tag is '*' we are only allowed to make the
-            // request succeed if a resource exists at that url.
-            try {
-                $node = $this->tree->getNodeForPath($path);
-            } catch (Exception\NotFound $e) {
-                throw new Exception\PreconditionFailed('An If-Match header was specified and the resource did not exist', 'If-Match');
-            }
-
-            // Only need to check entity tags if they are not *
-            if ($ifMatch !== '*') {
-
-                // There can be multiple ETags
-                $ifMatch = explode(',', $ifMatch);
-                $haveMatch = false;
-                foreach ($ifMatch as $ifMatchItem) {
-
-                    // Stripping any extra spaces
-                    $ifMatchItem = trim($ifMatchItem, ' ');
-
-                    $etag = $node instanceof IFile ? $node->getETag() : null;
-                    if ($etag === $ifMatchItem) {
-                        $haveMatch = true;
-                    } else {
-                        // Evolution has a bug where it sometimes prepends the "
-                        // with a \. This is our workaround.
-                        if (str_replace('\\"', '"', $ifMatchItem) === $etag) {
-                            $haveMatch = true;
-                        }
-                    }
-
-                }
-                if (!$haveMatch) {
-                    if ($etag) $response->setHeader('ETag', $etag);
-                     throw new Exception\PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.', 'If-Match');
-                }
-            }
-        }
-
-        if ($ifNoneMatch = $request->getHeader('If-None-Match')) {
-
-            // The If-None-Match header contains an ETag.
-            // Only if the ETag does not match the current ETag, the request will succeed
-            // The header can also contain *, in which case the request
-            // will only succeed if the entity does not exist at all.
-            $nodeExists = true;
-            if (!$node) {
-                try {
-                    $node = $this->tree->getNodeForPath($path);
-                } catch (Exception\NotFound $e) {
-                    $nodeExists = false;
-                }
-            }
-            if ($nodeExists) {
-                $haveMatch = false;
-                if ($ifNoneMatch === '*') $haveMatch = true;
-                else {
-
-                    // There might be multiple ETags
-                    $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node instanceof IFile ? $node->getETag() : null;
-
-                    foreach ($ifNoneMatch as $ifNoneMatchItem) {
-
-                        // Stripping any extra spaces
-                        $ifNoneMatchItem = trim($ifNoneMatchItem, ' ');
-
-                        if ($etag === $ifNoneMatchItem) $haveMatch = true;
-
-                    }
-
-                }
-
-                if ($haveMatch) {
-                    if ($etag) $response->setHeader('ETag', $etag);
-                    if ($request->getMethod() === 'GET') {
-                        $response->setStatus(304);
-                        return false;
-                    } else {
-                        throw new Exception\PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).', 'If-None-Match');
-                    }
-                }
-            }
-
-        }
-
-        if (!$ifNoneMatch && ($ifModifiedSince = $request->getHeader('If-Modified-Since'))) {
-
-            // The If-Modified-Since header contains a date. We
-            // will only return the entity if it has been changed since
-            // that date. If it hasn't been changed, we return a 304
-            // header
-            // Note that this header only has to be checked if there was no If-None-Match header
-            // as per the HTTP spec.
-            $date = HTTP\Util::parseHTTPDate($ifModifiedSince);
-
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($path);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new \DateTime('@' . $lastMod);
-                    if ($lastMod <= $date) {
-                        $response->setStatus(304);
-                        $response->setHeader('Last-Modified', HTTP\Util::toHTTPDate($lastMod));
-                        return false;
-                    }
-                }
-            }
-        }
-
-        if ($ifUnmodifiedSince = $request->getHeader('If-Unmodified-Since')) {
-
-            // The If-Unmodified-Since will allow allow the request if the
-            // entity has not changed since the specified date.
-            $date = HTTP\Util::parseHTTPDate($ifUnmodifiedSince);
-
-            // We must only check the date if it's valid
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($path);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new \DateTime('@' . $lastMod);
-                    if ($lastMod > $date) {
-                        throw new Exception\PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.', 'If-Unmodified-Since');
-                    }
-                }
-            }
-
-        }
-
-        // Now the hardest, the If: header. The If: header can contain multiple
-        // urls, ETags and so-called 'state tokens'.
-        //
-        // Examples of state tokens include lock-tokens (as defined in rfc4918)
-        // and sync-tokens (as defined in rfc6578).
-        //
-        // The only proper way to deal with these, is to emit events, that a
-        // Sync and Lock plugin can pick up.
-        $ifConditions = $this->getIfConditions($request);
-
-        foreach ($ifConditions as $kk => $ifCondition) {
-            foreach ($ifCondition['tokens'] as $ii => $token) {
-                $ifConditions[$kk]['tokens'][$ii]['validToken'] = false;
-            }
-        }
-
-        // Plugins are responsible for validating all the tokens.
-        // If a plugin deemed a token 'valid', it will set 'validToken' to
-        // true.
-        $this->emit('validateTokens', [ $request, &$ifConditions ]);
-
-        // Now we're going to analyze the result.
-
-        // Every ifCondition needs to validate to true, so we exit as soon as
-        // we have an invalid condition.
-        foreach ($ifConditions as $ifCondition) {
-
-            $uri = $ifCondition['uri'];
-            $tokens = $ifCondition['tokens'];
-
-            // We only need 1 valid token for the condition to succeed.
-            foreach ($tokens as $token) {
-
-                $tokenValid = $token['validToken'] || !$token['token'];
-
-                $etagValid = false;
-                if (!$token['etag']) {
-                    $etagValid = true;
-                }
-                // Checking the ETag, only if the token was already deamed
-                // valid and there is one.
-                if ($token['etag'] && $tokenValid) {
-
-                    // The token was valid, and there was an ETag. We must
-                    // grab the current ETag and check it.
-                    $node = $this->tree->getNodeForPath($uri);
-                    $etagValid = $node instanceof IFile && $node->getETag() == $token['etag'];
-
-                }
-
-
-                if (($tokenValid && $etagValid) ^ $token['negate']) {
-                    // Both were valid, so we can go to the next condition.
-                    continue 2;
-                }
-
-
-            }
-
-            // If we ended here, it means there was no valid ETag + token
-            // combination found for the current condition. This means we fail!
-            throw new Exception\PreconditionFailed('Failed to find a valid token/etag combination for ' . $uri, 'If');
-
-        }
-
-        return true;
-
-    }
-
-    /**
-     * This method is created to extract information from the WebDAV HTTP 'If:' header
-     *
-     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
-     * The function will return an array, containing structs with the following keys
-     *
-     *   * uri   - the uri the condition applies to.
-     *   * tokens - The lock token. another 2 dimensional array containing 3 elements
-     *
-     * Example 1:
-     *
-     * If: (<opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2>)
-     *
-     * Would result in:
-     *
-     * [
-     *    [
-     *       'uri' => '/request/uri',
-     *       'tokens' => [
-     *          [
-     *              [
-     *                  'negate' => false,
-     *                  'token'  => 'opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2',
-     *                  'etag'   => ""
-     *              ]
-     *          ]
-     *       ],
-     *    ]
-     * ]
-     *
-     * Example 2:
-     *
-     * If: </path/> (Not <opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2> ["Im An ETag"]) (["Another ETag"]) </path2/> (Not ["Path2 ETag"])
-     *
-     * Would result in:
-     *
-     * [
-     *    [
-     *       'uri' => 'path',
-     *       'tokens' => [
-     *          [
-     *              [
-     *                  'negate' => true,
-     *                  'token'  => 'opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2',
-     *                  'etag'   => '"Im An ETag"'
-     *              ],
-     *              [
-     *                  'negate' => false,
-     *                  'token'  => '',
-     *                  'etag'   => '"Another ETag"'
-     *              ]
-     *          ]
-     *       ],
-     *    ],
-     *    [
-     *       'uri' => 'path2',
-     *       'tokens' => [
-     *          [
-     *              [
-     *                  'negate' => true,
-     *                  'token'  => '',
-     *                  'etag'   => '"Path2 ETag"'
-     *              ]
-     *          ]
-     *       ],
-     *    ],
-     * ]
-     *
-     * @param RequestInterface $request
-     * @return array
-     */
-    public function getIfConditions(RequestInterface $request) {
-
-        $header = $request->getHeader('If');
-        if (!$header) return [];
-
-        $matches = [];
-
-        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
-        preg_match_all($regex, $header, $matches, PREG_SET_ORDER);
-
-        $conditions = [];
-
-        foreach ($matches as $match) {
-
-            // If there was no uri specified in this match, and there were
-            // already conditions parsed, we add the condition to the list of
-            // conditions for the previous uri.
-            if (!$match['uri'] && count($conditions)) {
-                $conditions[count($conditions) - 1]['tokens'][] = [
-                    'negate' => $match['not'] ? true : false,
-                    'token'  => $match['token'],
-                    'etag'   => isset($match['etag']) ? $match['etag'] : ''
-                ];
-            } else {
-
-                if (!$match['uri']) {
-                    $realUri = $request->getPath();
-                } else {
-                    $realUri = $this->calculateUri($match['uri']);
-                }
-
-                $conditions[] = [
-                    'uri'    => $realUri,
-                    'tokens' => [
-                        [
-                            'negate' => $match['not'] ? true : false,
-                            'token'  => $match['token'],
-                            'etag'   => isset($match['etag']) ? $match['etag'] : ''
-                        ]
-                    ],
-
-                ];
-            }
-
-        }
-
-        return $conditions;
-
-    }
-
-    /**
-     * Returns an array with resourcetypes for a node.
-     *
-     * @param INode $node
-     * @return array
-     */
-    public function getResourceTypeForNode(INode $node) {
-
-        $result = [];
-        foreach ($this->resourceTypeMapping as $className => $resourceType) {
-            if ($node instanceof $className) $result[] = $resourceType;
-        }
-        return $result;
-
-    }
-
-    // }}}
-    // {{{ XML Readers & Writers
-
-
-    /**
-     * Generates a WebDAV propfind response body based on a list of nodes.
-     *
-     * If 'strip404s' is set to true, all 404 responses will be removed.
-     *
-     * @param array $fileProperties The list with nodes
-     * @param bool strip404s
-     * @return string
-     */
-    public function generateMultiStatus(array $fileProperties, $strip404s = false) {
-
-        $xml = [];
-
-        foreach ($fileProperties as $entry) {
-
-            $href = $entry['href'];
-            unset($entry['href']);
-            if ($strip404s) {
-                unset($entry[404]);
-            }
-            $response = new Xml\Element\Response(
-                ltrim($href, '/'),
-                $entry
-            );
-            $xml[] = [
-                'name'  => '{DAV:}response',
-                'value' => $response
-            ];
-
-        }
-        return $this->xml->write('{DAV:}multistatus', $xml, $this->baseUri);
-
-    }
+	/**
+	 * Turns a URI such as the REQUEST_URI into a local path.
+	 *
+	 * This method:
+	 *   * strips off the base path
+	 *   * normalizes the path
+	 *   * uri-decodes the path
+	 *
+	 * @param string $uri
+	 * @throws Exception\Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
+	 * @return string
+	 */
+	public function calculateUri($uri) {
+
+		if ($uri[0] != '/' && strpos($uri, '://')) {
+
+			$uri = parse_url($uri, PHP_URL_PATH);
+
+		}
+
+		$uri = Uri\normalize(str_replace('//', '/', $uri));
+		$baseUri = Uri\normalize($this->getBaseUri());
+
+		if (strpos($uri, $baseUri) === 0) {
+
+			return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
+
+		// A special case, if the baseUri was accessed without a trailing
+		// slash, we'll accept it as well.
+		} elseif ($uri . '/' === $baseUri) {
+
+			return '';
+
+		} else {
+
+			throw new Exception\Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
+
+		}
+
+	}
+
+	/**
+	 * Returns the HTTP depth header
+	 *
+	 * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre\DAV\Server::DEPTH_INFINITY object
+	 * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
+	 *
+	 * @param mixed $default
+	 * @return int
+	 */
+	public function getHTTPDepth($default = self::DEPTH_INFINITY) {
+
+		// If its not set, we'll grab the default
+		$depth = $this->httpRequest->getHeader('Depth');
+
+		if (is_null($depth)) return $default;
+
+		if ($depth == 'infinity') return self::DEPTH_INFINITY;
+
+
+		// If its an unknown value. we'll grab the default
+		if (!ctype_digit($depth)) return $default;
+
+		return (int)$depth;
+
+	}
+
+	/**
+	 * Returns the HTTP range header
+	 *
+	 * This method returns null if there is no well-formed HTTP range request
+	 * header or array($start, $end).
+	 *
+	 * The first number is the offset of the first byte in the range.
+	 * The second number is the offset of the last byte in the range.
+	 *
+	 * If the second offset is null, it should be treated as the offset of the last byte of the entity
+	 * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
+	 *
+	 * @return array|null
+	 */
+	public function getHTTPRange() {
+
+		$range = $this->httpRequest->getHeader('range');
+		if (is_null($range)) return null;
+
+		// Matching "Range: bytes=1234-5678: both numbers are optional
+
+		if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i', $range, $matches)) return null;
+
+		if ($matches[1] === '' && $matches[2] === '') return null;
+
+		return [
+			$matches[1] !== '' ? $matches[1] : null,
+			$matches[2] !== '' ? $matches[2] : null,
+		];
+
+	}
+
+	/**
+	 * Returns the HTTP Prefer header information.
+	 *
+	 * The prefer header is defined in:
+	 * http://tools.ietf.org/html/draft-snell-http-prefer-14
+	 *
+	 * This method will return an array with options.
+	 *
+	 * Currently, the following options may be returned:
+	 *  [
+	 *      'return-asynch'         => true,
+	 *      'return-minimal'        => true,
+	 *      'return-representation' => true,
+	 *      'wait'                  => 30,
+	 *      'strict'                => true,
+	 *      'lenient'               => true,
+	 *  ]
+	 *
+	 * This method also supports the Brief header, and will also return
+	 * 'return-minimal' if the brief header was set to 't'.
+	 *
+	 * For the boolean options, false will be returned if the headers are not
+	 * specified. For the integer options it will be 'null'.
+	 *
+	 * @return array
+	 */
+	public function getHTTPPrefer() {
+
+		$result = [
+			// can be true or false
+			'respond-async' => false,
+			// Could be set to 'representation' or 'minimal'.
+			'return'        => null,
+			// Used as a timeout, is usually a number.
+			'wait'          => null,
+			// can be 'strict' or 'lenient'.
+			'handling'      => false,
+		];
+
+		if ($prefer = $this->httpRequest->getHeader('Prefer')) {
+
+			$result = array_merge(
+				$result,
+				\Sabre\HTTP\parsePrefer($prefer)
+			);
+
+		} elseif ($this->httpRequest->getHeader('Brief') == 't') {
+			$result['return'] = 'minimal';
+		}
+
+		return $result;
+
+	}
+
+
+	/**
+	 * Returns information about Copy and Move requests
+	 *
+	 * This function is created to help getting information about the source and the destination for the
+	 * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
+	 *
+	 * The returned value is an array with the following keys:
+	 *   * destination - Destination path
+	 *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
+	 *
+	 * @param RequestInterface $request
+	 * @throws Exception\BadRequest upon missing or broken request headers
+	 * @throws Exception\UnsupportedMediaType when trying to copy into a
+	 *         non-collection.
+	 * @throws Exception\PreconditionFailed If overwrite is set to false, but
+	 *         the destination exists.
+	 * @throws Exception\Forbidden when source and destination paths are
+	 *         identical.
+	 * @throws Exception\Conflict When trying to copy a node into its own
+	 *         subtree.
+	 * @return array
+	 */
+	public function getCopyAndMoveInfo(RequestInterface $request) {
+
+		// Collecting the relevant HTTP headers
+		if (!$request->getHeader('Destination')) throw new Exception\BadRequest('The destination header was not supplied');
+		$destination = $this->calculateUri($request->getHeader('Destination'));
+		$overwrite = $request->getHeader('Overwrite');
+		if (!$overwrite) $overwrite = 'T';
+		if (strtoupper($overwrite) == 'T') $overwrite = true;
+		elseif (strtoupper($overwrite) == 'F') $overwrite = false;
+		// We need to throw a bad request exception, if the header was invalid
+		else throw new Exception\BadRequest('The HTTP Overwrite header should be either T or F');
+
+		list($destinationDir) = URLUtil::splitPath($destination);
+
+		try {
+			$destinationParent = $this->tree->getNodeForPath($destinationDir);
+			if (!($destinationParent instanceof ICollection)) throw new Exception\UnsupportedMediaType('The destination node is not a collection');
+		} catch (Exception\NotFound $e) {
+
+			// If the destination parent node is not found, we throw a 409
+			throw new Exception\Conflict('The destination node is not found');
+		}
+
+		try {
+
+			$destinationNode = $this->tree->getNodeForPath($destination);
+
+			// If this succeeded, it means the destination already exists
+			// we'll need to throw precondition failed in case overwrite is false
+			if (!$overwrite) throw new Exception\PreconditionFailed('The destination node already exists, and the overwrite header is set to false', 'Overwrite');
+
+		} catch (Exception\NotFound $e) {
+
+			// Destination didn't exist, we're all good
+			$destinationNode = false;
+
+		}
+
+		$requestPath = $request->getPath();
+		if ($destination === $requestPath) {
+			throw new Exception\Forbidden('Source and destination uri are identical.');
+		}
+		if (substr($destination, 0, strlen($requestPath) + 1) === $requestPath . '/') {
+			throw new Exception\Conflict('The destination may not be part of the same subtree as the source path.');
+		}
+
+		// These are the three relevant properties we need to return
+		return [
+			'destination'       => $destination,
+			'destinationExists' => !!$destinationNode,
+			'destinationNode'   => $destinationNode,
+		];
+
+	}
+
+	/**
+	 * Returns a list of properties for a path
+	 *
+	 * This is a simplified version getPropertiesForPath. If you aren't
+	 * interested in status codes, but you just want to have a flat list of
+	 * properties, use this method.
+	 *
+	 * Please note though that any problems related to retrieving properties,
+	 * such as permission issues will just result in an empty array being
+	 * returned.
+	 *
+	 * @param string $path
+	 * @param array $propertyNames
+	 */
+	public function getProperties($path, $propertyNames) {
+
+		$result = $this->getPropertiesForPath($path, $propertyNames, 0);
+		if (isset($result[0][200])) {
+			return $result[0][200];
+		} else {
+			return [];
+		}
+
+	}
+
+	/**
+	 * A kid-friendly way to fetch properties for a node's children.
+	 *
+	 * The returned array will be indexed by the path of the of child node.
+	 * Only properties that are actually found will be returned.
+	 *
+	 * The parent node will not be returned.
+	 *
+	 * @param string $path
+	 * @param array $propertyNames
+	 * @return array
+	 */
+	public function getPropertiesForChildren($path, $propertyNames) {
+
+		$result = [];
+		foreach ($this->getPropertiesForPath($path, $propertyNames, 1) as $k => $row) {
+
+			// Skipping the parent path
+			if ($k === 0) continue;
+
+			$result[$row['href']] = $row[200];
+
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Returns a list of HTTP headers for a particular resource
+	 *
+	 * The generated http headers are based on properties provided by the
+	 * resource. The method basically provides a simple mapping between
+	 * DAV property and HTTP header.
+	 *
+	 * The headers are intended to be used for HEAD and GET requests.
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function getHTTPHeaders($path) {
+
+		$propertyMap = [
+			'{DAV:}getcontenttype'   => 'Content-Type',
+			'{DAV:}getcontentlength' => 'Content-Length',
+			'{DAV:}getlastmodified'  => 'Last-Modified',
+			'{DAV:}getetag'          => 'ETag',
+		];
+
+		$properties = $this->getProperties($path, array_keys($propertyMap));
+
+		$headers = [];
+		foreach ($propertyMap as $property => $header) {
+			if (!isset($properties[$property])) continue;
+
+			if (is_scalar($properties[$property])) {
+				$headers[$header] = $properties[$property];
+
+			// GetLastModified gets special cased
+			} elseif ($properties[$property] instanceof Xml\Property\GetLastModified) {
+				$headers[$header] = HTTP\Util::toHTTPDate($properties[$property]->getTime());
+			}
+
+		}
+
+		return $headers;
+
+	}
+
+	/**
+	 * Small helper to support PROPFIND with DEPTH_INFINITY.
+	 *
+	 * @param array[] $propFindRequests
+	 * @param PropFind $propFind
+	 * @return void
+	 */
+	private function addPathNodesRecursively(&$propFindRequests, PropFind $propFind) {
+
+		$newDepth = $propFind->getDepth();
+		$path = $propFind->getPath();
+
+		if ($newDepth !== self::DEPTH_INFINITY) {
+			$newDepth--;
+		}
+
+		foreach ($this->tree->getChildren($path) as $childNode) {
+			$subPropFind = clone $propFind;
+			$subPropFind->setDepth($newDepth);
+			if ($path !== '') {
+				$subPath = $path . '/' . $childNode->getName();
+			} else {
+				$subPath = $childNode->getName();
+			}
+			$subPropFind->setPath($subPath);
+
+			$propFindRequests[] = [
+				$subPropFind,
+				$childNode
+			];
+
+			if (($newDepth === self::DEPTH_INFINITY || $newDepth >= 1) && $childNode instanceof ICollection) {
+				$this->addPathNodesRecursively($propFindRequests, $subPropFind);
+			}
+
+		}
+	}
+
+	/**
+	 * Returns a list of properties for a given path
+	 *
+	 * The path that should be supplied should have the baseUrl stripped out
+	 * The list of properties should be supplied in Clark notation. If the list is empty
+	 * 'allprops' is assumed.
+	 *
+	 * If a depth of 1 is requested child elements will also be returned.
+	 *
+	 * @param string $path
+	 * @param array $propertyNames
+	 * @param int $depth
+	 * @return array
+	 */
+	public function getPropertiesForPath($path, $propertyNames = [], $depth = 0) {
+
+		// The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
+		if (!$this->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
+
+		$path = trim($path, '/');
+
+		$propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS;
+		$propFind = new PropFind($path, (array)$propertyNames, $depth, $propFindType);
+
+		$parentNode = $this->tree->getNodeForPath($path);
+
+		$propFindRequests = [[
+			$propFind,
+			$parentNode
+		]];
+
+		if (($depth > 0 || $depth === self::DEPTH_INFINITY) && $parentNode instanceof ICollection) {
+			$this->addPathNodesRecursively($propFindRequests, $propFind);
+		}
+
+		$returnPropertyList = [];
+
+		foreach ($propFindRequests as $propFindRequest) {
+
+			list($propFind, $node) = $propFindRequest;
+			$r = $this->getPropertiesByNode($propFind, $node);
+			if ($r) {
+				$result = $propFind->getResultForMultiStatus();
+				$result['href'] = $propFind->getPath();
+
+				// WebDAV recommends adding a slash to the path, if the path is
+				// a collection.
+				// Furthermore, iCal also demands this to be the case for
+				// principals. This is non-standard, but we support it.
+				$resourceType = $this->getResourceTypeForNode($node);
+				if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+					$result['href'] .= '/';
+				}
+				$returnPropertyList[] = $result;
+			}
+
+		}
+
+		return $returnPropertyList;
+
+	}
+
+	/**
+	 * Returns a list of properties for a list of paths.
+	 *
+	 * The path that should be supplied should have the baseUrl stripped out
+	 * The list of properties should be supplied in Clark notation. If the list is empty
+	 * 'allprops' is assumed.
+	 *
+	 * The result is returned as an array, with paths for it's keys.
+	 * The result may be returned out of order.
+	 *
+	 * @param array $paths
+	 * @param array $propertyNames
+	 * @return array
+	 */
+	public function getPropertiesForMultiplePaths(array $paths, array $propertyNames = []) {
+
+		$result = [
+		];
+
+		$nodes = $this->tree->getMultipleNodes($paths);
+
+		foreach ($nodes as $path => $node) {
+
+			$propFind = new PropFind($path, $propertyNames);
+			$r = $this->getPropertiesByNode($propFind, $node);
+			if ($r) {
+				$result[$path] = $propFind->getResultForMultiStatus();
+				$result[$path]['href'] = $path;
+
+				$resourceType = $this->getResourceTypeForNode($node);
+				if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+					$result[$path]['href'] .= '/';
+				}
+			}
+
+		}
+
+		return $result;
+
+	}
+
+
+	/**
+	 * Determines all properties for a node.
+	 *
+	 * This method tries to grab all properties for a node. This method is used
+	 * internally getPropertiesForPath and a few others.
+	 *
+	 * It could be useful to call this, if you already have an instance of your
+	 * target node and simply want to run through the system to get a correct
+	 * list of properties.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return bool
+	 */
+	public function getPropertiesByNode(PropFind $propFind, INode $node) {
+
+		return $this->emit('propFind', [$propFind, $node]);
+
+	}
+
+	/**
+	 * This method is invoked by sub-systems creating a new file.
+	 *
+	 * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
+	 * It was important to get this done through a centralized function,
+	 * allowing plugins to intercept this using the beforeCreateFile event.
+	 *
+	 * This method will return true if the file was actually created
+	 *
+	 * @param string   $uri
+	 * @param resource $data
+	 * @param string   $etag
+	 * @return bool
+	 */
+	public function createFile($uri, $data, &$etag = null) {
+
+		list($dir, $name) = URLUtil::splitPath($uri);
+
+		if (!$this->emit('beforeBind', [$uri])) return false;
+
+		$parent = $this->tree->getNodeForPath($dir);
+		if (!$parent instanceof ICollection) {
+			throw new Exception\Conflict('Files can only be created as children of collections');
+		}
+
+		// It is possible for an event handler to modify the content of the
+		// body, before it gets written. If this is the case, $modified
+		// should be set to true.
+		//
+		// If $modified is true, we must not send back an ETag.
+		$modified = false;
+		if (!$this->emit('beforeCreateFile', [$uri, &$data, $parent, &$modified])) return false;
+
+		$etag = $parent->createFile($name, $data);
+
+		if ($modified) $etag = null;
+
+		$this->tree->markDirty($dir . '/' . $name);
+
+		$this->emit('afterBind', [$uri]);
+		$this->emit('afterCreateFile', [$uri, $parent]);
+
+		return true;
+	}
+
+	/**
+	 * This method is invoked by sub-systems updating a file.
+	 *
+	 * This method will return true if the file was actually updated
+	 *
+	 * @param string   $uri
+	 * @param resource $data
+	 * @param string   $etag
+	 * @return bool
+	 */
+	public function updateFile($uri, $data, &$etag = null) {
+
+		$node = $this->tree->getNodeForPath($uri);
+
+		// It is possible for an event handler to modify the content of the
+		// body, before it gets written. If this is the case, $modified
+		// should be set to true.
+		//
+		// If $modified is true, we must not send back an ETag.
+		$modified = false;
+		if (!$this->emit('beforeWriteContent', [$uri, $node, &$data, &$modified])) return false;
+
+		$etag = $node->put($data);
+		if ($modified) $etag = null;
+		$this->emit('afterWriteContent', [$uri, $node]);
+
+		return true;
+	}
+
+
+
+	/**
+	 * This method is invoked by sub-systems creating a new directory.
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function createDirectory($uri) {
+
+		$this->createCollection($uri, new MkCol(['{DAV:}collection'], []));
+
+	}
+
+	/**
+	 * Use this method to create a new collection
+	 *
+	 * @param string $uri The new uri
+	 * @param MkCol $mkCol
+	 * @return array|null
+	 */
+	public function createCollection($uri, MkCol $mkCol) {
+
+		list($parentUri, $newName) = URLUtil::splitPath($uri);
+
+		// Making sure the parent exists
+		try {
+			$parent = $this->tree->getNodeForPath($parentUri);
+
+		} catch (Exception\NotFound $e) {
+			throw new Exception\Conflict('Parent node does not exist');
+
+		}
+
+		// Making sure the parent is a collection
+		if (!$parent instanceof ICollection) {
+			throw new Exception\Conflict('Parent node is not a collection');
+		}
+
+		// Making sure the child does not already exist
+		try {
+			$parent->getChild($newName);
+
+			// If we got here.. it means there's already a node on that url, and we need to throw a 405
+			throw new Exception\MethodNotAllowed('The resource you tried to create already exists');
+
+		} catch (Exception\NotFound $e) {
+			// NotFound is the expected behavior.
+		}
+
+
+		if (!$this->emit('beforeBind', [$uri])) return;
+
+		if ($parent instanceof IExtendedCollection) {
+
+			/**
+			 * If the parent is an instance of IExtendedCollection, it means that
+			 * we can pass the MkCol object directly as it may be able to store
+			 * properties immediately.
+			 */
+			$parent->createExtendedCollection($newName, $mkCol);
+
+		} else {
+
+			/**
+			 * If the parent is a standard ICollection, it means only
+			 * 'standard' collections can be created, so we should fail any
+			 * MKCOL operation that carries extra resourcetypes.
+			 */
+			if (count($mkCol->getResourceType()) > 1) {
+				throw new Exception\InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
+			}
+
+			$parent->createDirectory($newName);
+
+		}
+
+		// If there are any properties that have not been handled/stored,
+		// we ask the 'propPatch' event to handle them. This will allow for
+		// example the propertyStorage system to store properties upon MKCOL.
+		if ($mkCol->getRemainingMutations()) {
+			$this->emit('propPatch', [$uri, $mkCol]);
+		}
+		$success = $mkCol->commit();
+
+		if (!$success) {
+			$result = $mkCol->getResult();
+			// generateMkCol needs the href key to exist.
+			$result['href'] = $uri;
+			return $result;
+		}
+
+		$this->tree->markDirty($parentUri);
+		$this->emit('afterBind', [$uri]);
+
+	}
+
+	/**
+	 * This method updates a resource's properties
+	 *
+	 * The properties array must be a list of properties. Array-keys are
+	 * property names in clarknotation, array-values are it's values.
+	 * If a property must be deleted, the value should be null.
+	 *
+	 * Note that this request should either completely succeed, or
+	 * completely fail.
+	 *
+	 * The response is an array with properties for keys, and http status codes
+	 * as their values.
+	 *
+	 * @param string $path
+	 * @param array $properties
+	 * @return array
+	 */
+	public function updateProperties($path, array $properties) {
+
+		$propPatch = new PropPatch($properties);
+		$this->emit('propPatch', [$path, $propPatch]);
+		$propPatch->commit();
+
+		return $propPatch->getResult();
+
+	}
+
+	/**
+	 * This method checks the main HTTP preconditions.
+	 *
+	 * Currently these are:
+	 *   * If-Match
+	 *   * If-None-Match
+	 *   * If-Modified-Since
+	 *   * If-Unmodified-Since
+	 *
+	 * The method will return true if all preconditions are met
+	 * The method will return false, or throw an exception if preconditions
+	 * failed. If false is returned the operation should be aborted, and
+	 * the appropriate HTTP response headers are already set.
+	 *
+	 * Normally this method will throw 412 Precondition Failed for failures
+	 * related to If-None-Match, If-Match and If-Unmodified Since. It will
+	 * set the status to 304 Not Modified for If-Modified_since.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function checkPreconditions(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+		$node = null;
+		$lastMod = null;
+		$etag = null;
+
+		if ($ifMatch = $request->getHeader('If-Match')) {
+
+			// If-Match contains an entity tag. Only if the entity-tag
+			// matches we are allowed to make the request succeed.
+			// If the entity-tag is '*' we are only allowed to make the
+			// request succeed if a resource exists at that url.
+			try {
+				$node = $this->tree->getNodeForPath($path);
+			} catch (Exception\NotFound $e) {
+				throw new Exception\PreconditionFailed('An If-Match header was specified and the resource did not exist', 'If-Match');
+			}
+
+			// Only need to check entity tags if they are not *
+			if ($ifMatch !== '*') {
+
+				// There can be multiple ETags
+				$ifMatch = explode(',', $ifMatch);
+				$haveMatch = false;
+				foreach ($ifMatch as $ifMatchItem) {
+
+					// Stripping any extra spaces
+					$ifMatchItem = trim($ifMatchItem, ' ');
+
+					$etag = $node instanceof IFile ? $node->getETag() : null;
+					if ($etag === $ifMatchItem) {
+						$haveMatch = true;
+					} else {
+						// Evolution has a bug where it sometimes prepends the "
+						// with a \. This is our workaround.
+						if (str_replace('\\"', '"', $ifMatchItem) === $etag) {
+							$haveMatch = true;
+						}
+					}
+
+				}
+				if (!$haveMatch) {
+					if ($etag) $response->setHeader('ETag', $etag);
+					 throw new Exception\PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.', 'If-Match');
+				}
+			}
+		}
+
+		if ($ifNoneMatch = $request->getHeader('If-None-Match')) {
+
+			// The If-None-Match header contains an ETag.
+			// Only if the ETag does not match the current ETag, the request will succeed
+			// The header can also contain *, in which case the request
+			// will only succeed if the entity does not exist at all.
+			$nodeExists = true;
+			if (!$node) {
+				try {
+					$node = $this->tree->getNodeForPath($path);
+				} catch (Exception\NotFound $e) {
+					$nodeExists = false;
+				}
+			}
+			if ($nodeExists) {
+				$haveMatch = false;
+				if ($ifNoneMatch === '*') $haveMatch = true;
+				else {
+
+					// There might be multiple ETags
+					$ifNoneMatch = explode(',', $ifNoneMatch);
+					$etag = $node instanceof IFile ? $node->getETag() : null;
+
+					foreach ($ifNoneMatch as $ifNoneMatchItem) {
+
+						// Stripping any extra spaces
+						$ifNoneMatchItem = trim($ifNoneMatchItem, ' ');
+
+						if ($etag === $ifNoneMatchItem) $haveMatch = true;
+
+					}
+
+				}
+
+				if ($haveMatch) {
+					if ($etag) $response->setHeader('ETag', $etag);
+					if ($request->getMethod() === 'GET') {
+						$response->setStatus(304);
+						return false;
+					} else {
+						throw new Exception\PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).', 'If-None-Match');
+					}
+				}
+			}
+
+		}
+
+		if (!$ifNoneMatch && ($ifModifiedSince = $request->getHeader('If-Modified-Since'))) {
+
+			// The If-Modified-Since header contains a date. We
+			// will only return the entity if it has been changed since
+			// that date. If it hasn't been changed, we return a 304
+			// header
+			// Note that this header only has to be checked if there was no If-None-Match header
+			// as per the HTTP spec.
+			$date = HTTP\Util::parseHTTPDate($ifModifiedSince);
+
+			if ($date) {
+				if (is_null($node)) {
+					$node = $this->tree->getNodeForPath($path);
+				}
+				$lastMod = $node->getLastModified();
+				if ($lastMod) {
+					$lastMod = new \DateTime('@' . $lastMod);
+					if ($lastMod <= $date) {
+						$response->setStatus(304);
+						$response->setHeader('Last-Modified', HTTP\Util::toHTTPDate($lastMod));
+						return false;
+					}
+				}
+			}
+		}
+
+		if ($ifUnmodifiedSince = $request->getHeader('If-Unmodified-Since')) {
+
+			// The If-Unmodified-Since will allow allow the request if the
+			// entity has not changed since the specified date.
+			$date = HTTP\Util::parseHTTPDate($ifUnmodifiedSince);
+
+			// We must only check the date if it's valid
+			if ($date) {
+				if (is_null($node)) {
+					$node = $this->tree->getNodeForPath($path);
+				}
+				$lastMod = $node->getLastModified();
+				if ($lastMod) {
+					$lastMod = new \DateTime('@' . $lastMod);
+					if ($lastMod > $date) {
+						throw new Exception\PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.', 'If-Unmodified-Since');
+					}
+				}
+			}
+
+		}
+
+		// Now the hardest, the If: header. The If: header can contain multiple
+		// urls, ETags and so-called 'state tokens'.
+		//
+		// Examples of state tokens include lock-tokens (as defined in rfc4918)
+		// and sync-tokens (as defined in rfc6578).
+		//
+		// The only proper way to deal with these, is to emit events, that a
+		// Sync and Lock plugin can pick up.
+		$ifConditions = $this->getIfConditions($request);
+
+		foreach ($ifConditions as $kk => $ifCondition) {
+			foreach ($ifCondition['tokens'] as $ii => $token) {
+				$ifConditions[$kk]['tokens'][$ii]['validToken'] = false;
+			}
+		}
+
+		// Plugins are responsible for validating all the tokens.
+		// If a plugin deemed a token 'valid', it will set 'validToken' to
+		// true.
+		$this->emit('validateTokens', [ $request, &$ifConditions ]);
+
+		// Now we're going to analyze the result.
+
+		// Every ifCondition needs to validate to true, so we exit as soon as
+		// we have an invalid condition.
+		foreach ($ifConditions as $ifCondition) {
+
+			$uri = $ifCondition['uri'];
+			$tokens = $ifCondition['tokens'];
+
+			// We only need 1 valid token for the condition to succeed.
+			foreach ($tokens as $token) {
+
+				$tokenValid = $token['validToken'] || !$token['token'];
+
+				$etagValid = false;
+				if (!$token['etag']) {
+					$etagValid = true;
+				}
+				// Checking the ETag, only if the token was already deamed
+				// valid and there is one.
+				if ($token['etag'] && $tokenValid) {
+
+					// The token was valid, and there was an ETag. We must
+					// grab the current ETag and check it.
+					$node = $this->tree->getNodeForPath($uri);
+					$etagValid = $node instanceof IFile && $node->getETag() == $token['etag'];
+
+				}
+
+
+				if (($tokenValid && $etagValid) ^ $token['negate']) {
+					// Both were valid, so we can go to the next condition.
+					continue 2;
+				}
+
+
+			}
+
+			// If we ended here, it means there was no valid ETag + token
+			// combination found for the current condition. This means we fail!
+			throw new Exception\PreconditionFailed('Failed to find a valid token/etag combination for ' . $uri, 'If');
+
+		}
+
+		return true;
+
+	}
+
+	/**
+	 * This method is created to extract information from the WebDAV HTTP 'If:' header
+	 *
+	 * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+	 * The function will return an array, containing structs with the following keys
+	 *
+	 *   * uri   - the uri the condition applies to.
+	 *   * tokens - The lock token. another 2 dimensional array containing 3 elements
+	 *
+	 * Example 1:
+	 *
+	 * If: (<opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2>)
+	 *
+	 * Would result in:
+	 *
+	 * [
+	 *    [
+	 *       'uri' => '/request/uri',
+	 *       'tokens' => [
+	 *          [
+	 *              [
+	 *                  'negate' => false,
+	 *                  'token'  => 'opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2',
+	 *                  'etag'   => ""
+	 *              ]
+	 *          ]
+	 *       ],
+	 *    ]
+	 * ]
+	 *
+	 * Example 2:
+	 *
+	 * If: </path/> (Not <opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2> ["Im An ETag"]) (["Another ETag"]) </path2/> (Not ["Path2 ETag"])
+	 *
+	 * Would result in:
+	 *
+	 * [
+	 *    [
+	 *       'uri' => 'path',
+	 *       'tokens' => [
+	 *          [
+	 *              [
+	 *                  'negate' => true,
+	 *                  'token'  => 'opaquelocktoken:181d4fae-7d8c-11d0-a765-00a0c91e6bf2',
+	 *                  'etag'   => '"Im An ETag"'
+	 *              ],
+	 *              [
+	 *                  'negate' => false,
+	 *                  'token'  => '',
+	 *                  'etag'   => '"Another ETag"'
+	 *              ]
+	 *          ]
+	 *       ],
+	 *    ],
+	 *    [
+	 *       'uri' => 'path2',
+	 *       'tokens' => [
+	 *          [
+	 *              [
+	 *                  'negate' => true,
+	 *                  'token'  => '',
+	 *                  'etag'   => '"Path2 ETag"'
+	 *              ]
+	 *          ]
+	 *       ],
+	 *    ],
+	 * ]
+	 *
+	 * @param RequestInterface $request
+	 * @return array
+	 */
+	public function getIfConditions(RequestInterface $request) {
+
+		$header = $request->getHeader('If');
+		if (!$header) return [];
+
+		$matches = [];
+
+		$regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
+		preg_match_all($regex, $header, $matches, PREG_SET_ORDER);
+
+		$conditions = [];
+
+		foreach ($matches as $match) {
+
+			// If there was no uri specified in this match, and there were
+			// already conditions parsed, we add the condition to the list of
+			// conditions for the previous uri.
+			if (!$match['uri'] && count($conditions)) {
+				$conditions[count($conditions) - 1]['tokens'][] = [
+					'negate' => $match['not'] ? true : false,
+					'token'  => $match['token'],
+					'etag'   => isset($match['etag']) ? $match['etag'] : ''
+				];
+			} else {
+
+				if (!$match['uri']) {
+					$realUri = $request->getPath();
+				} else {
+					$realUri = $this->calculateUri($match['uri']);
+				}
+
+				$conditions[] = [
+					'uri'    => $realUri,
+					'tokens' => [
+						[
+							'negate' => $match['not'] ? true : false,
+							'token'  => $match['token'],
+							'etag'   => isset($match['etag']) ? $match['etag'] : ''
+						]
+					],
+
+				];
+			}
+
+		}
+
+		return $conditions;
+
+	}
+
+	/**
+	 * Returns an array with resourcetypes for a node.
+	 *
+	 * @param INode $node
+	 * @return array
+	 */
+	public function getResourceTypeForNode(INode $node) {
+
+		$result = [];
+		foreach ($this->resourceTypeMapping as $className => $resourceType) {
+			if ($node instanceof $className) $result[] = $resourceType;
+		}
+		return $result;
+
+	}
+
+	// }}}
+	// {{{ XML Readers & Writers
+
+
+	/**
+	 * Generates a WebDAV propfind response body based on a list of nodes.
+	 *
+	 * If 'strip404s' is set to true, all 404 responses will be removed.
+	 *
+	 * @param array $fileProperties The list with nodes
+	 * @param bool strip404s
+	 * @return string
+	 */
+	public function generateMultiStatus(array $fileProperties, $strip404s = false) {
+
+		$xml = [];
+
+		foreach ($fileProperties as $entry) {
+
+			$href = $entry['href'];
+			unset($entry['href']);
+			if ($strip404s) {
+				unset($entry[404]);
+			}
+			$response = new Xml\Element\Response(
+				ltrim($href, '/'),
+				$entry
+			);
+			$xml[] = [
+				'name'  => '{DAV:}response',
+				'value' => $response
+			];
+
+		}
+		return $this->xml->write('{DAV:}multistatus', $xml, $this->baseUri);
+
+	}
 
 }

Braces +110 added lines, -41 removed lines

@@ -326,8 +326,9 @@ 
     public function setBaseUri($uri) {
 
         // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri) - 1] !== '/')
-            $uri .= '/';
+        if ($uri[strlen($uri) - 1] !== '/') {
+                    $uri .= '/';
+        }
 
         $this->baseUri = $uri;
 
@@ -340,7 +341,9 @@ 
      */
     public function getBaseUri() {
 
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+        if (is_null($this->baseUri)) {
+        	$this->baseUri = $this->guessBaseUri();
+        }
         return $this->baseUri;
 
     }
@@ -362,8 +365,9 @@ 
         if (!empty($pathInfo)) {
 
             // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri, '?'))
-                $uri = substr($uri, 0, $pos);
+            if ($pos = strpos($uri, '?')) {
+                            $uri = substr($uri, 0, $pos);
+            }
 
             // PATH_INFO is only set for urls, such as: /example.php/path
             // in that case PATH_INFO contains '/path'.
@@ -412,8 +416,9 @@ 
      */
     public function getPlugin($name) {
 
-        if (isset($this->plugins[$name]))
-            return $this->plugins[$name];
+        if (isset($this->plugins[$name])) {
+                    return $this->plugins[$name];
+        }
 
         return null;
 
@@ -442,8 +447,12 @@ 
 
         $method = $request->getMethod();
 
-        if (!$this->emit('beforeMethod:' . $method, [$request, $response])) return;
-        if (!$this->emit('beforeMethod', [$request, $response])) return;
+        if (!$this->emit('beforeMethod:' . $method, [$request, $response])) {
+        	return;
+        }
+        if (!$this->emit('beforeMethod', [$request, $response])) {
+        	return;
+        }
 
         if (self::$exposeVersion) {
             $response->setHeader('X-Sabre-Version', Version::VERSION);
@@ -468,8 +477,12 @@ 
             }
         }
 
-        if (!$this->emit('afterMethod:' . $method, [$request, $response])) return;
-        if (!$this->emit('afterMethod', [$request, $response])) return;
+        if (!$this->emit('afterMethod:' . $method, [$request, $response])) {
+        	return;
+        }
+        if (!$this->emit('afterMethod', [$request, $response])) {
+        	return;
+        }
 
         if ($response->getStatus() === null) {
             throw new Exception('No subsystem set a valid HTTP status code. Something must have interrupted the request without providing further detail.');
@@ -512,7 +525,9 @@ 
         }
 
         // We're also checking if any of the plugins register any new methods
-        foreach ($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($path));
+        foreach ($this->plugins as $plugin) {
+        	$methods = array_merge($methods, $plugin->getHTTPMethods($path));
+        }
         array_unique($methods);
 
         return $methods;
@@ -585,13 +600,19 @@ 
         // If its not set, we'll grab the default
         $depth = $this->httpRequest->getHeader('Depth');
 
-        if (is_null($depth)) return $default;
+        if (is_null($depth)) {
+        	return $default;
+        }
 
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
+        if ($depth == 'infinity') {
+        	return self::DEPTH_INFINITY;
+        }
 
 
         // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
+        if (!ctype_digit($depth)) {
+        	return $default;
+        }
 
         return (int)$depth;
 
@@ -614,13 +635,19 @@ 
     public function getHTTPRange() {
 
         $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null;
+        if (is_null($range)) {
+        	return null;
+        }
 
         // Matching "Range: bytes=1234-5678: both numbers are optional
 
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i', $range, $matches)) return null;
+        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i', $range, $matches)) {
+        	return null;
+        }
 
-        if ($matches[1] === '' && $matches[2] === '') return null;
+        if ($matches[1] === '' && $matches[2] === '') {
+        	return null;
+        }
 
         return [
             $matches[1] !== '' ? $matches[1] : null,
@@ -709,20 +736,31 @@ 
     public function getCopyAndMoveInfo(RequestInterface $request) {
 
         // Collecting the relevant HTTP headers
-        if (!$request->getHeader('Destination')) throw new Exception\BadRequest('The destination header was not supplied');
+        if (!$request->getHeader('Destination')) {
+        	throw new Exception\BadRequest('The destination header was not supplied');
+        }
         $destination = $this->calculateUri($request->getHeader('Destination'));
         $overwrite = $request->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite) == 'T') $overwrite = true;
-        elseif (strtoupper($overwrite) == 'F') $overwrite = false;
+        if (!$overwrite) {
+        	$overwrite = 'T';
+        }
+        if (strtoupper($overwrite) == 'T') {
+        	$overwrite = true;
+        } elseif (strtoupper($overwrite) == 'F') {
+        	$overwrite = false;
+        }
         // We need to throw a bad request exception, if the header was invalid
-        else throw new Exception\BadRequest('The HTTP Overwrite header should be either T or F');
+        else {
+        	throw new Exception\BadRequest('The HTTP Overwrite header should be either T or F');
+        }
 
         list($destinationDir) = URLUtil::splitPath($destination);
 
         try {
             $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof ICollection)) throw new Exception\UnsupportedMediaType('The destination node is not a collection');
+            if (!($destinationParent instanceof ICollection)) {
+            	throw new Exception\UnsupportedMediaType('The destination node is not a collection');
+            }
         } catch (Exception\NotFound $e) {
 
             // If the destination parent node is not found, we throw a 409
@@ -735,7 +773,9 @@ 
 
             // If this succeeded, it means the destination already exists
             // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Exception\PreconditionFailed('The destination node already exists, and the overwrite header is set to false', 'Overwrite');
+            if (!$overwrite) {
+            	throw new Exception\PreconditionFailed('The destination node already exists, and the overwrite header is set to false', 'Overwrite');
+            }
 
         } catch (Exception\NotFound $e) {
 
@@ -804,7 +844,9 @@ 
         foreach ($this->getPropertiesForPath($path, $propertyNames, 1) as $k => $row) {
 
             // Skipping the parent path
-            if ($k === 0) continue;
+            if ($k === 0) {
+            	continue;
+            }
 
             $result[$row['href']] = $row[200];
 
@@ -838,7 +880,9 @@ 
 
         $headers = [];
         foreach ($propertyMap as $property => $header) {
-            if (!isset($properties[$property])) continue;
+            if (!isset($properties[$property])) {
+            	continue;
+            }
 
             if (is_scalar($properties[$property])) {
                 $headers[$header] = $properties[$property];
@@ -909,7 +953,9 @@ 
     public function getPropertiesForPath($path, $propertyNames = [], $depth = 0) {
 
         // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
-        if (!$this->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
+        if (!$this->enablePropfindDepthInfinity && $depth != 0) {
+        	$depth = 1;
+        }
 
         $path = trim($path, '/');
 
@@ -1034,7 +1080,9 @@ 
 
         list($dir, $name) = URLUtil::splitPath($uri);
 
-        if (!$this->emit('beforeBind', [$uri])) return false;
+        if (!$this->emit('beforeBind', [$uri])) {
+        	return false;
+        }
 
         $parent = $this->tree->getNodeForPath($dir);
         if (!$parent instanceof ICollection) {
@@ -1047,11 +1095,15 @@ 
         //
         // If $modified is true, we must not send back an ETag.
         $modified = false;
-        if (!$this->emit('beforeCreateFile', [$uri, &$data, $parent, &$modified])) return false;
+        if (!$this->emit('beforeCreateFile', [$uri, &$data, $parent, &$modified])) {
+        	return false;
+        }
 
         $etag = $parent->createFile($name, $data);
 
-        if ($modified) $etag = null;
+        if ($modified) {
+        	$etag = null;
+        }
 
         $this->tree->markDirty($dir . '/' . $name);
 
@@ -1081,10 +1133,14 @@ 
         //
         // If $modified is true, we must not send back an ETag.
         $modified = false;
-        if (!$this->emit('beforeWriteContent', [$uri, $node, &$data, &$modified])) return false;
+        if (!$this->emit('beforeWriteContent', [$uri, $node, &$data, &$modified])) {
+        	return false;
+        }
 
         $etag = $node->put($data);
-        if ($modified) $etag = null;
+        if ($modified) {
+        	$etag = null;
+        }
         $this->emit('afterWriteContent', [$uri, $node]);
 
         return true;
@@ -1141,7 +1197,9 @@ 
         }
 
 
-        if (!$this->emit('beforeBind', [$uri])) return;
+        if (!$this->emit('beforeBind', [$uri])) {
+        	return;
+        }
 
         if ($parent instanceof IExtendedCollection) {
 
@@ -1279,7 +1337,9 @@ 
 
                 }
                 if (!$haveMatch) {
-                    if ($etag) $response->setHeader('ETag', $etag);
+                    if ($etag) {
+                    	$response->setHeader('ETag', $etag);
+                    }
                      throw new Exception\PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.', 'If-Match');
                 }
             }
@@ -1301,8 +1361,9 @@ 
             }
             if ($nodeExists) {
                 $haveMatch = false;
-                if ($ifNoneMatch === '*') $haveMatch = true;
-                else {
+                if ($ifNoneMatch === '*') {
+                	$haveMatch = true;
+                } else {
 
                     // There might be multiple ETags
                     $ifNoneMatch = explode(',', $ifNoneMatch);
@@ -1313,14 +1374,18 @@ 
                         // Stripping any extra spaces
                         $ifNoneMatchItem = trim($ifNoneMatchItem, ' ');
 
-                        if ($etag === $ifNoneMatchItem) $haveMatch = true;
+                        if ($etag === $ifNoneMatchItem) {
+                        	$haveMatch = true;
+                        }
 
                     }
 
                 }
 
                 if ($haveMatch) {
-                    if ($etag) $response->setHeader('ETag', $etag);
+                    if ($etag) {
+                    	$response->setHeader('ETag', $etag);
+                    }
                     if ($request->getMethod() === 'GET') {
                         $response->setStatus(304);
                         return false;
@@ -1523,7 +1588,9 @@ 
     public function getIfConditions(RequestInterface $request) {
 
         $header = $request->getHeader('If');
-        if (!$header) return [];
+        if (!$header) {
+        	return [];
+        }
 
         $matches = [];
 
@@ -1580,7 +1647,9 @@ 
 
         $result = [];
         foreach ($this->resourceTypeMapping as $className => $resourceType) {
-            if ($node instanceof $className) $result[] = $resourceType;
+            if ($node instanceof $className) {
+            	$result[] = $resourceType;
+            }
         }
         return $result;
 

libraries/SabreDAV/DAV/CorePlugin.php

Braces +71 added lines, -27 removed lines

@@ -78,7 +78,9 @@ 
         $path = $request->getPath();
         $node = $this->server->tree->getNodeForPath($path);
 
-        if (!$node instanceof IFile) return;
+        if (!$node instanceof IFile) {
+        	return;
+        }
 
         $body = $node->get();
 
@@ -132,17 +134,23 @@ 
 
                 // It's a date. We must check if the entity is modified since
                 // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
+                if (!isset($httpHeaders['Last-Modified'])) {
+                	$ignoreRangeHeader = true;
+                } else {
                     $modified = new \DateTime($httpHeaders['Last-Modified']);
-                    if ($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                    if ($modified > $ifRangeDate) {
+                    	$ignoreRangeHeader = true;
+                    }
                 }
 
             } catch (\Exception $e) {
 
                 // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag'] !== $ifRange) $ignoreRangeHeader = true;
+                if (!isset($httpHeaders['ETag'])) {
+                	$ignoreRangeHeader = true;
+                } elseif ($httpHeaders['ETag'] !== $ifRange) {
+                	$ignoreRangeHeader = true;
+                }
             }
         }
 
@@ -154,18 +162,25 @@ 
 
                 $start = $range[0];
                 $end = $range[1] ? $range[1] : $nodeSize - 1;
-                if ($start >= $nodeSize)
-                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+                if ($start >= $nodeSize) {
+                                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+                }
 
-                if ($end < $start) throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if ($end >= $nodeSize) $end = $nodeSize - 1;
+                if ($end < $start) {
+                	throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                }
+                if ($end >= $nodeSize) {
+                	$end = $nodeSize - 1;
+                }
 
             } else {
 
                 $start = $nodeSize - $range[1];
                 $end  = $nodeSize - 1;
 
-                if ($start < 0) $start = 0;
+                if ($start < 0) {
+                	$start = 0;
+                }
 
             }
 
@@ -175,7 +190,9 @@ 
             if (!stream_get_meta_data($body)['seekable'] || fseek($body, $start, SEEK_SET) === -1) {
                 $consumeBlock = 8192;
                 for ($consumed = 0; $start - $consumed > 0;){
-                    if (feof($body)) throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
+                    if (feof($body)) {
+                    	throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
+                    }
                     $consumed += strlen(fread($body, min($start - $consumed, $consumeBlock)));
                 }
             }
@@ -187,7 +204,9 @@ 
 
         } else {
 
-            if ($nodeSize) $response->setHeader('Content-Length', $nodeSize);
+            if ($nodeSize) {
+            	$response->setHeader('Content-Length', $nodeSize);
+            }
             $response->setStatus(200);
             $response->setBody($body);
 
@@ -281,7 +300,9 @@ 
 
         $path = $request->getPath();
 
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
+        if (!$this->server->emit('beforeUnbind', [$path])) {
+        	return false;
+        }
         $this->server->tree->delete($path);
         $this->server->emit('afterUnbind', [$path]);
 
@@ -329,7 +350,9 @@ 
 
         $depth = $this->server->getHTTPDepth(1);
         // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
-        if (!$this->server->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
+        if (!$this->server->enablePropfindDepthInfinity && $depth != 0) {
+        	$depth = 1;
+        }
 
         $newProperties = $this->server->getPropertiesForPath($path, $propFindXml->properties, $depth);
 
@@ -506,14 +529,18 @@ 
             $node = $this->server->tree->getNodeForPath($path);
 
             // If the node is a collection, we'll deny it
-            if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
+            if (!($node instanceof IFile)) {
+            	throw new Exception\Conflict('PUT is not allowed on non-files.');
+            }
 
             if (!$this->server->updateFile($path, $body, $etag)) {
                 return false;
             }
 
             $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
+            if ($etag) {
+            	$response->setHeader('ETag', $etag);
+            }
             $response->setStatus(204);
 
         } else {
@@ -526,7 +553,9 @@ 
             }
 
             $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
+            if ($etag) {
+            	$response->setHeader('ETag', $etag);
+            }
             $response->setStatus(201);
 
         }
@@ -570,8 +599,9 @@ 
 
             $properties = $mkcol->getProperties();
 
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+            if (!isset($properties['{DAV:}resourcetype'])) {
+                            throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+            }
 
             $resourceType = $properties['{DAV:}resourcetype']->getValue();
             unset($properties['{DAV:}resourcetype']);
@@ -623,12 +653,20 @@ 
 
         if ($moveInfo['destinationExists']) {
 
-            if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) return false;
+            if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) {
+            	return false;
+            }
 
         }
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
-        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) return false;
-        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
+        if (!$this->server->emit('beforeUnbind', [$path])) {
+        	return false;
+        }
+        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) {
+        	return false;
+        }
+        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) {
+        	return false;
+        }
 
         if ($moveInfo['destinationExists']) {
 
@@ -673,9 +711,13 @@ 
 
         $copyInfo = $this->server->getCopyAndMoveInfo($request);
 
-        if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) return false;
+        if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) {
+        	return false;
+        }
         if ($copyInfo['destinationExists']) {
-            if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) return false;
+            if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) {
+            	return false;
+            }
             $this->server->tree->delete($copyInfo['destination']);
         }
 
@@ -871,7 +913,9 @@ 
             // If we already have a sync-token from the current propFind
             // request, we can re-use that.
             $val = $propFind->get('{http://sabredav.org/ns}sync-token');
-            if ($val) return $val;
+            if ($val) {
+            	return $val;
+            }
 
             $val = $propFind->get('{DAV:}sync-token');
             if ($val && is_scalar($val)) {

Indentation +809 added lines, -809 removed lines

@@ -16,449 +16,449 @@ 
  */
 class CorePlugin extends ServerPlugin {
 
-    /**
-     * Reference to server object.
-     *
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * Sets up the plugin
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $this->server = $server;
-        $server->on('method:GET',       [$this, 'httpGet']);
-        $server->on('method:OPTIONS',   [$this, 'httpOptions']);
-        $server->on('method:HEAD',      [$this, 'httpHead']);
-        $server->on('method:DELETE',    [$this, 'httpDelete']);
-        $server->on('method:PROPFIND',  [$this, 'httpPropFind']);
-        $server->on('method:PROPPATCH', [$this, 'httpPropPatch']);
-        $server->on('method:PUT',       [$this, 'httpPut']);
-        $server->on('method:MKCOL',     [$this, 'httpMkcol']);
-        $server->on('method:MOVE',      [$this, 'httpMove']);
-        $server->on('method:COPY',      [$this, 'httpCopy']);
-        $server->on('method:REPORT',    [$this, 'httpReport']);
-
-        $server->on('propPatch',        [$this, 'propPatchProtectedPropertyCheck'], 90);
-        $server->on('propPatch',        [$this, 'propPatchNodeUpdate'], 200);
-        $server->on('propFind',         [$this, 'propFind']);
-        $server->on('propFind',         [$this, 'propFindNode'], 120);
-        $server->on('propFind',         [$this, 'propFindLate'], 200);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'core';
-
-    }
-
-    /**
-     * This is the default implementation for the GET method.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!$node instanceof IFile) return;
-
-        $body = $node->get();
-
-        // Converting string into stream, if needed.
-        if (is_string($body)) {
-            $stream = fopen('php://temp', 'r+');
-            fwrite($stream, $body);
-            rewind($stream);
-            $body = $stream;
-        }
-
-        $httpHeaders = $this->server->getHTTPHeaders($path);
-
-        /* ContentType needs to get a default, because many webservers will otherwise
+	/**
+	 * Reference to server object.
+	 *
+	 * @var Server
+	 */
+	protected $server;
+
+	/**
+	 * Sets up the plugin
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$this->server = $server;
+		$server->on('method:GET',       [$this, 'httpGet']);
+		$server->on('method:OPTIONS',   [$this, 'httpOptions']);
+		$server->on('method:HEAD',      [$this, 'httpHead']);
+		$server->on('method:DELETE',    [$this, 'httpDelete']);
+		$server->on('method:PROPFIND',  [$this, 'httpPropFind']);
+		$server->on('method:PROPPATCH', [$this, 'httpPropPatch']);
+		$server->on('method:PUT',       [$this, 'httpPut']);
+		$server->on('method:MKCOL',     [$this, 'httpMkcol']);
+		$server->on('method:MOVE',      [$this, 'httpMove']);
+		$server->on('method:COPY',      [$this, 'httpCopy']);
+		$server->on('method:REPORT',    [$this, 'httpReport']);
+
+		$server->on('propPatch',        [$this, 'propPatchProtectedPropertyCheck'], 90);
+		$server->on('propPatch',        [$this, 'propPatchNodeUpdate'], 200);
+		$server->on('propFind',         [$this, 'propFind']);
+		$server->on('propFind',         [$this, 'propFindNode'], 120);
+		$server->on('propFind',         [$this, 'propFindLate'], 200);
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'core';
+
+	}
+
+	/**
+	 * This is the default implementation for the GET method.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!$node instanceof IFile) return;
+
+		$body = $node->get();
+
+		// Converting string into stream, if needed.
+		if (is_string($body)) {
+			$stream = fopen('php://temp', 'r+');
+			fwrite($stream, $body);
+			rewind($stream);
+			$body = $stream;
+		}
+
+		$httpHeaders = $this->server->getHTTPHeaders($path);
+
+		/* ContentType needs to get a default, because many webservers will otherwise
          * default to text/html, and we don't want this for security reasons.
          */
-        if (!isset($httpHeaders['Content-Type'])) {
-            $httpHeaders['Content-Type'] = 'application/octet-stream';
-        }
+		if (!isset($httpHeaders['Content-Type'])) {
+			$httpHeaders['Content-Type'] = 'application/octet-stream';
+		}
 
 
-        if (isset($httpHeaders['Content-Length'])) {
+		if (isset($httpHeaders['Content-Length'])) {
 
-            $nodeSize = $httpHeaders['Content-Length'];
+			$nodeSize = $httpHeaders['Content-Length'];
 
-            // Need to unset Content-Length, because we'll handle that during figuring out the range
-            unset($httpHeaders['Content-Length']);
+			// Need to unset Content-Length, because we'll handle that during figuring out the range
+			unset($httpHeaders['Content-Length']);
 
-        } else {
-            $nodeSize = null;
-        }
+		} else {
+			$nodeSize = null;
+		}
 
-        $response->addHeaders($httpHeaders);
+		$response->addHeaders($httpHeaders);
 
-        $range = $this->server->getHTTPRange();
-        $ifRange = $request->getHeader('If-Range');
-        $ignoreRangeHeader = false;
+		$range = $this->server->getHTTPRange();
+		$ifRange = $request->getHeader('If-Range');
+		$ignoreRangeHeader = false;
 
-        // If ifRange is set, and range is specified, we first need to check
-        // the precondition.
-        if ($nodeSize && $range && $ifRange) {
+		// If ifRange is set, and range is specified, we first need to check
+		// the precondition.
+		if ($nodeSize && $range && $ifRange) {
 
-            // if IfRange is parsable as a date we'll treat it as a DateTime
-            // otherwise, we must treat it as an etag.
-            try {
-                $ifRangeDate = new \DateTime($ifRange);
+			// if IfRange is parsable as a date we'll treat it as a DateTime
+			// otherwise, we must treat it as an etag.
+			try {
+				$ifRangeDate = new \DateTime($ifRange);
 
-                // It's a date. We must check if the entity is modified since
-                // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
-                    $modified = new \DateTime($httpHeaders['Last-Modified']);
-                    if ($modified > $ifRangeDate) $ignoreRangeHeader = true;
-                }
+				// It's a date. We must check if the entity is modified since
+				// the specified date.
+				if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
+				else {
+					$modified = new \DateTime($httpHeaders['Last-Modified']);
+					if ($modified > $ifRangeDate) $ignoreRangeHeader = true;
+				}
 
-            } catch (\Exception $e) {
-
-                // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag'] !== $ifRange) $ignoreRangeHeader = true;
-            }
-        }
-
-        // We're only going to support HTTP ranges if the backend provided a filesize
-        if (!$ignoreRangeHeader && $nodeSize && $range) {
-
-            // Determining the exact byte offsets
-            if (!is_null($range[0])) {
-
-                $start = $range[0];
-                $end = $range[1] ? $range[1] : $nodeSize - 1;
-                if ($start >= $nodeSize)
-                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
-
-                if ($end < $start) throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if ($end >= $nodeSize) $end = $nodeSize - 1;
-
-            } else {
-
-                $start = $nodeSize - $range[1];
-                $end  = $nodeSize - 1;
-
-                if ($start < 0) $start = 0;
-
-            }
-
-            // Streams may advertise themselves as seekable, but still not
-            // actually allow fseek.  We'll manually go forward in the stream
-            // if fseek failed.
-            if (!stream_get_meta_data($body)['seekable'] || fseek($body, $start, SEEK_SET) === -1) {
-                $consumeBlock = 8192;
-                for ($consumed = 0; $start - $consumed > 0;){
-                    if (feof($body)) throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
-                    $consumed += strlen(fread($body, min($start - $consumed, $consumeBlock)));
-                }
-            }
-
-            $response->setHeader('Content-Length', $end - $start + 1);
-            $response->setHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $nodeSize);
-            $response->setStatus(206);
-            $response->setBody($body);
-
-        } else {
-
-            if ($nodeSize) $response->setHeader('Content-Length', $nodeSize);
-            $response->setStatus(200);
-            $response->setBody($body);
-
-        }
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * HTTP OPTIONS
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpOptions(RequestInterface $request, ResponseInterface $response) {
-
-        $methods = $this->server->getAllowedMethods($request->getPath());
-
-        $response->setHeader('Allow', strtoupper(implode(', ', $methods)));
-        $features = ['1', '3', 'extended-mkcol'];
-
-        foreach ($this->server->getPlugins() as $plugin) {
-            $features = array_merge($features, $plugin->getFeatures());
-        }
-
-        $response->setHeader('DAV', implode(', ', $features));
-        $response->setHeader('MS-Author-Via', 'DAV');
-        $response->setHeader('Accept-Ranges', 'bytes');
-        $response->setHeader('Content-Length', '0');
-        $response->setStatus(200);
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * HTTP HEAD
-     *
-     * This method is normally used to take a peak at a url, and only get the
-     * HTTP response headers, without the body. This is used by clients to
-     * determine if a remote file was changed, so they can use a local cached
-     * version, instead of downloading it again
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpHead(RequestInterface $request, ResponseInterface $response) {
-
-        // This is implemented by changing the HEAD request to a GET request,
-        // and dropping the response body.
-        $subRequest = clone $request;
-        $subRequest->setMethod('GET');
-
-        try {
-            $this->server->invokeMethod($subRequest, $response, false);
-            $response->setBody('');
-        } catch (Exception\NotImplemented $e) {
-            // Some clients may do HEAD requests on collections, however, GET
-            // requests and HEAD requests _may_ not be defined on a collection,
-            // which would trigger a 501.
-            // This breaks some clients though, so we're transforming these
-            // 501s into 200s.
-            $response->setStatus(200);
-            $response->setBody('');
-            $response->setHeader('Content-Type', 'text/plain');
-            $response->setHeader('X-Sabre-Real-Status', $e->getHTTPCode());
-        }
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * HTTP Delete
-     *
-     * The HTTP delete method, deletes a given uri
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function httpDelete(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
-        $this->server->tree->delete($path);
-        $this->server->emit('afterUnbind', [$path]);
-
-        $response->setStatus(204);
-        $response->setHeader('Content-Length', '0');
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * WebDAV PROPFIND
-     *
-     * This WebDAV method requests information about an uri resource, or a list of resources
-     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
-     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
-     *
-     * The request body contains an XML data structure that has a list of properties the client understands
-     * The response body is also an xml document, containing information about every uri resource and the requested properties
-     *
-     * It has to return a HTTP 207 Multi-status status code
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function httpPropFind(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        $requestBody = $request->getBodyAsString();
-        if (strlen($requestBody)) {
-            try {
-                $propFindXml = $this->server->xml->expect('{DAV:}propfind', $requestBody);
-            } catch (ParseException $e) {
-                throw new BadRequest($e->getMessage(), null, $e);
-            }
-        } else {
-            $propFindXml = new Xml\Request\PropFind();
-            $propFindXml->allProp = true;
-            $propFindXml->properties = [];
-        }
-
-        $depth = $this->server->getHTTPDepth(1);
-        // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
-        if (!$this->server->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
-
-        $newProperties = $this->server->getPropertiesForPath($path, $propFindXml->properties, $depth);
-
-        // This is a multi-status response
-        $response->setStatus(207);
-        $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $response->setHeader('Vary', 'Brief,Prefer');
-
-        // Normally this header is only needed for OPTIONS responses, however..
-        // iCal seems to also depend on these being set for PROPFIND. Since
-        // this is not harmful, we'll add it.
-        $features = ['1', '3', 'extended-mkcol'];
-        foreach ($this->server->getPlugins() as $plugin) {
-            $features = array_merge($features, $plugin->getFeatures());
-        }
-        $response->setHeader('DAV', implode(', ', $features));
-
-        $prefer = $this->server->getHTTPPrefer();
-        $minimal = $prefer['return'] === 'minimal';
-
-        $data = $this->server->generateMultiStatus($newProperties, $minimal);
-        $response->setBody($data);
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * WebDAV PROPPATCH
-     *
-     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
-     * In this XML body it is specified which properties should be set/updated and/or deleted
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpPropPatch(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        try {
-            $propPatch = $this->server->xml->expect('{DAV:}propertyupdate', $request->getBody());
-        } catch (ParseException $e) {
-            throw new BadRequest($e->getMessage(), null, $e);
-        }
-        $newProperties = $propPatch->properties;
-
-        $result = $this->server->updateProperties($path, $newProperties);
-
-        $prefer = $this->server->getHTTPPrefer();
-        $response->setHeader('Vary', 'Brief,Prefer');
-
-        if ($prefer['return'] === 'minimal') {
-
-            // If return-minimal is specified, we only have to check if the
-            // request was succesful, and don't need to return the
-            // multi-status.
-            $ok = true;
-            foreach ($result as $prop => $code) {
-                if ((int)$code > 299) {
-                    $ok = false;
-                }
-            }
-
-            if ($ok) {
-
-                $response->setStatus(204);
-                return false;
-
-            }
-
-        }
-
-        $response->setStatus(207);
-        $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
-
-
-        // Reorganizing the result for generateMultiStatus
-        $multiStatus = [];
-        foreach ($result as $propertyName => $code) {
-            if (isset($multiStatus[$code])) {
-                $multiStatus[$code][$propertyName] = null;
-            } else {
-                $multiStatus[$code] = [$propertyName => null];
-            }
-        }
-        $multiStatus['href'] = $path;
-
-        $response->setBody(
-            $this->server->generateMultiStatus([$multiStatus])
-        );
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * HTTP PUT method
-     *
-     * This HTTP method updates a file, or creates a new one.
-     *
-     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpPut(RequestInterface $request, ResponseInterface $response) {
-
-        $body = $request->getBodyAsStream();
-        $path = $request->getPath();
-
-        // Intercepting Content-Range
-        if ($request->getHeader('Content-Range')) {
-            /*
+			} catch (\Exception $e) {
+
+				// It's an entity. We can do a simple comparison.
+				if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
+				elseif ($httpHeaders['ETag'] !== $ifRange) $ignoreRangeHeader = true;
+			}
+		}
+
+		// We're only going to support HTTP ranges if the backend provided a filesize
+		if (!$ignoreRangeHeader && $nodeSize && $range) {
+
+			// Determining the exact byte offsets
+			if (!is_null($range[0])) {
+
+				$start = $range[0];
+				$end = $range[1] ? $range[1] : $nodeSize - 1;
+				if ($start >= $nodeSize)
+					throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+
+				if ($end < $start) throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+				if ($end >= $nodeSize) $end = $nodeSize - 1;
+
+			} else {
+
+				$start = $nodeSize - $range[1];
+				$end  = $nodeSize - 1;
+
+				if ($start < 0) $start = 0;
+
+			}
+
+			// Streams may advertise themselves as seekable, but still not
+			// actually allow fseek.  We'll manually go forward in the stream
+			// if fseek failed.
+			if (!stream_get_meta_data($body)['seekable'] || fseek($body, $start, SEEK_SET) === -1) {
+				$consumeBlock = 8192;
+				for ($consumed = 0; $start - $consumed > 0;){
+					if (feof($body)) throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
+					$consumed += strlen(fread($body, min($start - $consumed, $consumeBlock)));
+				}
+			}
+
+			$response->setHeader('Content-Length', $end - $start + 1);
+			$response->setHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $nodeSize);
+			$response->setStatus(206);
+			$response->setBody($body);
+
+		} else {
+
+			if ($nodeSize) $response->setHeader('Content-Length', $nodeSize);
+			$response->setStatus(200);
+			$response->setBody($body);
+
+		}
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * HTTP OPTIONS
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpOptions(RequestInterface $request, ResponseInterface $response) {
+
+		$methods = $this->server->getAllowedMethods($request->getPath());
+
+		$response->setHeader('Allow', strtoupper(implode(', ', $methods)));
+		$features = ['1', '3', 'extended-mkcol'];
+
+		foreach ($this->server->getPlugins() as $plugin) {
+			$features = array_merge($features, $plugin->getFeatures());
+		}
+
+		$response->setHeader('DAV', implode(', ', $features));
+		$response->setHeader('MS-Author-Via', 'DAV');
+		$response->setHeader('Accept-Ranges', 'bytes');
+		$response->setHeader('Content-Length', '0');
+		$response->setStatus(200);
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * HTTP HEAD
+	 *
+	 * This method is normally used to take a peak at a url, and only get the
+	 * HTTP response headers, without the body. This is used by clients to
+	 * determine if a remote file was changed, so they can use a local cached
+	 * version, instead of downloading it again
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpHead(RequestInterface $request, ResponseInterface $response) {
+
+		// This is implemented by changing the HEAD request to a GET request,
+		// and dropping the response body.
+		$subRequest = clone $request;
+		$subRequest->setMethod('GET');
+
+		try {
+			$this->server->invokeMethod($subRequest, $response, false);
+			$response->setBody('');
+		} catch (Exception\NotImplemented $e) {
+			// Some clients may do HEAD requests on collections, however, GET
+			// requests and HEAD requests _may_ not be defined on a collection,
+			// which would trigger a 501.
+			// This breaks some clients though, so we're transforming these
+			// 501s into 200s.
+			$response->setStatus(200);
+			$response->setBody('');
+			$response->setHeader('Content-Type', 'text/plain');
+			$response->setHeader('X-Sabre-Real-Status', $e->getHTTPCode());
+		}
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * HTTP Delete
+	 *
+	 * The HTTP delete method, deletes a given uri
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function httpDelete(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		if (!$this->server->emit('beforeUnbind', [$path])) return false;
+		$this->server->tree->delete($path);
+		$this->server->emit('afterUnbind', [$path]);
+
+		$response->setStatus(204);
+		$response->setHeader('Content-Length', '0');
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * WebDAV PROPFIND
+	 *
+	 * This WebDAV method requests information about an uri resource, or a list of resources
+	 * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
+	 * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
+	 *
+	 * The request body contains an XML data structure that has a list of properties the client understands
+	 * The response body is also an xml document, containing information about every uri resource and the requested properties
+	 *
+	 * It has to return a HTTP 207 Multi-status status code
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function httpPropFind(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		$requestBody = $request->getBodyAsString();
+		if (strlen($requestBody)) {
+			try {
+				$propFindXml = $this->server->xml->expect('{DAV:}propfind', $requestBody);
+			} catch (ParseException $e) {
+				throw new BadRequest($e->getMessage(), null, $e);
+			}
+		} else {
+			$propFindXml = new Xml\Request\PropFind();
+			$propFindXml->allProp = true;
+			$propFindXml->properties = [];
+		}
+
+		$depth = $this->server->getHTTPDepth(1);
+		// The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
+		if (!$this->server->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
+
+		$newProperties = $this->server->getPropertiesForPath($path, $propFindXml->properties, $depth);
+
+		// This is a multi-status response
+		$response->setStatus(207);
+		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$response->setHeader('Vary', 'Brief,Prefer');
+
+		// Normally this header is only needed for OPTIONS responses, however..
+		// iCal seems to also depend on these being set for PROPFIND. Since
+		// this is not harmful, we'll add it.
+		$features = ['1', '3', 'extended-mkcol'];
+		foreach ($this->server->getPlugins() as $plugin) {
+			$features = array_merge($features, $plugin->getFeatures());
+		}
+		$response->setHeader('DAV', implode(', ', $features));
+
+		$prefer = $this->server->getHTTPPrefer();
+		$minimal = $prefer['return'] === 'minimal';
+
+		$data = $this->server->generateMultiStatus($newProperties, $minimal);
+		$response->setBody($data);
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * WebDAV PROPPATCH
+	 *
+	 * This method is called to update properties on a Node. The request is an XML body with all the mutations.
+	 * In this XML body it is specified which properties should be set/updated and/or deleted
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpPropPatch(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		try {
+			$propPatch = $this->server->xml->expect('{DAV:}propertyupdate', $request->getBody());
+		} catch (ParseException $e) {
+			throw new BadRequest($e->getMessage(), null, $e);
+		}
+		$newProperties = $propPatch->properties;
+
+		$result = $this->server->updateProperties($path, $newProperties);
+
+		$prefer = $this->server->getHTTPPrefer();
+		$response->setHeader('Vary', 'Brief,Prefer');
+
+		if ($prefer['return'] === 'minimal') {
+
+			// If return-minimal is specified, we only have to check if the
+			// request was succesful, and don't need to return the
+			// multi-status.
+			$ok = true;
+			foreach ($result as $prop => $code) {
+				if ((int)$code > 299) {
+					$ok = false;
+				}
+			}
+
+			if ($ok) {
+
+				$response->setStatus(204);
+				return false;
+
+			}
+
+		}
+
+		$response->setStatus(207);
+		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+
+
+		// Reorganizing the result for generateMultiStatus
+		$multiStatus = [];
+		foreach ($result as $propertyName => $code) {
+			if (isset($multiStatus[$code])) {
+				$multiStatus[$code][$propertyName] = null;
+			} else {
+				$multiStatus[$code] = [$propertyName => null];
+			}
+		}
+		$multiStatus['href'] = $path;
+
+		$response->setBody(
+			$this->server->generateMultiStatus([$multiStatus])
+		);
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * HTTP PUT method
+	 *
+	 * This HTTP method updates a file, or creates a new one.
+	 *
+	 * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpPut(RequestInterface $request, ResponseInterface $response) {
+
+		$body = $request->getBodyAsStream();
+		$path = $request->getPath();
+
+		// Intercepting Content-Range
+		if ($request->getHeader('Content-Range')) {
+			/*
                An origin server that allows PUT on a given target resource MUST send
                a 400 (Bad Request) response to a PUT request that contains a
                Content-Range header field.
 
                Reference: http://tools.ietf.org/html/rfc7231#section-4.3.4
             */
-            throw new Exception\BadRequest('Content-Range on PUT requests are forbidden.');
-        }
+			throw new Exception\BadRequest('Content-Range on PUT requests are forbidden.');
+		}
 
-        // Intercepting the Finder problem
-        if (($expected = $request->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
+		// Intercepting the Finder problem
+		if (($expected = $request->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
 
-            /*
+			/*
             Many webservers will not cooperate well with Finder PUT requests,
             because it uses 'Chunked' transfer encoding for the request body.
 
@@ -479,445 +479,445 @@ 
             protect the end-user.
             */
 
-            // Only reading first byte
-            $firstByte = fread($body, 1);
-            if (strlen($firstByte) !== 1) {
-                throw new Exception\Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
-            }
+			// Only reading first byte
+			$firstByte = fread($body, 1);
+			if (strlen($firstByte) !== 1) {
+				throw new Exception\Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
+			}
 
-            // The body needs to stay intact, so we copy everything to a
-            // temporary stream.
+			// The body needs to stay intact, so we copy everything to a
+			// temporary stream.
 
-            $newBody = fopen('php://temp', 'r+');
-            fwrite($newBody, $firstByte);
-            stream_copy_to_stream($body, $newBody);
-            rewind($newBody);
+			$newBody = fopen('php://temp', 'r+');
+			fwrite($newBody, $firstByte);
+			stream_copy_to_stream($body, $newBody);
+			rewind($newBody);
 
-            $body = $newBody;
+			$body = $newBody;
 
-        }
+		}
 
-        if ($this->server->tree->nodeExists($path)) {
+		if ($this->server->tree->nodeExists($path)) {
 
-            $node = $this->server->tree->getNodeForPath($path);
+			$node = $this->server->tree->getNodeForPath($path);
 
-            // If the node is a collection, we'll deny it
-            if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
+			// If the node is a collection, we'll deny it
+			if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
 
-            if (!$this->server->updateFile($path, $body, $etag)) {
-                return false;
-            }
+			if (!$this->server->updateFile($path, $body, $etag)) {
+				return false;
+			}
 
-            $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
-            $response->setStatus(204);
+			$response->setHeader('Content-Length', '0');
+			if ($etag) $response->setHeader('ETag', $etag);
+			$response->setStatus(204);
 
-        } else {
+		} else {
 
-            $etag = null;
-            // If we got here, the resource didn't exist yet.
-            if (!$this->server->createFile($path, $body, $etag)) {
-                // For one reason or another the file was not created.
-                return false;
-            }
+			$etag = null;
+			// If we got here, the resource didn't exist yet.
+			if (!$this->server->createFile($path, $body, $etag)) {
+				// For one reason or another the file was not created.
+				return false;
+			}
 
-            $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
-            $response->setStatus(201);
+			$response->setHeader('Content-Length', '0');
+			if ($etag) $response->setHeader('ETag', $etag);
+			$response->setStatus(201);
 
-        }
+		}
 
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
 
-    }
+	}
 
 
-    /**
-     * WebDAV MKCOL
-     *
-     * The MKCOL method is used to create a new collection (directory) on the server
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpMkcol(RequestInterface $request, ResponseInterface $response) {
+	/**
+	 * WebDAV MKCOL
+	 *
+	 * The MKCOL method is used to create a new collection (directory) on the server
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpMkcol(RequestInterface $request, ResponseInterface $response) {
 
-        $requestBody = $request->getBodyAsString();
-        $path = $request->getPath();
+		$requestBody = $request->getBodyAsString();
+		$path = $request->getPath();
 
-        if ($requestBody) {
+		if ($requestBody) {
 
-            $contentType = $request->getHeader('Content-Type');
-            if (strpos($contentType, 'application/xml') !== 0 && strpos($contentType, 'text/xml') !== 0) {
+			$contentType = $request->getHeader('Content-Type');
+			if (strpos($contentType, 'application/xml') !== 0 && strpos($contentType, 'text/xml') !== 0) {
 
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Exception\UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
+				// We must throw 415 for unsupported mkcol bodies
+				throw new Exception\UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
 
-            }
+			}
 
-            try {
-                $mkcol = $this->server->xml->expect('{DAV:}mkcol', $requestBody);
-            } catch (\Sabre\Xml\ParseException $e) {
-                throw new Exception\BadRequest($e->getMessage(), null, $e);
-            }
+			try {
+				$mkcol = $this->server->xml->expect('{DAV:}mkcol', $requestBody);
+			} catch (\Sabre\Xml\ParseException $e) {
+				throw new Exception\BadRequest($e->getMessage(), null, $e);
+			}
 
-            $properties = $mkcol->getProperties();
+			$properties = $mkcol->getProperties();
 
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+			if (!isset($properties['{DAV:}resourcetype']))
+				throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
 
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-            unset($properties['{DAV:}resourcetype']);
+			$resourceType = $properties['{DAV:}resourcetype']->getValue();
+			unset($properties['{DAV:}resourcetype']);
 
-        } else {
+		} else {
 
-            $properties = [];
-            $resourceType = ['{DAV:}collection'];
+			$properties = [];
+			$resourceType = ['{DAV:}collection'];
 
-        }
+		}
 
-        $mkcol = new MkCol($resourceType, $properties);
+		$mkcol = new MkCol($resourceType, $properties);
 
-        $result = $this->server->createCollection($path, $mkcol);
+		$result = $this->server->createCollection($path, $mkcol);
 
-        if (is_array($result)) {
-            $response->setStatus(207);
-            $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		if (is_array($result)) {
+			$response->setStatus(207);
+			$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
 
-            $response->setBody(
-                $this->server->generateMultiStatus([$result])
-            );
+			$response->setBody(
+				$this->server->generateMultiStatus([$result])
+			);
 
-        } else {
-            $response->setHeader('Content-Length', '0');
-            $response->setStatus(201);
-        }
+		} else {
+			$response->setHeader('Content-Length', '0');
+			$response->setStatus(201);
+		}
 
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
 
-    }
+	}
 
-    /**
-     * WebDAV HTTP MOVE method
-     *
-     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpMove(RequestInterface $request, ResponseInterface $response) {
+	/**
+	 * WebDAV HTTP MOVE method
+	 *
+	 * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpMove(RequestInterface $request, ResponseInterface $response) {
 
-        $path = $request->getPath();
+		$path = $request->getPath();
 
-        $moveInfo = $this->server->getCopyAndMoveInfo($request);
+		$moveInfo = $this->server->getCopyAndMoveInfo($request);
 
-        if ($moveInfo['destinationExists']) {
+		if ($moveInfo['destinationExists']) {
 
-            if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) return false;
+			if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) return false;
 
-        }
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
-        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) return false;
-        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
+		}
+		if (!$this->server->emit('beforeUnbind', [$path])) return false;
+		if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) return false;
+		if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
 
-        if ($moveInfo['destinationExists']) {
+		if ($moveInfo['destinationExists']) {
 
-            $this->server->tree->delete($moveInfo['destination']);
-            $this->server->emit('afterUnbind', [$moveInfo['destination']]);
+			$this->server->tree->delete($moveInfo['destination']);
+			$this->server->emit('afterUnbind', [$moveInfo['destination']]);
 
-        }
+		}
 
-        $this->server->tree->move($path, $moveInfo['destination']);
+		$this->server->tree->move($path, $moveInfo['destination']);
 
-        // Its important afterMove is called before afterUnbind, because it
-        // allows systems to transfer data from one path to another.
-        // PropertyStorage uses this. If afterUnbind was first, it would clean
-        // up all the properties before it has a chance.
-        $this->server->emit('afterMove', [$path, $moveInfo['destination']]);
-        $this->server->emit('afterUnbind', [$path]);
-        $this->server->emit('afterBind', [$moveInfo['destination']]);
+		// Its important afterMove is called before afterUnbind, because it
+		// allows systems to transfer data from one path to another.
+		// PropertyStorage uses this. If afterUnbind was first, it would clean
+		// up all the properties before it has a chance.
+		$this->server->emit('afterMove', [$path, $moveInfo['destination']]);
+		$this->server->emit('afterUnbind', [$path]);
+		$this->server->emit('afterBind', [$moveInfo['destination']]);
 
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $response->setHeader('Content-Length', '0');
-        $response->setStatus($moveInfo['destinationExists'] ? 204 : 201);
+		// If a resource was overwritten we should send a 204, otherwise a 201
+		$response->setHeader('Content-Length', '0');
+		$response->setStatus($moveInfo['destinationExists'] ? 204 : 201);
 
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
 
-    }
+	}
 
-    /**
-     * WebDAV HTTP COPY method
-     *
-     * This method copies one uri to a different uri, and works much like the MOVE request
-     * A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpCopy(RequestInterface $request, ResponseInterface $response) {
+	/**
+	 * WebDAV HTTP COPY method
+	 *
+	 * This method copies one uri to a different uri, and works much like the MOVE request
+	 * A lot of the actual request processing is done in getCopyMoveInfo
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpCopy(RequestInterface $request, ResponseInterface $response) {
 
-        $path = $request->getPath();
+		$path = $request->getPath();
 
-        $copyInfo = $this->server->getCopyAndMoveInfo($request);
+		$copyInfo = $this->server->getCopyAndMoveInfo($request);
 
-        if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) return false;
-        if ($copyInfo['destinationExists']) {
-            if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) return false;
-            $this->server->tree->delete($copyInfo['destination']);
-        }
-
-        $this->server->tree->copy($path, $copyInfo['destination']);
-        $this->server->emit('afterBind', [$copyInfo['destination']]);
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $response->setHeader('Content-Length', '0');
-        $response->setStatus($copyInfo['destinationExists'] ? 204 : 201);
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-
-    }
-
-    /**
-     * HTTP REPORT method implementation
-     *
-     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
-     * It's used in a lot of extensions, so it made sense to implement it into the core.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpReport(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        $result = $this->server->xml->parse(
-            $request->getBody(),
-            $request->getUrl(),
-            $rootElementName
-        );
-
-        if ($this->server->emit('report', [$rootElementName, $result, $path])) {
-
-            // If emit returned true, it means the report was not supported
-            throw new Exception\ReportNotSupported();
-
-        }
-
-        // Sending back false will interupt the event chain and tell the server
-        // we've handled this method.
-        return false;
-
-    }
-
-    /**
-     * This method is called during property updates.
-     *
-     * Here we check if a user attempted to update a protected property and
-     * ensure that the process fails if this is the case.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatchProtectedPropertyCheck($path, PropPatch $propPatch) {
-
-        // Comparing the mutation list to the list of propetected properties.
-        $mutations = $propPatch->getMutations();
-
-        $protected = array_intersect(
-            $this->server->protectedProperties,
-            array_keys($mutations)
-        );
-
-        if ($protected) {
-            $propPatch->setResultCode($protected, 403);
-        }
-
-    }
-
-    /**
-     * This method is called during property updates.
-     *
-     * Here we check if a node implements IProperties and let the node handle
-     * updating of (some) properties.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatchNodeUpdate($path, PropPatch $propPatch) {
-
-        // This should trigger a 404 if the node doesn't exist.
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if ($node instanceof IProperties) {
-            $node->propPatch($propPatch);
-        }
-
-    }
-
-    /**
-     * This method is called when properties are retrieved.
-     *
-     * Here we add all the default properties.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        $propFind->handle('{DAV:}getlastmodified', function() use ($node) {
-            $lm = $node->getLastModified();
-            if ($lm) {
-                return new Xml\Property\GetLastModified($lm);
-            }
-        });
-
-        if ($node instanceof IFile) {
-            $propFind->handle('{DAV:}getcontentlength', [$node, 'getSize']);
-            $propFind->handle('{DAV:}getetag', [$node, 'getETag']);
-            $propFind->handle('{DAV:}getcontenttype', [$node, 'getContentType']);
-        }
-
-        if ($node instanceof IQuota) {
-            $quotaInfo = null;
-            $propFind->handle('{DAV:}quota-used-bytes', function() use (&$quotaInfo, $node) {
-                $quotaInfo = $node->getQuotaInfo();
-                return $quotaInfo[0];
-            });
-            $propFind->handle('{DAV:}quota-available-bytes', function() use (&$quotaInfo, $node) {
-                if (!$quotaInfo) {
-                    $quotaInfo = $node->getQuotaInfo();
-                }
-                return $quotaInfo[1];
-            });
-        }
-
-        $propFind->handle('{DAV:}supported-report-set', function() use ($propFind) {
-            $reports = [];
-            foreach ($this->server->getPlugins() as $plugin) {
-                $reports = array_merge($reports, $plugin->getSupportedReportSet($propFind->getPath()));
-            }
-            return new Xml\Property\SupportedReportSet($reports);
-        });
-        $propFind->handle('{DAV:}resourcetype', function() use ($node) {
-            return new Xml\Property\ResourceType($this->server->getResourceTypeForNode($node));
-        });
-        $propFind->handle('{DAV:}supported-method-set', function() use ($propFind) {
-            return new Xml\Property\SupportedMethodSet(
-                $this->server->getAllowedMethods($propFind->getPath())
-            );
-        });
-
-    }
-
-    /**
-     * Fetches properties for a node.
-     *
-     * This event is called a bit later, so plugins have a chance first to
-     * populate the result.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFindNode(PropFind $propFind, INode $node) {
-
-        if ($node instanceof IProperties && $propertyNames = $propFind->get404Properties()) {
-
-            $nodeProperties = $node->getProperties($propertyNames);
-            foreach ($propertyNames as $propertyName) {
-                if (array_key_exists($propertyName, $nodeProperties)) {
-                    $propFind->set($propertyName, $nodeProperties[$propertyName], 200);
-                }
-            }
-
-        }
-
-    }
-
-    /**
-     * This method is called when properties are retrieved.
-     *
-     * This specific handler is called very late in the process, because we
-     * want other systems to first have a chance to handle the properties.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFindLate(PropFind $propFind, INode $node) {
-
-        $propFind->handle('{http://calendarserver.org/ns/}getctag', function() use ($propFind) {
-
-            // If we already have a sync-token from the current propFind
-            // request, we can re-use that.
-            $val = $propFind->get('{http://sabredav.org/ns}sync-token');
-            if ($val) return $val;
-
-            $val = $propFind->get('{DAV:}sync-token');
-            if ($val && is_scalar($val)) {
-                return $val;
-            }
-            if ($val && $val instanceof Xml\Property\Href) {
-                return substr($val->getHref(), strlen(Sync\Plugin::SYNCTOKEN_PREFIX));
-            }
-
-            // If we got here, the earlier two properties may simply not have
-            // been part of the earlier request. We're going to fetch them.
-            $result = $this->server->getProperties($propFind->getPath(), [
-                '{http://sabredav.org/ns}sync-token',
-                '{DAV:}sync-token',
-            ]);
-
-            if (isset($result['{http://sabredav.org/ns}sync-token'])) {
-                return $result['{http://sabredav.org/ns}sync-token'];
-            }
-            if (isset($result['{DAV:}sync-token'])) {
-                $val = $result['{DAV:}sync-token'];
-                if (is_scalar($val)) {
-                    return $val;
-                } elseif ($val instanceof Xml\Property\Href) {
-                    return substr($val->getHref(), strlen(Sync\Plugin::SYNCTOKEN_PREFIX));
-                }
-            }
-
-        });
-
-    }
-
-    /**
-     * 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' => 'The Core plugin provides a lot of the basic functionality required by WebDAV, such as a default implementation for all HTTP and WebDAV methods.',
-            'link'        => null,
-        ];
-
-    }
+		if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) return false;
+		if ($copyInfo['destinationExists']) {
+			if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) return false;
+			$this->server->tree->delete($copyInfo['destination']);
+		}
+
+		$this->server->tree->copy($path, $copyInfo['destination']);
+		$this->server->emit('afterBind', [$copyInfo['destination']]);
+
+		// If a resource was overwritten we should send a 204, otherwise a 201
+		$response->setHeader('Content-Length', '0');
+		$response->setStatus($copyInfo['destinationExists'] ? 204 : 201);
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+
+	}
+
+	/**
+	 * HTTP REPORT method implementation
+	 *
+	 * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
+	 * It's used in a lot of extensions, so it made sense to implement it into the core.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpReport(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		$result = $this->server->xml->parse(
+			$request->getBody(),
+			$request->getUrl(),
+			$rootElementName
+		);
+
+		if ($this->server->emit('report', [$rootElementName, $result, $path])) {
+
+			// If emit returned true, it means the report was not supported
+			throw new Exception\ReportNotSupported();
+
+		}
+
+		// Sending back false will interupt the event chain and tell the server
+		// we've handled this method.
+		return false;
+
+	}
+
+	/**
+	 * This method is called during property updates.
+	 *
+	 * Here we check if a user attempted to update a protected property and
+	 * ensure that the process fails if this is the case.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatchProtectedPropertyCheck($path, PropPatch $propPatch) {
+
+		// Comparing the mutation list to the list of propetected properties.
+		$mutations = $propPatch->getMutations();
+
+		$protected = array_intersect(
+			$this->server->protectedProperties,
+			array_keys($mutations)
+		);
+
+		if ($protected) {
+			$propPatch->setResultCode($protected, 403);
+		}
+
+	}
+
+	/**
+	 * This method is called during property updates.
+	 *
+	 * Here we check if a node implements IProperties and let the node handle
+	 * updating of (some) properties.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatchNodeUpdate($path, PropPatch $propPatch) {
+
+		// This should trigger a 404 if the node doesn't exist.
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if ($node instanceof IProperties) {
+			$node->propPatch($propPatch);
+		}
+
+	}
+
+	/**
+	 * This method is called when properties are retrieved.
+	 *
+	 * Here we add all the default properties.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		$propFind->handle('{DAV:}getlastmodified', function() use ($node) {
+			$lm = $node->getLastModified();
+			if ($lm) {
+				return new Xml\Property\GetLastModified($lm);
+			}
+		});
+
+		if ($node instanceof IFile) {
+			$propFind->handle('{DAV:}getcontentlength', [$node, 'getSize']);
+			$propFind->handle('{DAV:}getetag', [$node, 'getETag']);
+			$propFind->handle('{DAV:}getcontenttype', [$node, 'getContentType']);
+		}
+
+		if ($node instanceof IQuota) {
+			$quotaInfo = null;
+			$propFind->handle('{DAV:}quota-used-bytes', function() use (&$quotaInfo, $node) {
+				$quotaInfo = $node->getQuotaInfo();
+				return $quotaInfo[0];
+			});
+			$propFind->handle('{DAV:}quota-available-bytes', function() use (&$quotaInfo, $node) {
+				if (!$quotaInfo) {
+					$quotaInfo = $node->getQuotaInfo();
+				}
+				return $quotaInfo[1];
+			});
+		}
+
+		$propFind->handle('{DAV:}supported-report-set', function() use ($propFind) {
+			$reports = [];
+			foreach ($this->server->getPlugins() as $plugin) {
+				$reports = array_merge($reports, $plugin->getSupportedReportSet($propFind->getPath()));
+			}
+			return new Xml\Property\SupportedReportSet($reports);
+		});
+		$propFind->handle('{DAV:}resourcetype', function() use ($node) {
+			return new Xml\Property\ResourceType($this->server->getResourceTypeForNode($node));
+		});
+		$propFind->handle('{DAV:}supported-method-set', function() use ($propFind) {
+			return new Xml\Property\SupportedMethodSet(
+				$this->server->getAllowedMethods($propFind->getPath())
+			);
+		});
+
+	}
+
+	/**
+	 * Fetches properties for a node.
+	 *
+	 * This event is called a bit later, so plugins have a chance first to
+	 * populate the result.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFindNode(PropFind $propFind, INode $node) {
+
+		if ($node instanceof IProperties && $propertyNames = $propFind->get404Properties()) {
+
+			$nodeProperties = $node->getProperties($propertyNames);
+			foreach ($propertyNames as $propertyName) {
+				if (array_key_exists($propertyName, $nodeProperties)) {
+					$propFind->set($propertyName, $nodeProperties[$propertyName], 200);
+				}
+			}
+
+		}
+
+	}
+
+	/**
+	 * This method is called when properties are retrieved.
+	 *
+	 * This specific handler is called very late in the process, because we
+	 * want other systems to first have a chance to handle the properties.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFindLate(PropFind $propFind, INode $node) {
+
+		$propFind->handle('{http://calendarserver.org/ns/}getctag', function() use ($propFind) {
+
+			// If we already have a sync-token from the current propFind
+			// request, we can re-use that.
+			$val = $propFind->get('{http://sabredav.org/ns}sync-token');
+			if ($val) return $val;
+
+			$val = $propFind->get('{DAV:}sync-token');
+			if ($val && is_scalar($val)) {
+				return $val;
+			}
+			if ($val && $val instanceof Xml\Property\Href) {
+				return substr($val->getHref(), strlen(Sync\Plugin::SYNCTOKEN_PREFIX));
+			}
+
+			// If we got here, the earlier two properties may simply not have
+			// been part of the earlier request. We're going to fetch them.
+			$result = $this->server->getProperties($propFind->getPath(), [
+				'{http://sabredav.org/ns}sync-token',
+				'{DAV:}sync-token',
+			]);
+
+			if (isset($result['{http://sabredav.org/ns}sync-token'])) {
+				return $result['{http://sabredav.org/ns}sync-token'];
+			}
+			if (isset($result['{DAV:}sync-token'])) {
+				$val = $result['{DAV:}sync-token'];
+				if (is_scalar($val)) {
+					return $val;
+				} elseif ($val instanceof Xml\Property\Href) {
+					return substr($val->getHref(), strlen(Sync\Plugin::SYNCTOKEN_PREFIX));
+				}
+			}
+
+		});
+
+	}
+
+	/**
+	 * 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' => 'The Core plugin provides a lot of the basic functionality required by WebDAV, such as a default implementation for all HTTP and WebDAV methods.',
+			'link'        => null,
+		];
+
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -32,23 +32,23 @@ 
     public function initialize(Server $server) {
 
         $this->server = $server;
-        $server->on('method:GET',       [$this, 'httpGet']);
-        $server->on('method:OPTIONS',   [$this, 'httpOptions']);
-        $server->on('method:HEAD',      [$this, 'httpHead']);
-        $server->on('method:DELETE',    [$this, 'httpDelete']);
-        $server->on('method:PROPFIND',  [$this, 'httpPropFind']);
+        $server->on('method:GET', [$this, 'httpGet']);
+        $server->on('method:OPTIONS', [$this, 'httpOptions']);
+        $server->on('method:HEAD', [$this, 'httpHead']);
+        $server->on('method:DELETE', [$this, 'httpDelete']);
+        $server->on('method:PROPFIND', [$this, 'httpPropFind']);
         $server->on('method:PROPPATCH', [$this, 'httpPropPatch']);
-        $server->on('method:PUT',       [$this, 'httpPut']);
-        $server->on('method:MKCOL',     [$this, 'httpMkcol']);
-        $server->on('method:MOVE',      [$this, 'httpMove']);
-        $server->on('method:COPY',      [$this, 'httpCopy']);
-        $server->on('method:REPORT',    [$this, 'httpReport']);
-
-        $server->on('propPatch',        [$this, 'propPatchProtectedPropertyCheck'], 90);
-        $server->on('propPatch',        [$this, 'propPatchNodeUpdate'], 200);
-        $server->on('propFind',         [$this, 'propFind']);
-        $server->on('propFind',         [$this, 'propFindNode'], 120);
-        $server->on('propFind',         [$this, 'propFindLate'], 200);
+        $server->on('method:PUT', [$this, 'httpPut']);
+        $server->on('method:MKCOL', [$this, 'httpMkcol']);
+        $server->on('method:MOVE', [$this, 'httpMove']);
+        $server->on('method:COPY', [$this, 'httpCopy']);
+        $server->on('method:REPORT', [$this, 'httpReport']);
+
+        $server->on('propPatch', [$this, 'propPatchProtectedPropertyCheck'], 90);
+        $server->on('propPatch', [$this, 'propPatchNodeUpdate'], 200);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('propFind', [$this, 'propFindNode'], 120);
+        $server->on('propFind', [$this, 'propFindLate'], 200);
 
     }
 
@@ -159,7 +159,7 @@ 
             } else {
 
                 $start = $nodeSize - $range[1];
-                $end  = $nodeSize - 1;
+                $end = $nodeSize - 1;
 
                 if ($start < 0) $start = 0;
 
@@ -170,7 +170,7 @@ 
             // if fseek failed.
             if (!stream_get_meta_data($body)['seekable'] || fseek($body, $start, SEEK_SET) === -1) {
                 $consumeBlock = 8192;
-                for ($consumed = 0; $start - $consumed > 0;){
+                for ($consumed = 0; $start - $consumed > 0;) {
                     if (feof($body)) throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
                     $consumed += strlen(fread($body, min($start - $consumed, $consumeBlock)));
                 }
@@ -388,7 +388,7 @@ 
             // multi-status.
             $ok = true;
             foreach ($result as $prop => $code) {
-                if ((int)$code > 299) {
+                if ((int) $code > 299) {
                     $ok = false;
                 }
             }

libraries/SabreDAV/DAV/UUIDUtil.php

Indentation +37 added lines, -37 removed lines

@@ -15,50 +15,50 @@
  */
 class UUIDUtil {
 
-    /**
-     * Returns a pseudo-random v4 UUID
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     * @return string
-     */
-    static function getUUID() {
+	/**
+	 * Returns a pseudo-random v4 UUID
+	 *
+	 * This function is based on a comment by Andrew Moore on php.net
+	 *
+	 * @see http://www.php.net/manual/en/function.uniqid.php#94959
+	 * @return string
+	 */
+	static function getUUID() {
 
-        return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+		return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 
-            // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
 
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
 
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
 
-            // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
-        );
-    }
+			// 48 bits for "node"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
+	}
 
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     * @return bool
-     */
-    static function validateUUID($uuid) {
+	/**
+	 * Checks if a string is a valid UUID.
+	 *
+	 * @param string $uuid
+	 * @return bool
+	 */
+	static function validateUUID($uuid) {
 
-        return preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        ) !== 0;
+		return preg_match(
+			'/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+			$uuid
+		) !== 0;
 
-    }
+	}
 
 }

libraries/SabreDAV/DAV/PropertyStorage/Backend/PDO.php

Braces +3 added lines, -1 removed lines

@@ -201,7 +201,9 @@
 
             // Sanity check. SQL may select too many records, such as records
             // with different cases.
-            if ($row['path'] !== $source && strpos($row['path'], $source . '/') !== 0) continue;
+            if ($row['path'] !== $source && strpos($row['path'], $source . '/') !== 0) {
+            	continue;
+            }
 
             $trailingPart = substr($row['path'], strlen($source) + 1);
             $newPath = $destination;

Indentation +193 added lines, -193 removed lines

@@ -20,198 +20,198 @@
  */
 class PDO implements BackendInterface {
 
-    /**
-     * Value is stored as string.
-     */
-    const VT_STRING = 1;
-
-    /**
-     * Value is stored as XML fragment.
-     */
-    const VT_XML = 2;
-
-    /**
-     * Value is stored as a property object.
-     */
-    const VT_OBJECT = 3;
-
-    /**
-     * PDO
-     *
-     * @var \PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name we'll be using
-     *
-     * @var string
-     */
-    public $tableName = 'propertystorage';
-
-    /**
-     * Creates the PDO property storage engine
-     *
-     * @param \PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * Fetches properties for a path.
-     *
-     * This method received a PropFind object, which contains all the
-     * information about the properties that need to be fetched.
-     *
-     * Ususually you would just want to call 'get404Properties' on this object,
-     * as this will give you the _exact_ list of properties that need to be
-     * fetched, and haven't yet.
-     *
-     * However, you can also support the 'allprops' property here. In that
-     * case, you should check for $propFind->isAllProps().
-     *
-     * @param string $path
-     * @param PropFind $propFind
-     * @return void
-     */
-    public function propFind($path, PropFind $propFind) {
-
-        if (!$propFind->isAllProps() && count($propFind->get404Properties()) === 0) {
-            return;
-        }
-
-        $query = sprintf('SELECT name, value, valuetype FROM %s WHERE path = ?', $this->tableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$path]);
-
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            switch ($row['valuetype']) {
-                case null :
-                case self::VT_STRING :
-                    $propFind->set($row['name'], $row['value']);
-                    break;
-                case self::VT_XML :
-                    $propFind->set($row['name'], new Complex($row['value']));
-                    break;
-                case self::VT_OBJECT :
-                    $propFind->set($row['name'], unserialize($row['value']));
-                    break;
-            }
-        }
-
-    }
-
-    /**
-     * Updates properties for a path
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * Usually you would want to call 'handleRemaining' on this object, to get;
-     * a list of all properties that need to be stored.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, PropPatch $propPatch) {
-
-        $propPatch->handleRemaining(function($properties) use ($path) {
-
-            $updateStmt = $this->pdo->prepare("REPLACE INTO " . $this->tableName . " (path, name, valuetype, value) VALUES (?, ?, ?, ?)");
-            $deleteStmt = $this->pdo->prepare(sprintf("DELETE FROM %s WHERE path = ? && name = ?", $this->tableName));
-
-            foreach ($properties as $name => $value) {
-
-                if (!is_null($value)) {
-                    if (is_scalar($value)) {
-                        $valueType = self::VT_STRING;
-                    } elseif ($value instanceof Complex) {
-                        $valueType = self::VT_XML;
-                        $value = $value->getXml();
-                    } else {
-                        $valueType = self::VT_OBJECT;
-                        $value = serialize($value);
-                    }
-                    $updateStmt->execute([$path, $name, $valueType, $value]);
-                } else {
-                    $deleteStmt->execute([$path, $name]);
-                }
-
-            }
-
-            return true;
-
-        });
-
-    }
-
-    /**
-     * This method is called after a node is deleted.
-     *
-     * This allows a backend to clean up all associated properties.
-     *
-     * The delete method will get called once for the deletion of an entire
-     * tree.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function delete($path) {
-
-        $stmt = $this->pdo->prepare(sprintf("DELETE FROM %s  WHERE path = ? || path LIKE ? ESCAPE '='", $this->tableName));
-        $childPath = strtr(
-            $path,
-            [
-                '=' => '==',
-                '%' => '=%',
-                '_' => '=_'
-            ]
-        ) . '/%';
-
-        $stmt->execute([$path, $childPath]);
-
-    }
-
-    /**
-     * This method is called after a successful MOVE
-     *
-     * This should be used to migrate all properties from one path to another.
-     * Note that entire collections may be moved, so ensure that all properties
-     * for children are also moved along.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function move($source, $destination) {
-
-        // I don't know a way to write this all in a single sql query that's
-        // also compatible across db engines, so we're letting PHP do all the
-        // updates. Much slower, but it should still be pretty fast in most
-        // cases.
-        $select = $this->pdo->prepare(sprintf('SELECT id, path FROM %s WHERE path = ? || path LIKE ?', $this->tableName));
-        $select->execute([$source, $source . '/%']);
-
-        $update = $this->pdo->prepare(sprintf('UPDATE %s SET path = ? WHERE id = ?', $this->tableName));
-        while ($row = $select->fetch(\PDO::FETCH_ASSOC)) {
-
-            // Sanity check. SQL may select too many records, such as records
-            // with different cases.
-            if ($row['path'] !== $source && strpos($row['path'], $source . '/') !== 0) continue;
-
-            $trailingPart = substr($row['path'], strlen($source) + 1);
-            $newPath = $destination;
-            if ($trailingPart) {
-                $newPath .= '/' . $trailingPart;
-            }
-            $update->execute([$newPath, $row['id']]);
-
-        }
-
-    }
+	/**
+	 * Value is stored as string.
+	 */
+	const VT_STRING = 1;
+
+	/**
+	 * Value is stored as XML fragment.
+	 */
+	const VT_XML = 2;
+
+	/**
+	 * Value is stored as a property object.
+	 */
+	const VT_OBJECT = 3;
+
+	/**
+	 * PDO
+	 *
+	 * @var \PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * PDO table name we'll be using
+	 *
+	 * @var string
+	 */
+	public $tableName = 'propertystorage';
+
+	/**
+	 * Creates the PDO property storage engine
+	 *
+	 * @param \PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * Fetches properties for a path.
+	 *
+	 * This method received a PropFind object, which contains all the
+	 * information about the properties that need to be fetched.
+	 *
+	 * Ususually you would just want to call 'get404Properties' on this object,
+	 * as this will give you the _exact_ list of properties that need to be
+	 * fetched, and haven't yet.
+	 *
+	 * However, you can also support the 'allprops' property here. In that
+	 * case, you should check for $propFind->isAllProps().
+	 *
+	 * @param string $path
+	 * @param PropFind $propFind
+	 * @return void
+	 */
+	public function propFind($path, PropFind $propFind) {
+
+		if (!$propFind->isAllProps() && count($propFind->get404Properties()) === 0) {
+			return;
+		}
+
+		$query = sprintf('SELECT name, value, valuetype FROM %s WHERE path = ?', $this->tableName);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$path]);
+
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			switch ($row['valuetype']) {
+				case null :
+				case self::VT_STRING :
+					$propFind->set($row['name'], $row['value']);
+					break;
+				case self::VT_XML :
+					$propFind->set($row['name'], new Complex($row['value']));
+					break;
+				case self::VT_OBJECT :
+					$propFind->set($row['name'], unserialize($row['value']));
+					break;
+			}
+		}
+
+	}
+
+	/**
+	 * Updates properties for a path
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * Usually you would want to call 'handleRemaining' on this object, to get;
+	 * a list of all properties that need to be stored.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, PropPatch $propPatch) {
+
+		$propPatch->handleRemaining(function($properties) use ($path) {
+
+			$updateStmt = $this->pdo->prepare("REPLACE INTO " . $this->tableName . " (path, name, valuetype, value) VALUES (?, ?, ?, ?)");
+			$deleteStmt = $this->pdo->prepare(sprintf("DELETE FROM %s WHERE path = ? && name = ?", $this->tableName));
+
+			foreach ($properties as $name => $value) {
+
+				if (!is_null($value)) {
+					if (is_scalar($value)) {
+						$valueType = self::VT_STRING;
+					} elseif ($value instanceof Complex) {
+						$valueType = self::VT_XML;
+						$value = $value->getXml();
+					} else {
+						$valueType = self::VT_OBJECT;
+						$value = serialize($value);
+					}
+					$updateStmt->execute([$path, $name, $valueType, $value]);
+				} else {
+					$deleteStmt->execute([$path, $name]);
+				}
+
+			}
+
+			return true;
+
+		});
+
+	}
+
+	/**
+	 * This method is called after a node is deleted.
+	 *
+	 * This allows a backend to clean up all associated properties.
+	 *
+	 * The delete method will get called once for the deletion of an entire
+	 * tree.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function delete($path) {
+
+		$stmt = $this->pdo->prepare(sprintf("DELETE FROM %s  WHERE path = ? || path LIKE ? ESCAPE '='", $this->tableName));
+		$childPath = strtr(
+			$path,
+			[
+				'=' => '==',
+				'%' => '=%',
+				'_' => '=_'
+			]
+		) . '/%';
+
+		$stmt->execute([$path, $childPath]);
+
+	}
+
+	/**
+	 * This method is called after a successful MOVE
+	 *
+	 * This should be used to migrate all properties from one path to another.
+	 * Note that entire collections may be moved, so ensure that all properties
+	 * for children are also moved along.
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	public function move($source, $destination) {
+
+		// I don't know a way to write this all in a single sql query that's
+		// also compatible across db engines, so we're letting PHP do all the
+		// updates. Much slower, but it should still be pretty fast in most
+		// cases.
+		$select = $this->pdo->prepare(sprintf('SELECT id, path FROM %s WHERE path = ? || path LIKE ?', $this->tableName));
+		$select->execute([$source, $source . '/%']);
+
+		$update = $this->pdo->prepare(sprintf('UPDATE %s SET path = ? WHERE id = ?', $this->tableName));
+		while ($row = $select->fetch(\PDO::FETCH_ASSOC)) {
+
+			// Sanity check. SQL may select too many records, such as records
+			// with different cases.
+			if ($row['path'] !== $source && strpos($row['path'], $source . '/') !== 0) continue;
+
+			$trailingPart = substr($row['path'], strlen($source) + 1);
+			$newPath = $destination;
+			if ($trailingPart) {
+				$newPath .= '/' . $trailingPart;
+			}
+			$update->execute([$newPath, $row['id']]);
+
+		}
+
+	}
 
 }

libraries/SabreDAV/DAV/Collection.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         foreach ($this->getChildren() as $child) {
 
-            if ($child->getName() === $name) return $child;
+            if ($child->getName() === $name) {
+            	return $child;
+            }
 
         }
         throw new Exception\NotFound('File not found: ' . $name);

Indentation +90 added lines, -90 removed lines

@@ -14,96 +14,96 @@
  */
 abstract class Collection extends Node implements ICollection {
 
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child
-     * nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws Exception\NotFound
-     * @return INode
-     */
-    public function getChild($name) {
-
-        foreach ($this->getChildren() as $child) {
-
-            if ($child->getName() === $name) return $child;
-
-        }
-        throw new Exception\NotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Checks is a child-node exists.
-     *
-     * It is generally a good idea to try and override this. Usually it can be optimized.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-
-            $this->getChild($name);
-            return true;
-
-        } catch (Exception\NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Exception\Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Exception\Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Exception\Forbidden('Permission denied to create directory');
-
-    }
+	/**
+	 * Returns a child object, by its name.
+	 *
+	 * This method makes use of the getChildren method to grab all the child
+	 * nodes, and compares the name.
+	 * Generally its wise to override this, as this can usually be optimized
+	 *
+	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+	 * exist.
+	 *
+	 * @param string $name
+	 * @throws Exception\NotFound
+	 * @return INode
+	 */
+	public function getChild($name) {
+
+		foreach ($this->getChildren() as $child) {
+
+			if ($child->getName() === $name) return $child;
+
+		}
+		throw new Exception\NotFound('File not found: ' . $name);
+
+	}
+
+	/**
+	 * Checks is a child-node exists.
+	 *
+	 * It is generally a good idea to try and override this. Usually it can be optimized.
+	 *
+	 * @param string $name
+	 * @return bool
+	 */
+	public function childExists($name) {
+
+		try {
+
+			$this->getChild($name);
+			return true;
+
+		} catch (Exception\NotFound $e) {
+
+			return false;
+
+		}
+
+	}
+
+	/**
+	 * Creates a new file in the directory
+	 *
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After succesful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
+	 *
+	 * @param string $name Name of the file
+	 * @param resource|string $data Initial payload
+	 * @return null|string
+	 */
+	public function createFile($name, $data = null) {
+
+		throw new Exception\Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+	}
+
+	/**
+	 * Creates a new subdirectory
+	 *
+	 * @param string $name
+	 * @throws Exception\Forbidden
+	 * @return void
+	 */
+	public function createDirectory($name) {
+
+		throw new Exception\Forbidden('Permission denied to create directory');
+
+	}
 
 
 }

libraries/SabreDAV/DAV/Browser/Plugin.php

Spacing +2 added lines, -2 removed lines

@@ -317,7 +317,7 @@ 
 
                 $buttonActions = '';
                 if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+                    $buttonActions = '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
                 }
                 $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
 
@@ -450,7 +450,7 @@ 
 HTML;
 
         // If the path is empty, there's no parent.
-        if ($path)  {
+        if ($path) {
             list($parentUri) = URLUtil::splitPath($path);
             $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
             $html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';

Indentation +723 added lines, -723 removed lines

@@ -23,413 +23,413 @@ 
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * reference to server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * enablePost turns on the 'actions' panel, which allows people to create
-     * folders and upload files straight from a browser.
-     *
-     * @var bool
-     */
-    protected $enablePost = true;
-
-    /**
-     * A list of properties that are usually not interesting. This can cut down
-     * the browser output a bit by removing the properties that most people
-     * will likely not want to see.
-     *
-     * @var array
-     */
-    public $uninterestingProperties = [
-        '{DAV:}supportedlock',
-        '{DAV:}acl-restrictions',
-        '{DAV:}supported-privilege-set',
-        '{DAV:}supported-method-set',
-    ];
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     *
-     * @param bool $enablePost
-     */
-    public function __construct($enablePost = true) {
-
-        $this->enablePost = $enablePost;
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
-        $this->server->on('method:GET', [$this, 'httpGet'], 200);
-        $this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
-        if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
-    }
-
-    /**
-     * This method intercepts GET requests that have ?sabreAction=info
-     * appended to the URL
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGetEarly(RequestInterface $request, ResponseInterface $response) {
-
-        $params = $request->getQueryParameters();
-        if (isset($params['sabreAction']) && $params['sabreAction'] === 'info') {
-            return $this->httpGet($request, $response);
-        }
-
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        // We're not using straight-up $_GET, because we want everything to be
-        // unit testable.
-        $getVars = $request->getQueryParameters();
-
-        // CSP headers
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
-
-        $sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
-
-        switch ($sabreAction) {
-
-            case 'asset' :
-                // Asset handling, such as images
-                $this->serveAsset(isset($getVars['assetName']) ? $getVars['assetName'] : null);
-                return false;
-            default :
-            case 'info' :
-                try {
-                    $this->server->tree->getNodeForPath($request->getPath());
-                } catch (DAV\Exception\NotFound $e) {
-                    // We're simply stopping when the file isn't found to not interfere
-                    // with other plugins.
-                    return;
-                }
-
-                $response->setStatus(200);
-                $response->setHeader('Content-Type', 'text/html; charset=utf-8');
-
-                $response->setBody(
-                    $this->generateDirectoryIndex($request->getPath())
-                );
-
-                return false;
-
-            case 'plugins' :
-                $response->setStatus(200);
-                $response->setHeader('Content-Type', 'text/html; charset=utf-8');
-
-                $response->setBody(
-                    $this->generatePluginListing()
-                );
-
-                return false;
-
-        }
-
-    }
-
-    /**
-     * Handles POST requests for tree operations.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpPOST(RequestInterface $request, ResponseInterface $response) {
-
-        $contentType = $request->getHeader('Content-Type');
-        list($contentType) = explode(';', $contentType);
-        if ($contentType !== 'application/x-www-form-urlencoded' &&
-            $contentType !== 'multipart/form-data') {
-                return;
-        }
-        $postVars = $request->getPostData();
-
-        if (!isset($postVars['sabreAction']))
-            return;
-
-        $uri = $request->getPath();
-
-        if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) {
-
-            switch ($postVars['sabreAction']) {
-
-                case 'mkcol' :
-                    if (isset($postVars['name']) && trim($postVars['name'])) {
-                        // Using basename() because we won't allow slashes
-                        list(, $folderName) = URLUtil::splitPath(trim($postVars['name']));
-
-                        if (isset($postVars['resourceType'])) {
-                            $resourceType = explode(',', $postVars['resourceType']);
-                        } else {
-                            $resourceType = ['{DAV:}collection'];
-                        }
-
-                        $properties = [];
-                        foreach ($postVars as $varName => $varValue) {
-                            // Any _POST variable in clark notation is treated
-                            // like a property.
-                            if ($varName[0] === '{') {
-                                // PHP will convert any dots to underscores.
-                                // This leaves us with no way to differentiate
-                                // the two.
-                                // Therefore we replace the string *DOT* with a
-                                // real dot. * is not allowed in uris so we
-                                // should be good.
-                                $varName = str_replace('*DOT*', '.', $varName);
-                                $properties[$varName] = $varValue;
-                            }
-                        }
-
-                        $mkCol = new MkCol(
-                            $resourceType,
-                            $properties
-                        );
-                        $this->server->createCollection($uri . '/' . $folderName, $mkCol);
-                    }
-                    break;
-
-                // @codeCoverageIgnoreStart
-                case 'put' :
-
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
-
-                    list(, $newName) = URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
-
-                    // Making sure we only have a 'basename' component
-                    list(, $newName) = URLUtil::splitPath($newName);
-
-                    if (is_uploaded_file($file['tmp_name'])) {
-                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'], 'r'));
-                    }
-                    break;
-                // @codeCoverageIgnoreEnd
-
-            }
-
-        }
-        $response->setHeader('Location', $request->getUrl());
-        $response->setStatus(302);
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url
-     *
-     * @param string $path
-     * @return string
-     */
-    public function generateDirectoryIndex($path) {
-
-        $html = $this->generateHeader($path ? $path : '/', $path);
-
-        $node = $this->server->tree->getNodeForPath($path);
-        if ($node instanceof DAV\ICollection) {
-
-            $html .= "<section><h1>Nodes</h1>\n";
-            $html .= "<table class=\"nodeTable\">";
-
-            $subNodes = $this->server->getPropertiesForChildren($path, [
-                '{DAV:}displayname',
-                '{DAV:}resourcetype',
-                '{DAV:}getcontenttype',
-                '{DAV:}getcontentlength',
-                '{DAV:}getlastmodified',
-            ]);
-
-            foreach ($subNodes as $subPath => $subProps) {
-
-                $subNode = $this->server->tree->getNodeForPath($subPath);
-                $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($subPath);
-                list(, $displayPath) = URLUtil::splitPath($subPath);
-
-                $subNodes[$subPath]['subNode'] = $subNode;
-                $subNodes[$subPath]['fullPath'] = $fullPath;
-                $subNodes[$subPath]['displayPath'] = $displayPath;
-            }
-            uasort($subNodes, [$this, 'compareNodes']);
-
-            foreach ($subNodes as $subProps) {
-                $type = [
-                    'string' => 'Unknown',
-                    'icon'   => 'cog',
-                ];
-                if (isset($subProps['{DAV:}resourcetype'])) {
-                    $type = $this->mapResourceType($subProps['{DAV:}resourcetype']->getValue(), $subProps['subNode']);
-                }
-
-                $html .= '<tr>';
-                $html .= '<td class="nameColumn"><a href="' . $this->escapeHTML($subProps['fullPath']) . '"><span class="oi" data-glyph="' . $this->escapeHTML($type['icon']) . '"></span> ' . $this->escapeHTML($subProps['displayPath']) . '</a></td>';
-                $html .= '<td class="typeColumn">' . $this->escapeHTML($type['string']) . '</td>';
-                $html .= '<td>';
-                if (isset($subProps['{DAV:}getcontentlength'])) {
-                    $html .= $this->escapeHTML($subProps['{DAV:}getcontentlength'] . ' bytes');
-                }
-                $html .= '</td><td>';
-                if (isset($subProps['{DAV:}getlastmodified'])) {
-                    $lastMod = $subProps['{DAV:}getlastmodified']->getTime();
-                    $html .= $this->escapeHTML($lastMod->format('F j, Y, g:i a'));
-                }
-                $html .= '</td>';
-
-                $buttonActions = '';
-                if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
-                }
-                $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
-
-                $html .= '<td>' . $buttonActions . '</td>';
-                $html .= '</tr>';
-            }
-
-            $html .= '</table>';
-
-        }
-
-        $html .= "</section>";
-        $html .= "<section><h1>Properties</h1>";
-        $html .= "<table class=\"propTable\">";
-
-        // Allprops request
-        $propFind = new PropFindAll($path);
-        $properties = $this->server->getPropertiesByNode($propFind, $node);
-
-        $properties = $propFind->getResultForMultiStatus()[200];
-
-        foreach ($properties as $propName => $propValue) {
-            if (!in_array($propName, $this->uninterestingProperties)) {
-                $html .= $this->drawPropertyRow($propName, $propValue);
-            }
-
-        }
-
-
-        $html .= "</table>";
-        $html .= "</section>";
-
-        /* Start of generating actions */
-
-        $output = '';
-        if ($this->enablePost) {
-            $this->server->emit('onHTMLActionsPanel', [$node, &$output]);
-        }
-
-        if ($output) {
-
-            $html .= "<section><h1>Actions</h1>";
-            $html .= "<div class=\"actions\">\n";
-            $html .= $output;
-            $html .= "</div>\n";
-            $html .= "</section>\n";
-        }
-
-        $html .= $this->generateFooter();
-
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
-
-        return $html;
-
-    }
-
-    /**
-     * Generates the 'plugins' page.
-     *
-     * @return string
-     */
-    public function generatePluginListing() {
-
-        $html = $this->generateHeader('Plugins');
-
-        $html .= "<section><h1>Plugins</h1>";
-        $html .= "<table class=\"propTable\">";
-        foreach ($this->server->getPlugins() as $plugin) {
-            $info = $plugin->getPluginInfo();
-            $html .= '<tr><th>' . $info['name'] . '</th>';
-            $html .= '<td>' . $info['description'] . '</td>';
-            $html .= '<td>';
-            if (isset($info['link']) && $info['link']) {
-                $html .= '<a href="' . $this->escapeHTML($info['link']) . '"><span class="oi" data-glyph="book"></span></a>';
-            }
-            $html .= '</td></tr>';
-        }
-        $html .= "</table>";
-        $html .= "</section>";
-
-        /* Start of generating actions */
-
-        $html .= $this->generateFooter();
-
-        return $html;
-
-    }
-
-    /**
-     * Generates the first block of HTML, including the <head> tag and page
-     * header.
-     *
-     * Returns footer.
-     *
-     * @param string $title
-     * @param string $path
-     * @return void
-     */
-    public function generateHeader($title, $path = null) {
+	/**
+	 * reference to server class
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * enablePost turns on the 'actions' panel, which allows people to create
+	 * folders and upload files straight from a browser.
+	 *
+	 * @var bool
+	 */
+	protected $enablePost = true;
+
+	/**
+	 * A list of properties that are usually not interesting. This can cut down
+	 * the browser output a bit by removing the properties that most people
+	 * will likely not want to see.
+	 *
+	 * @var array
+	 */
+	public $uninterestingProperties = [
+		'{DAV:}supportedlock',
+		'{DAV:}acl-restrictions',
+		'{DAV:}supported-privilege-set',
+		'{DAV:}supported-method-set',
+	];
+
+	/**
+	 * Creates the object.
+	 *
+	 * By default it will allow file creation and uploads.
+	 * Specify the first argument as false to disable this
+	 *
+	 * @param bool $enablePost
+	 */
+	public function __construct($enablePost = true) {
+
+		$this->enablePost = $enablePost;
+
+	}
+
+	/**
+	 * Initializes the plugin and subscribes to events
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
+		$this->server->on('method:GET', [$this, 'httpGet'], 200);
+		$this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
+		if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
+	}
+
+	/**
+	 * This method intercepts GET requests that have ?sabreAction=info
+	 * appended to the URL
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGetEarly(RequestInterface $request, ResponseInterface $response) {
+
+		$params = $request->getQueryParameters();
+		if (isset($params['sabreAction']) && $params['sabreAction'] === 'info') {
+			return $this->httpGet($request, $response);
+		}
+
+	}
+
+	/**
+	 * This method intercepts GET requests to collections and returns the html
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		// We're not using straight-up $_GET, because we want everything to be
+		// unit testable.
+		$getVars = $request->getQueryParameters();
+
+		// CSP headers
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+
+		$sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
+
+		switch ($sabreAction) {
+
+			case 'asset' :
+				// Asset handling, such as images
+				$this->serveAsset(isset($getVars['assetName']) ? $getVars['assetName'] : null);
+				return false;
+			default :
+			case 'info' :
+				try {
+					$this->server->tree->getNodeForPath($request->getPath());
+				} catch (DAV\Exception\NotFound $e) {
+					// We're simply stopping when the file isn't found to not interfere
+					// with other plugins.
+					return;
+				}
+
+				$response->setStatus(200);
+				$response->setHeader('Content-Type', 'text/html; charset=utf-8');
+
+				$response->setBody(
+					$this->generateDirectoryIndex($request->getPath())
+				);
+
+				return false;
+
+			case 'plugins' :
+				$response->setStatus(200);
+				$response->setHeader('Content-Type', 'text/html; charset=utf-8');
+
+				$response->setBody(
+					$this->generatePluginListing()
+				);
+
+				return false;
+
+		}
+
+	}
+
+	/**
+	 * Handles POST requests for tree operations.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpPOST(RequestInterface $request, ResponseInterface $response) {
+
+		$contentType = $request->getHeader('Content-Type');
+		list($contentType) = explode(';', $contentType);
+		if ($contentType !== 'application/x-www-form-urlencoded' &&
+			$contentType !== 'multipart/form-data') {
+				return;
+		}
+		$postVars = $request->getPostData();
+
+		if (!isset($postVars['sabreAction']))
+			return;
+
+		$uri = $request->getPath();
+
+		if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) {
+
+			switch ($postVars['sabreAction']) {
+
+				case 'mkcol' :
+					if (isset($postVars['name']) && trim($postVars['name'])) {
+						// Using basename() because we won't allow slashes
+						list(, $folderName) = URLUtil::splitPath(trim($postVars['name']));
+
+						if (isset($postVars['resourceType'])) {
+							$resourceType = explode(',', $postVars['resourceType']);
+						} else {
+							$resourceType = ['{DAV:}collection'];
+						}
+
+						$properties = [];
+						foreach ($postVars as $varName => $varValue) {
+							// Any _POST variable in clark notation is treated
+							// like a property.
+							if ($varName[0] === '{') {
+								// PHP will convert any dots to underscores.
+								// This leaves us with no way to differentiate
+								// the two.
+								// Therefore we replace the string *DOT* with a
+								// real dot. * is not allowed in uris so we
+								// should be good.
+								$varName = str_replace('*DOT*', '.', $varName);
+								$properties[$varName] = $varValue;
+							}
+						}
+
+						$mkCol = new MkCol(
+							$resourceType,
+							$properties
+						);
+						$this->server->createCollection($uri . '/' . $folderName, $mkCol);
+					}
+					break;
+
+				// @codeCoverageIgnoreStart
+				case 'put' :
+
+					if ($_FILES) $file = current($_FILES);
+					else break;
+
+					list(, $newName) = URLUtil::splitPath(trim($file['name']));
+					if (isset($postVars['name']) && trim($postVars['name']))
+						$newName = trim($postVars['name']);
+
+					// Making sure we only have a 'basename' component
+					list(, $newName) = URLUtil::splitPath($newName);
+
+					if (is_uploaded_file($file['tmp_name'])) {
+						$this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'], 'r'));
+					}
+					break;
+				// @codeCoverageIgnoreEnd
+
+			}
+
+		}
+		$response->setHeader('Location', $request->getUrl());
+		$response->setStatus(302);
+		return false;
+
+	}
+
+	/**
+	 * Escapes a string for html.
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	public function escapeHTML($value) {
+
+		return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+
+	}
+
+	/**
+	 * Generates the html directory index for a given url
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function generateDirectoryIndex($path) {
+
+		$html = $this->generateHeader($path ? $path : '/', $path);
+
+		$node = $this->server->tree->getNodeForPath($path);
+		if ($node instanceof DAV\ICollection) {
+
+			$html .= "<section><h1>Nodes</h1>\n";
+			$html .= "<table class=\"nodeTable\">";
+
+			$subNodes = $this->server->getPropertiesForChildren($path, [
+				'{DAV:}displayname',
+				'{DAV:}resourcetype',
+				'{DAV:}getcontenttype',
+				'{DAV:}getcontentlength',
+				'{DAV:}getlastmodified',
+			]);
+
+			foreach ($subNodes as $subPath => $subProps) {
+
+				$subNode = $this->server->tree->getNodeForPath($subPath);
+				$fullPath = $this->server->getBaseUri() . URLUtil::encodePath($subPath);
+				list(, $displayPath) = URLUtil::splitPath($subPath);
+
+				$subNodes[$subPath]['subNode'] = $subNode;
+				$subNodes[$subPath]['fullPath'] = $fullPath;
+				$subNodes[$subPath]['displayPath'] = $displayPath;
+			}
+			uasort($subNodes, [$this, 'compareNodes']);
+
+			foreach ($subNodes as $subProps) {
+				$type = [
+					'string' => 'Unknown',
+					'icon'   => 'cog',
+				];
+				if (isset($subProps['{DAV:}resourcetype'])) {
+					$type = $this->mapResourceType($subProps['{DAV:}resourcetype']->getValue(), $subProps['subNode']);
+				}
+
+				$html .= '<tr>';
+				$html .= '<td class="nameColumn"><a href="' . $this->escapeHTML($subProps['fullPath']) . '"><span class="oi" data-glyph="' . $this->escapeHTML($type['icon']) . '"></span> ' . $this->escapeHTML($subProps['displayPath']) . '</a></td>';
+				$html .= '<td class="typeColumn">' . $this->escapeHTML($type['string']) . '</td>';
+				$html .= '<td>';
+				if (isset($subProps['{DAV:}getcontentlength'])) {
+					$html .= $this->escapeHTML($subProps['{DAV:}getcontentlength'] . ' bytes');
+				}
+				$html .= '</td><td>';
+				if (isset($subProps['{DAV:}getlastmodified'])) {
+					$lastMod = $subProps['{DAV:}getlastmodified']->getTime();
+					$html .= $this->escapeHTML($lastMod->format('F j, Y, g:i a'));
+				}
+				$html .= '</td>';
+
+				$buttonActions = '';
+				if ($subProps['subNode'] instanceof DAV\IFile) {
+					$buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+				}
+				$this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
+
+				$html .= '<td>' . $buttonActions . '</td>';
+				$html .= '</tr>';
+			}
+
+			$html .= '</table>';
+
+		}
+
+		$html .= "</section>";
+		$html .= "<section><h1>Properties</h1>";
+		$html .= "<table class=\"propTable\">";
+
+		// Allprops request
+		$propFind = new PropFindAll($path);
+		$properties = $this->server->getPropertiesByNode($propFind, $node);
+
+		$properties = $propFind->getResultForMultiStatus()[200];
+
+		foreach ($properties as $propName => $propValue) {
+			if (!in_array($propName, $this->uninterestingProperties)) {
+				$html .= $this->drawPropertyRow($propName, $propValue);
+			}
+
+		}
+
+
+		$html .= "</table>";
+		$html .= "</section>";
+
+		/* Start of generating actions */
+
+		$output = '';
+		if ($this->enablePost) {
+			$this->server->emit('onHTMLActionsPanel', [$node, &$output]);
+		}
+
+		if ($output) {
+
+			$html .= "<section><h1>Actions</h1>";
+			$html .= "<div class=\"actions\">\n";
+			$html .= $output;
+			$html .= "</div>\n";
+			$html .= "</section>\n";
+		}
+
+		$html .= $this->generateFooter();
+
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+
+		return $html;
+
+	}
+
+	/**
+	 * Generates the 'plugins' page.
+	 *
+	 * @return string
+	 */
+	public function generatePluginListing() {
+
+		$html = $this->generateHeader('Plugins');
+
+		$html .= "<section><h1>Plugins</h1>";
+		$html .= "<table class=\"propTable\">";
+		foreach ($this->server->getPlugins() as $plugin) {
+			$info = $plugin->getPluginInfo();
+			$html .= '<tr><th>' . $info['name'] . '</th>';
+			$html .= '<td>' . $info['description'] . '</td>';
+			$html .= '<td>';
+			if (isset($info['link']) && $info['link']) {
+				$html .= '<a href="' . $this->escapeHTML($info['link']) . '"><span class="oi" data-glyph="book"></span></a>';
+			}
+			$html .= '</td></tr>';
+		}
+		$html .= "</table>";
+		$html .= "</section>";
+
+		/* Start of generating actions */
+
+		$html .= $this->generateFooter();
+
+		return $html;
+
+	}
+
+	/**
+	 * Generates the first block of HTML, including the <head> tag and page
+	 * header.
+	 *
+	 * Returns footer.
+	 *
+	 * @param string $title
+	 * @param string $path
+	 * @return void
+	 */
+	public function generateHeader($title, $path = null) {
 
-        $version = DAV\Version::VERSION;
+		$version = DAV\Version::VERSION;
 
-        $vars = [
-            'title'     => $this->escapeHTML($title),
-            'favicon'   => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
-            'style'     => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
-            'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
-            'logo'      => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
-            'baseUrl'   => $this->server->getBaseUri(),
-        ];
+		$vars = [
+			'title'     => $this->escapeHTML($title),
+			'favicon'   => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
+			'style'     => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
+			'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
+			'logo'      => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
+			'baseUrl'   => $this->server->getBaseUri(),
+		];
 
-        $html = <<<HTML
+		$html = <<<HTML
 <!DOCTYPE html>
 <html>
 <head>
@@ -449,64 +449,64 @@ 
     <nav>
 HTML;
 
-        // If the path is empty, there's no parent.
-        if ($path)  {
-            list($parentUri) = URLUtil::splitPath($path);
-            $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
-            $html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';
-        } else {
-            $html .= '<span class="btn disabled">⇤ Go to parent</span>';
-        }
+		// If the path is empty, there's no parent.
+		if ($path)  {
+			list($parentUri) = URLUtil::splitPath($path);
+			$fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
+			$html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';
+		} else {
+			$html .= '<span class="btn disabled">⇤ Go to parent</span>';
+		}
 
-        $html .= ' <a href="?sabreAction=plugins" class="btn"><span class="oi" data-glyph="puzzle-piece"></span> Plugins</a>';
+		$html .= ' <a href="?sabreAction=plugins" class="btn"><span class="oi" data-glyph="puzzle-piece"></span> Plugins</a>';
 
-        $html .= "</nav>";
+		$html .= "</nav>";
 
-        return $html;
+		return $html;
 
-    }
+	}
 
-    /**
-     * Generates the page footer.
-     *
-     * Returns html.
-     *
-     * @return string
-     */
-    public function generateFooter() {
+	/**
+	 * Generates the page footer.
+	 *
+	 * Returns html.
+	 *
+	 * @return string
+	 */
+	public function generateFooter() {
 
-        $version = DAV\Version::VERSION;
-        return <<<HTML
+		$version = DAV\Version::VERSION;
+		return <<<HTML
 <footer>Generated by SabreDAV $version (c)2007-2015 <a href="http://sabre.io/">http://sabre.io/</a></footer>
 </body>
 </html>
 HTML;
 
-    }
-
-    /**
-     * This method is used to generate the 'actions panel' output for
-     * collections.
-     *
-     * This specifically generates the interfaces for creating new files, and
-     * creating new directories.
-     *
-     * @param DAV\INode $node
-     * @param mixed $output
-     * @return void
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof DAV\ICollection)
-            return;
-
-        // We also know fairly certain that if an object is a non-extended
-        // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
-            return;
-
-        ob_start();
-        echo '<form method="post" action="">
+	}
+
+	/**
+	 * This method is used to generate the 'actions panel' output for
+	 * collections.
+	 *
+	 * This specifically generates the interfaces for creating new files, and
+	 * creating new directories.
+	 *
+	 * @param DAV\INode $node
+	 * @param mixed $output
+	 * @return void
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output) {
+
+		if (!$node instanceof DAV\ICollection)
+			return;
+
+		// We also know fairly certain that if an object is a non-extended
+		// SimpleCollection, we won't need to show the panel either.
+		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
+			return;
+
+		ob_start();
+		echo '<form method="post" action="">
         <h3>Create new folder</h3>
         <input type="hidden" name="sabreAction" value="mkcol" />
         <label>Name:</label> <input type="text" name="name" /><br />
@@ -521,277 +521,277 @@ 
         </form>
         ';
 
-        $output .= ob_get_clean();
-
-    }
-
-    /**
-     * This method takes a path/name of an asset and turns it into url
-     * suiteable for http access.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getAssetUrl($assetName) {
-
-        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
-
-    }
-
-    /**
-     * This method returns a local pathname to an asset.
-     *
-     * @param string $assetName
-     * @return string
-     * @throws DAV\Exception\NotFound
-     */
-    protected function getLocalAssetPath($assetName) {
-
-        $assetDir = __DIR__ . '/assets/';
-        $path = $assetDir . $assetName;
-
-        // Making sure people aren't trying to escape from the base path.
-        $path = str_replace('\\', '/', $path);
-        if (strpos($path, '/../') !== false || strrchr($path, '/') === '/..') {
-            throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
-        }
-        if (strpos(realpath($path), realpath($assetDir)) === 0 && file_exists($path)) {
-            return $path;
-        }
-        throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
-    }
-
-    /**
-     * This method reads an asset from disk and generates a full http response.
-     *
-     * @param string $assetName
-     * @return void
-     */
-    protected function serveAsset($assetName) {
-
-        $assetPath = $this->getLocalAssetPath($assetName);
-
-        // Rudimentary mime type detection
-        $mime = 'application/octet-stream';
-        $map = [
-            'ico'  => 'image/vnd.microsoft.icon',
-            'png'  => 'image/png',
-            'css'  => 'text/css',
-        ];
-
-        $ext = substr($assetName, strrpos($assetName, '.') + 1);
-        if (isset($map[$ext])) {
-            $mime = $map[$ext];
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', $mime);
-        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
-        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setBody(fopen($assetPath, 'r'));
-
-    }
-
-    /**
-     * Sort helper function: compares two directory entries based on type and
-     * display name. Collections sort above other types.
-     *
-     * @param array $a
-     * @param array $b
-     * @return int
-     */
-    protected function compareNodes($a, $b) {
-
-        $typeA = (isset($a['{DAV:}resourcetype']))
-            ? (in_array('{DAV:}collection', $a['{DAV:}resourcetype']->getValue()))
-            : false;
-
-        $typeB = (isset($b['{DAV:}resourcetype']))
-            ? (in_array('{DAV:}collection', $b['{DAV:}resourcetype']->getValue()))
-            : false;
-
-        // If same type, sort alphabetically by filename:
-        if ($typeA === $typeB) {
-            return strnatcasecmp($a['displayPath'], $b['displayPath']);
-        }
-        return (($typeA < $typeB) ? 1 : -1);
-
-    }
-
-    /**
-     * Maps a resource type to a human-readable string and icon.
-     *
-     * @param array $resourceTypes
-     * @param INode $node
-     * @return array
-     */
-    private function mapResourceType(array $resourceTypes, $node) {
-
-        if (!$resourceTypes) {
-            if ($node instanceof DAV\IFile) {
-                return [
-                    'string' => 'File',
-                    'icon'   => 'file',
-                ];
-            } else {
-                return [
-                    'string' => 'Unknown',
-                    'icon'   => 'cog',
-                ];
-            }
-        }
-
-        $types = [
-            '{http://calendarserver.org/ns/}calendar-proxy-write' => [
-                'string' => 'Proxy-Write',
-                'icon'   => 'people',
-            ],
-            '{http://calendarserver.org/ns/}calendar-proxy-read' => [
-                'string' => 'Proxy-Read',
-                'icon'   => 'people',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}schedule-outbox' => [
-                'string' => 'Outbox',
-                'icon'   => 'inbox',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}schedule-inbox' => [
-                'string' => 'Inbox',
-                'icon'   => 'inbox',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}calendar' => [
-                'string' => 'Calendar',
-                'icon'   => 'calendar',
-            ],
-            '{http://calendarserver.org/ns/}shared-owner' => [
-                'string' => 'Shared',
-                'icon'   => 'calendar',
-            ],
-            '{http://calendarserver.org/ns/}subscribed' => [
-                'string' => 'Subscription',
-                'icon'   => 'calendar',
-            ],
-            '{urn:ietf:params:xml:ns:carddav}directory' => [
-                'string' => 'Directory',
-                'icon'   => 'globe',
-            ],
-            '{urn:ietf:params:xml:ns:carddav}addressbook' => [
-                'string' => 'Address book',
-                'icon'   => 'book',
-            ],
-            '{DAV:}principal' => [
-                'string' => 'Principal',
-                'icon'   => 'person',
-            ],
-            '{DAV:}collection' => [
-                'string' => 'Collection',
-                'icon'   => 'folder',
-            ],
-        ];
-
-        $info = [
-            'string' => [],
-            'icon'   => 'cog',
-        ];
-        foreach ($resourceTypes as $k => $resourceType) {
-            if (isset($types[$resourceType])) {
-                $info['string'][] = $types[$resourceType]['string'];
-            } else {
-                $info['string'][] = $resourceType;
-            }
-        }
-        foreach ($types as $key => $resourceInfo) {
-            if (in_array($key, $resourceTypes)) {
-                $info['icon'] = $resourceInfo['icon'];
-                break;
-            }
-        }
-        $info['string'] = implode(', ', $info['string']);
-
-        return $info;
-
-    }
-
-    /**
-     * Draws a table row for a property
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return string
-     */
-    private function drawPropertyRow($name, $value) {
-
-        $html = new HtmlOutputHelper(
-            $this->server->getBaseUri(),
-            $this->server->xml->namespaceMap
-        );
-
-        return "<tr><th>" . $html->xmlName($name) . "</th><td>" . $this->drawPropertyValue($html, $value) . "</td></tr>";
-
-    }
-
-    /**
-     * Draws a table row for a property
-     *
-     * @param HtmlOutputHelper $html
-     * @param mixed $value
-     * @return string
-     */
-    private function drawPropertyValue($html, $value) {
-
-        if (is_scalar($value)) {
-            return $html->h($value);
-        } elseif ($value instanceof HtmlOutput) {
-            return $value->toHtml($html);
-        } elseif ($value instanceof \Sabre\Xml\XmlSerializable) {
-
-            // There's no default html output for this property, we're going
-            // to output the actual xml serialization instead.
-            $xml = $this->server->xml->write('{DAV:}root', $value, $this->server->getBaseUri());
-            // removing first and last line, as they contain our root
-            // element.
-            $xml = explode("\n", $xml);
-            $xml = array_slice($xml, 2, -2);
-            return "<pre>" . $html->h(implode("\n", $xml)) . "</pre>";
-
-        } else {
-            return "<em>unknown</em>";
-        }
-
-    }
-
-    /**
-     * 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 'browser';
-
-    }
-
-    /**
-     * 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' => 'Generates HTML indexes and debug information for your sabre/dav server',
-            'link'        => 'http://sabre.io/dav/browser-plugin/',
-        ];
-
-    }
+		$output .= ob_get_clean();
+
+	}
+
+	/**
+	 * This method takes a path/name of an asset and turns it into url
+	 * suiteable for http access.
+	 *
+	 * @param string $assetName
+	 * @return string
+	 */
+	protected function getAssetUrl($assetName) {
+
+		return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
+
+	}
+
+	/**
+	 * This method returns a local pathname to an asset.
+	 *
+	 * @param string $assetName
+	 * @return string
+	 * @throws DAV\Exception\NotFound
+	 */
+	protected function getLocalAssetPath($assetName) {
+
+		$assetDir = __DIR__ . '/assets/';
+		$path = $assetDir . $assetName;
+
+		// Making sure people aren't trying to escape from the base path.
+		$path = str_replace('\\', '/', $path);
+		if (strpos($path, '/../') !== false || strrchr($path, '/') === '/..') {
+			throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
+		}
+		if (strpos(realpath($path), realpath($assetDir)) === 0 && file_exists($path)) {
+			return $path;
+		}
+		throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
+	}
+
+	/**
+	 * This method reads an asset from disk and generates a full http response.
+	 *
+	 * @param string $assetName
+	 * @return void
+	 */
+	protected function serveAsset($assetName) {
+
+		$assetPath = $this->getLocalAssetPath($assetName);
+
+		// Rudimentary mime type detection
+		$mime = 'application/octet-stream';
+		$map = [
+			'ico'  => 'image/vnd.microsoft.icon',
+			'png'  => 'image/png',
+			'css'  => 'text/css',
+		];
+
+		$ext = substr($assetName, strrpos($assetName, '.') + 1);
+		if (isset($map[$ext])) {
+			$mime = $map[$ext];
+		}
+
+		$this->server->httpResponse->setHeader('Content-Type', $mime);
+		$this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
+		$this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setBody(fopen($assetPath, 'r'));
+
+	}
+
+	/**
+	 * Sort helper function: compares two directory entries based on type and
+	 * display name. Collections sort above other types.
+	 *
+	 * @param array $a
+	 * @param array $b
+	 * @return int
+	 */
+	protected function compareNodes($a, $b) {
+
+		$typeA = (isset($a['{DAV:}resourcetype']))
+			? (in_array('{DAV:}collection', $a['{DAV:}resourcetype']->getValue()))
+			: false;
+
+		$typeB = (isset($b['{DAV:}resourcetype']))
+			? (in_array('{DAV:}collection', $b['{DAV:}resourcetype']->getValue()))
+			: false;
+
+		// If same type, sort alphabetically by filename:
+		if ($typeA === $typeB) {
+			return strnatcasecmp($a['displayPath'], $b['displayPath']);
+		}
+		return (($typeA < $typeB) ? 1 : -1);
+
+	}
+
+	/**
+	 * Maps a resource type to a human-readable string and icon.
+	 *
+	 * @param array $resourceTypes
+	 * @param INode $node
+	 * @return array
+	 */
+	private function mapResourceType(array $resourceTypes, $node) {
+
+		if (!$resourceTypes) {
+			if ($node instanceof DAV\IFile) {
+				return [
+					'string' => 'File',
+					'icon'   => 'file',
+				];
+			} else {
+				return [
+					'string' => 'Unknown',
+					'icon'   => 'cog',
+				];
+			}
+		}
+
+		$types = [
+			'{http://calendarserver.org/ns/}calendar-proxy-write' => [
+				'string' => 'Proxy-Write',
+				'icon'   => 'people',
+			],
+			'{http://calendarserver.org/ns/}calendar-proxy-read' => [
+				'string' => 'Proxy-Read',
+				'icon'   => 'people',
+			],
+			'{urn:ietf:params:xml:ns:caldav}schedule-outbox' => [
+				'string' => 'Outbox',
+				'icon'   => 'inbox',
+			],
+			'{urn:ietf:params:xml:ns:caldav}schedule-inbox' => [
+				'string' => 'Inbox',
+				'icon'   => 'inbox',
+			],
+			'{urn:ietf:params:xml:ns:caldav}calendar' => [
+				'string' => 'Calendar',
+				'icon'   => 'calendar',
+			],
+			'{http://calendarserver.org/ns/}shared-owner' => [
+				'string' => 'Shared',
+				'icon'   => 'calendar',
+			],
+			'{http://calendarserver.org/ns/}subscribed' => [
+				'string' => 'Subscription',
+				'icon'   => 'calendar',
+			],
+			'{urn:ietf:params:xml:ns:carddav}directory' => [
+				'string' => 'Directory',
+				'icon'   => 'globe',
+			],
+			'{urn:ietf:params:xml:ns:carddav}addressbook' => [
+				'string' => 'Address book',
+				'icon'   => 'book',
+			],
+			'{DAV:}principal' => [
+				'string' => 'Principal',
+				'icon'   => 'person',
+			],
+			'{DAV:}collection' => [
+				'string' => 'Collection',
+				'icon'   => 'folder',
+			],
+		];
+
+		$info = [
+			'string' => [],
+			'icon'   => 'cog',
+		];
+		foreach ($resourceTypes as $k => $resourceType) {
+			if (isset($types[$resourceType])) {
+				$info['string'][] = $types[$resourceType]['string'];
+			} else {
+				$info['string'][] = $resourceType;
+			}
+		}
+		foreach ($types as $key => $resourceInfo) {
+			if (in_array($key, $resourceTypes)) {
+				$info['icon'] = $resourceInfo['icon'];
+				break;
+			}
+		}
+		$info['string'] = implode(', ', $info['string']);
+
+		return $info;
+
+	}
+
+	/**
+	 * Draws a table row for a property
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 * @return string
+	 */
+	private function drawPropertyRow($name, $value) {
+
+		$html = new HtmlOutputHelper(
+			$this->server->getBaseUri(),
+			$this->server->xml->namespaceMap
+		);
+
+		return "<tr><th>" . $html->xmlName($name) . "</th><td>" . $this->drawPropertyValue($html, $value) . "</td></tr>";
+
+	}
+
+	/**
+	 * Draws a table row for a property
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @param mixed $value
+	 * @return string
+	 */
+	private function drawPropertyValue($html, $value) {
+
+		if (is_scalar($value)) {
+			return $html->h($value);
+		} elseif ($value instanceof HtmlOutput) {
+			return $value->toHtml($html);
+		} elseif ($value instanceof \Sabre\Xml\XmlSerializable) {
+
+			// There's no default html output for this property, we're going
+			// to output the actual xml serialization instead.
+			$xml = $this->server->xml->write('{DAV:}root', $value, $this->server->getBaseUri());
+			// removing first and last line, as they contain our root
+			// element.
+			$xml = explode("\n", $xml);
+			$xml = array_slice($xml, 2, -2);
+			return "<pre>" . $html->h(implode("\n", $xml)) . "</pre>";
+
+		} else {
+			return "<em>unknown</em>";
+		}
+
+	}
+
+	/**
+	 * 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 'browser';
+
+	}
+
+	/**
+	 * 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' => 'Generates HTML indexes and debug information for your sabre/dav server',
+			'link'        => 'http://sabre.io/dav/browser-plugin/',
+		];
+
+	}
 
 }

Braces +20 added lines, -11 removed lines

@@ -78,7 +78,9 @@ 
         $this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
         $this->server->on('method:GET', [$this, 'httpGet'], 200);
         $this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
-        if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
+        if ($this->enablePost) {
+        	$this->server->on('method:POST', [$this, 'httpPOST']);
+        }
     }
 
     /**
@@ -172,8 +174,9 @@ 
         }
         $postVars = $request->getPostData();
 
-        if (!isset($postVars['sabreAction']))
-            return;
+        if (!isset($postVars['sabreAction'])) {
+                    return;
+        }
 
         $uri = $request->getPath();
 
@@ -219,12 +222,16 @@ 
                 // @codeCoverageIgnoreStart
                 case 'put' :
 
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
+                    if ($_FILES) {
+                    	$file = current($_FILES);
+                    } else {
+                    	break;
+                    }
 
                     list(, $newName) = URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
+                    if (isset($postVars['name']) && trim($postVars['name'])) {
+                                            $newName = trim($postVars['name']);
+                    }
 
                     // Making sure we only have a 'basename' component
                     list(, $newName) = URLUtil::splitPath($newName);
@@ -497,13 +504,15 @@ 
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof DAV\ICollection)
-            return;
+        if (!$node instanceof DAV\ICollection) {
+                    return;
+        }
 
         // We also know fairly certain that if an object is a non-extended
         // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
-            return;
+        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection') {
+                    return;
+        }
 
         ob_start();
         echo '<form method="post" action="">

libraries/SabreDAV/DAV/Xml/Request/PropFind.php

Indentation +60 added lines, -60 removed lines

@@ -19,65 +19,65 @@
  */
 class PropFind implements XmlDeserializable {
 
-    /**
-     * If this is set to true, this was an 'allprop' request.
-     *
-     * @var bool
-     */
-    public $allProp = false;
-
-    /**
-     * The property list
-     *
-     * @var null|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) {
-
-        $self = new self();
-
-        $reader->pushContext();
-        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Element\Elements';
-
-        foreach (KeyValue::xmlDeserialize($reader) as $k => $v) {
-
-            switch ($k) {
-                case '{DAV:}prop' :
-                    $self->properties = $v;
-                    break;
-                case '{DAV:}allprop' :
-                    $self->allProp = true;
-
-            }
-
-        }
-
-        $reader->popContext();
-
-        return $self;
-
-    }
+	/**
+	 * If this is set to true, this was an 'allprop' request.
+	 *
+	 * @var bool
+	 */
+	public $allProp = false;
+
+	/**
+	 * The property list
+	 *
+	 * @var null|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) {
+
+		$self = new self();
+
+		$reader->pushContext();
+		$reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Element\Elements';
+
+		foreach (KeyValue::xmlDeserialize($reader) as $k => $v) {
+
+			switch ($k) {
+				case '{DAV:}prop' :
+					$self->properties = $v;
+					break;
+				case '{DAV:}allprop' :
+					$self->allProp = true;
+
+			}
+
+		}
+
+		$reader->popContext();
+
+		return $self;
+
+	}
 
 }