Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/DAV/FS/Node.php

Indentation +64 added lines, -64 removed lines

@@ -19,78 +19,78 @@
  */
 abstract class Node implements INode
 {
-    /**
-     * The path to the current node.
-     *
-     * @var string
-     */
-    protected $path;
+	/**
+	 * The path to the current node.
+	 *
+	 * @var string
+	 */
+	protected $path;
 
-    /**
-     * The overridden name of the node.
-     *
-     * @var string
-     */
-    protected $overrideName;
+	/**
+	 * The overridden name of the node.
+	 *
+	 * @var string
+	 */
+	protected $overrideName;
 
-    /**
-     * Sets up the node, expects a full path name.
-     *
-     * If $overrideName is set, this node shows up in the tree under a
-     * different name. In this case setName() will be disabled.
-     *
-     * @param string $path
-     * @param string $overrideName
-     */
-    public function __construct($path, $overrideName = null)
-    {
-        $this->path = $path;
-        $this->overrideName = $overrideName;
-    }
+	/**
+	 * Sets up the node, expects a full path name.
+	 *
+	 * If $overrideName is set, this node shows up in the tree under a
+	 * different name. In this case setName() will be disabled.
+	 *
+	 * @param string $path
+	 * @param string $overrideName
+	 */
+	public function __construct($path, $overrideName = null)
+	{
+		$this->path = $path;
+		$this->overrideName = $overrideName;
+	}
 
-    /**
-     * Returns the name of the node.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->overrideName) {
-            return $this->overrideName;
-        }
+	/**
+	 * Returns the name of the node.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		if ($this->overrideName) {
+			return $this->overrideName;
+		}
 
-        list(, $name) = Uri\split($this->path);
+		list(, $name) = Uri\split($this->path);
 
-        return $name;
-    }
+		return $name;
+	}
 
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     */
-    public function setName($name)
-    {
-        if ($this->overrideName) {
-            throw new Forbidden('This node cannot be renamed');
-        }
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 */
+	public function setName($name)
+	{
+		if ($this->overrideName) {
+			throw new Forbidden('This node cannot be renamed');
+		}
 
-        list($parentPath) = Uri\split($this->path);
-        list(, $newName) = Uri\split($name);
+		list($parentPath) = Uri\split($this->path);
+		list(, $newName) = Uri\split($name);
 
-        $newPath = $parentPath.'/'.$newName;
-        rename($this->path, $newPath);
+		$newPath = $parentPath.'/'.$newName;
+		rename($this->path, $newPath);
 
-        $this->path = $newPath;
-    }
+		$this->path = $newPath;
+	}
 
-    /**
-     * Returns the last modification time, as a unix timestamp.
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return filemtime($this->path);
-    }
+	/**
+	 * Returns the last modification time, as a unix timestamp.
+	 *
+	 * @return int
+	 */
+	public function getLastModified()
+	{
+		return filemtime($this->path);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/PropPatch.php

Indentation +284 added lines, -284 removed lines

@@ -21,317 +21,317 @@
  */
 class PropPatch
 {
-    /**
-     * Properties that are being updated.
-     *
-     * This is a key-value list. If the value is null, the property is supposed
-     * to be deleted.
-     *
-     * @var array
-     */
-    protected $mutations;
+	/**
+	 * Properties that are being updated.
+	 *
+	 * This is a key-value list. If the value is null, the property is supposed
+	 * to be deleted.
+	 *
+	 * @var array
+	 */
+	protected $mutations;
 
-    /**
-     * A list of properties and the result of the update. The result is in the
-     * form of a HTTP status code.
-     *
-     * @var array
-     */
-    protected $result = [];
+	/**
+	 * A list of properties and the result of the update. The result is in the
+	 * form of a HTTP status code.
+	 *
+	 * @var array
+	 */
+	protected $result = [];
 
-    /**
-     * This is the list of callbacks when we're performing the actual update.
-     *
-     * @var array
-     */
-    protected $propertyUpdateCallbacks = [];
+	/**
+	 * This is the list of callbacks when we're performing the actual update.
+	 *
+	 * @var array
+	 */
+	protected $propertyUpdateCallbacks = [];
 
-    /**
-     * This property will be set to true if the operation failed.
-     *
-     * @var bool
-     */
-    protected $failed = false;
+	/**
+	 * This property will be set to true if the operation failed.
+	 *
+	 * @var bool
+	 */
+	protected $failed = false;
 
-    /**
-     * Constructor.
-     *
-     * @param array $mutations A list of updates
-     */
-    public function __construct(array $mutations)
-    {
-        $this->mutations = $mutations;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param array $mutations A list of updates
+	 */
+	public function __construct(array $mutations)
+	{
+		$this->mutations = $mutations;
+	}
 
-    /**
-     * Call this function if you wish to handle updating certain properties.
-     * For instance, your class may be responsible for handling updates for the
-     * {DAV:}displayname property.
-     *
-     * In that case, call this method with the first argument
-     * "{DAV:}displayname" and a second argument that's a method that does the
-     * actual updating.
-     *
-     * It's possible to specify more than one property as an array.
-     *
-     * The callback must return a boolean or an it. If the result is true, the
-     * operation was considered successful. If it's false, it's consided
-     * failed.
-     *
-     * If the result is an integer, we'll use that integer as the http status
-     * code associated with the operation.
-     *
-     * @param string|string[] $properties
-     */
-    public function handle($properties, callable $callback)
-    {
-        $usedProperties = [];
-        foreach ((array) $properties as $propertyName) {
-            if (array_key_exists($propertyName, $this->mutations) && !isset($this->result[$propertyName])) {
-                $usedProperties[] = $propertyName;
-                // HTTP Accepted
-                $this->result[$propertyName] = 202;
-            }
-        }
+	/**
+	 * Call this function if you wish to handle updating certain properties.
+	 * For instance, your class may be responsible for handling updates for the
+	 * {DAV:}displayname property.
+	 *
+	 * In that case, call this method with the first argument
+	 * "{DAV:}displayname" and a second argument that's a method that does the
+	 * actual updating.
+	 *
+	 * It's possible to specify more than one property as an array.
+	 *
+	 * The callback must return a boolean or an it. If the result is true, the
+	 * operation was considered successful. If it's false, it's consided
+	 * failed.
+	 *
+	 * If the result is an integer, we'll use that integer as the http status
+	 * code associated with the operation.
+	 *
+	 * @param string|string[] $properties
+	 */
+	public function handle($properties, callable $callback)
+	{
+		$usedProperties = [];
+		foreach ((array) $properties as $propertyName) {
+			if (array_key_exists($propertyName, $this->mutations) && !isset($this->result[$propertyName])) {
+				$usedProperties[] = $propertyName;
+				// HTTP Accepted
+				$this->result[$propertyName] = 202;
+			}
+		}
 
-        // Only registering if there's any unhandled properties.
-        if (!$usedProperties) {
-            return;
-        }
-        $this->propertyUpdateCallbacks[] = [
-            // If the original argument to this method was a string, we need
-            // to also make sure that it stays that way, so the commit function
-            // knows how to format the arguments to the callback.
-            is_string($properties) ? $properties : $usedProperties,
-            $callback,
-        ];
-    }
+		// Only registering if there's any unhandled properties.
+		if (!$usedProperties) {
+			return;
+		}
+		$this->propertyUpdateCallbacks[] = [
+			// If the original argument to this method was a string, we need
+			// to also make sure that it stays that way, so the commit function
+			// knows how to format the arguments to the callback.
+			is_string($properties) ? $properties : $usedProperties,
+			$callback,
+		];
+	}
 
-    /**
-     * Call this function if you wish to handle _all_ properties that haven't
-     * been handled by anything else yet. Note that you effectively claim with
-     * this that you promise to process _all_ properties that are coming in.
-     */
-    public function handleRemaining(callable $callback)
-    {
-        $properties = $this->getRemainingMutations();
-        if (!$properties) {
-            // Nothing to do, don't register callback
-            return;
-        }
+	/**
+	 * Call this function if you wish to handle _all_ properties that haven't
+	 * been handled by anything else yet. Note that you effectively claim with
+	 * this that you promise to process _all_ properties that are coming in.
+	 */
+	public function handleRemaining(callable $callback)
+	{
+		$properties = $this->getRemainingMutations();
+		if (!$properties) {
+			// Nothing to do, don't register callback
+			return;
+		}
 
-        foreach ($properties as $propertyName) {
-            // HTTP Accepted
-            $this->result[$propertyName] = 202;
+		foreach ($properties as $propertyName) {
+			// HTTP Accepted
+			$this->result[$propertyName] = 202;
 
-            $this->propertyUpdateCallbacks[] = [
-                $properties,
-                $callback,
-            ];
-        }
-    }
+			$this->propertyUpdateCallbacks[] = [
+				$properties,
+				$callback,
+			];
+		}
+	}
 
-    /**
-     * Sets the result code for one or more properties.
-     *
-     * @param string|string[] $properties
-     * @param int             $resultCode
-     */
-    public function setResultCode($properties, $resultCode)
-    {
-        foreach ((array) $properties as $propertyName) {
-            $this->result[$propertyName] = $resultCode;
-        }
+	/**
+	 * Sets the result code for one or more properties.
+	 *
+	 * @param string|string[] $properties
+	 * @param int             $resultCode
+	 */
+	public function setResultCode($properties, $resultCode)
+	{
+		foreach ((array) $properties as $propertyName) {
+			$this->result[$propertyName] = $resultCode;
+		}
 
-        if ($resultCode >= 400) {
-            $this->failed = true;
-        }
-    }
+		if ($resultCode >= 400) {
+			$this->failed = true;
+		}
+	}
 
-    /**
-     * Sets the result code for all properties that did not have a result yet.
-     *
-     * @param int $resultCode
-     */
-    public function setRemainingResultCode($resultCode)
-    {
-        $this->setResultCode(
-            $this->getRemainingMutations(),
-            $resultCode
-        );
-    }
+	/**
+	 * Sets the result code for all properties that did not have a result yet.
+	 *
+	 * @param int $resultCode
+	 */
+	public function setRemainingResultCode($resultCode)
+	{
+		$this->setResultCode(
+			$this->getRemainingMutations(),
+			$resultCode
+		);
+	}
 
-    /**
-     * Returns the list of properties that don't have a result code yet.
-     *
-     * This method returns a list of property names, but not its values.
-     *
-     * @return string[]
-     */
-    public function getRemainingMutations()
-    {
-        $remaining = [];
-        foreach ($this->mutations as $propertyName => $propValue) {
-            if (!isset($this->result[$propertyName])) {
-                $remaining[] = $propertyName;
-            }
-        }
+	/**
+	 * Returns the list of properties that don't have a result code yet.
+	 *
+	 * This method returns a list of property names, but not its values.
+	 *
+	 * @return string[]
+	 */
+	public function getRemainingMutations()
+	{
+		$remaining = [];
+		foreach ($this->mutations as $propertyName => $propValue) {
+			if (!isset($this->result[$propertyName])) {
+				$remaining[] = $propertyName;
+			}
+		}
 
-        return $remaining;
-    }
+		return $remaining;
+	}
 
-    /**
-     * Returns the list of properties that don't have a result code yet.
-     *
-     * This method returns list of properties and their values.
-     *
-     * @return array
-     */
-    public function getRemainingValues()
-    {
-        $remaining = [];
-        foreach ($this->mutations as $propertyName => $propValue) {
-            if (!isset($this->result[$propertyName])) {
-                $remaining[$propertyName] = $propValue;
-            }
-        }
+	/**
+	 * Returns the list of properties that don't have a result code yet.
+	 *
+	 * This method returns list of properties and their values.
+	 *
+	 * @return array
+	 */
+	public function getRemainingValues()
+	{
+		$remaining = [];
+		foreach ($this->mutations as $propertyName => $propValue) {
+			if (!isset($this->result[$propertyName])) {
+				$remaining[$propertyName] = $propValue;
+			}
+		}
 
-        return $remaining;
-    }
+		return $remaining;
+	}
 
-    /**
-     * Performs the actual update, and calls all callbacks.
-     *
-     * This method returns true or false depending on if the operation was
-     * successful.
-     *
-     * @return bool
-     */
-    public function commit()
-    {
-        // First we validate if every property has a handler
-        foreach ($this->mutations as $propertyName => $value) {
-            if (!isset($this->result[$propertyName])) {
-                $this->failed = true;
-                $this->result[$propertyName] = 403;
-            }
-        }
+	/**
+	 * Performs the actual update, and calls all callbacks.
+	 *
+	 * This method returns true or false depending on if the operation was
+	 * successful.
+	 *
+	 * @return bool
+	 */
+	public function commit()
+	{
+		// First we validate if every property has a handler
+		foreach ($this->mutations as $propertyName => $value) {
+			if (!isset($this->result[$propertyName])) {
+				$this->failed = true;
+				$this->result[$propertyName] = 403;
+			}
+		}
 
-        foreach ($this->propertyUpdateCallbacks as $callbackInfo) {
-            if ($this->failed) {
-                break;
-            }
-            if (is_string($callbackInfo[0])) {
-                $this->doCallbackSingleProp($callbackInfo[0], $callbackInfo[1]);
-            } else {
-                $this->doCallbackMultiProp($callbackInfo[0], $callbackInfo[1]);
-            }
-        }
+		foreach ($this->propertyUpdateCallbacks as $callbackInfo) {
+			if ($this->failed) {
+				break;
+			}
+			if (is_string($callbackInfo[0])) {
+				$this->doCallbackSingleProp($callbackInfo[0], $callbackInfo[1]);
+			} else {
+				$this->doCallbackMultiProp($callbackInfo[0], $callbackInfo[1]);
+			}
+		}
 
-        /*
+		/*
          * If anywhere in this operation updating a property failed, we must
          * update all other properties accordingly.
          */
-        if ($this->failed) {
-            foreach ($this->result as $propertyName => $status) {
-                if (202 === $status) {
-                    // Failed dependency
-                    $this->result[$propertyName] = 424;
-                }
-            }
-        }
+		if ($this->failed) {
+			foreach ($this->result as $propertyName => $status) {
+				if (202 === $status) {
+					// Failed dependency
+					$this->result[$propertyName] = 424;
+				}
+			}
+		}
 
-        return !$this->failed;
-    }
+		return !$this->failed;
+	}
 
-    /**
-     * Executes a property callback with the single-property syntax.
-     *
-     * @param string $propertyName
-     */
-    private function doCallBackSingleProp($propertyName, callable $callback)
-    {
-        $result = $callback($this->mutations[$propertyName]);
-        if (is_bool($result)) {
-            if ($result) {
-                if (is_null($this->mutations[$propertyName])) {
-                    // Delete
-                    $result = 204;
-                } else {
-                    // Update
-                    $result = 200;
-                }
-            } else {
-                // Fail
-                $result = 403;
-            }
-        }
-        if (!is_int($result)) {
-            throw new UnexpectedValueException('A callback sent to handle() did not return an int or a bool');
-        }
-        $this->result[$propertyName] = $result;
-        if ($result >= 400) {
-            $this->failed = true;
-        }
-    }
+	/**
+	 * Executes a property callback with the single-property syntax.
+	 *
+	 * @param string $propertyName
+	 */
+	private function doCallBackSingleProp($propertyName, callable $callback)
+	{
+		$result = $callback($this->mutations[$propertyName]);
+		if (is_bool($result)) {
+			if ($result) {
+				if (is_null($this->mutations[$propertyName])) {
+					// Delete
+					$result = 204;
+				} else {
+					// Update
+					$result = 200;
+				}
+			} else {
+				// Fail
+				$result = 403;
+			}
+		}
+		if (!is_int($result)) {
+			throw new UnexpectedValueException('A callback sent to handle() did not return an int or a bool');
+		}
+		$this->result[$propertyName] = $result;
+		if ($result >= 400) {
+			$this->failed = true;
+		}
+	}
 
-    /**
-     * Executes a property callback with the multi-property syntax.
-     */
-    private function doCallBackMultiProp(array $propertyList, callable $callback)
-    {
-        $argument = [];
-        foreach ($propertyList as $propertyName) {
-            $argument[$propertyName] = $this->mutations[$propertyName];
-        }
+	/**
+	 * Executes a property callback with the multi-property syntax.
+	 */
+	private function doCallBackMultiProp(array $propertyList, callable $callback)
+	{
+		$argument = [];
+		foreach ($propertyList as $propertyName) {
+			$argument[$propertyName] = $this->mutations[$propertyName];
+		}
 
-        $result = $callback($argument);
+		$result = $callback($argument);
 
-        if (is_array($result)) {
-            foreach ($propertyList as $propertyName) {
-                if (!isset($result[$propertyName])) {
-                    $resultCode = 500;
-                } else {
-                    $resultCode = $result[$propertyName];
-                }
-                if ($resultCode >= 400) {
-                    $this->failed = true;
-                }
-                $this->result[$propertyName] = $resultCode;
-            }
-        } elseif (true === $result) {
-            // Success
-            foreach ($argument as $propertyName => $propertyValue) {
-                $this->result[$propertyName] = is_null($propertyValue) ? 204 : 200;
-            }
-        } elseif (false === $result) {
-            // Fail :(
-            $this->failed = true;
-            foreach ($propertyList as $propertyName) {
-                $this->result[$propertyName] = 403;
-            }
-        } else {
-            throw new UnexpectedValueException('A callback sent to handle() did not return an array or a bool');
-        }
-    }
+		if (is_array($result)) {
+			foreach ($propertyList as $propertyName) {
+				if (!isset($result[$propertyName])) {
+					$resultCode = 500;
+				} else {
+					$resultCode = $result[$propertyName];
+				}
+				if ($resultCode >= 400) {
+					$this->failed = true;
+				}
+				$this->result[$propertyName] = $resultCode;
+			}
+		} elseif (true === $result) {
+			// Success
+			foreach ($argument as $propertyName => $propertyValue) {
+				$this->result[$propertyName] = is_null($propertyValue) ? 204 : 200;
+			}
+		} elseif (false === $result) {
+			// Fail :(
+			$this->failed = true;
+			foreach ($propertyList as $propertyName) {
+				$this->result[$propertyName] = 403;
+			}
+		} else {
+			throw new UnexpectedValueException('A callback sent to handle() did not return an array or a bool');
+		}
+	}
 
-    /**
-     * Returns the result of the operation.
-     *
-     * @return array
-     */
-    public function getResult()
-    {
-        return $this->result;
-    }
+	/**
+	 * Returns the result of the operation.
+	 *
+	 * @return array
+	 */
+	public function getResult()
+	{
+		return $this->result;
+	}
 
-    /**
-     * Returns the full list of mutations.
-     *
-     * @return array
-     */
-    public function getMutations()
-    {
-        return $this->mutations;
-    }
+	/**
+	 * Returns the full list of mutations.
+	 *
+	 * @return array
+	 */
+	public function getMutations()
+	{
+		return $this->mutations;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Exception.php

Indentation +26 added lines, -26 removed lines

@@ -19,32 +19,32 @@
  */
 class Exception extends \Exception
 {
-    /**
-     * Returns the HTTP statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 500;
-    }
+	/**
+	 * Returns the HTTP statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 500;
+	}
 
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response.
-     */
-    public function serialize(Server $server, \DOMElement $errorNode)
-    {
-    }
+	/**
+	 * This method allows the exception to include additional information into the WebDAV error response.
+	 */
+	public function serialize(Server $server, \DOMElement $errorNode)
+	{
+	}
 
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @return array
-     */
-    public function getHTTPHeaders(Server $server)
-    {
-        return [];
-    }
+	/**
+	 * This method allows the exception to return any extra HTTP response headers.
+	 *
+	 * The headers must be returned as an array.
+	 *
+	 * @return array
+	 */
+	public function getHTTPHeaders(Server $server)
+	{
+		return [];
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/MkCol.php

Indentation +41 added lines, -41 removed lines

@@ -24,48 +24,48 @@
  */
 class MkCol extends PropPatch
 {
-    /**
-     * A list of resource-types in clark-notation.
-     *
-     * @var array
-     */
-    protected $resourceType;
+	/**
+	 * A list of resource-types in clark-notation.
+	 *
+	 * @var array
+	 */
+	protected $resourceType;
 
-    /**
-     * Creates the MKCOL object.
-     *
-     * @param string[] $resourceType list of resourcetype values
-     * @param array    $mutations    list of new properties values
-     */
-    public function __construct(array $resourceType, array $mutations)
-    {
-        $this->resourceType = $resourceType;
-        parent::__construct($mutations);
-    }
+	/**
+	 * Creates the MKCOL object.
+	 *
+	 * @param string[] $resourceType list of resourcetype values
+	 * @param array    $mutations    list of new properties values
+	 */
+	public function __construct(array $resourceType, array $mutations)
+	{
+		$this->resourceType = $resourceType;
+		parent::__construct($mutations);
+	}
 
-    /**
-     * Returns the resourcetype of the new collection.
-     *
-     * @return string[]
-     */
-    public function getResourceType()
-    {
-        return $this->resourceType;
-    }
+	/**
+	 * Returns the resourcetype of the new collection.
+	 *
+	 * @return string[]
+	 */
+	public function getResourceType()
+	{
+		return $this->resourceType;
+	}
 
-    /**
-     * Returns true or false if the MKCOL operation has at least the specified
-     * resource type.
-     *
-     * If the resourcetype is specified as an array, all resourcetypes are
-     * checked.
-     *
-     * @param string|string[] $resourceType
-     *
-     * @return bool
-     */
-    public function hasResourceType($resourceType)
-    {
-        return 0 === count(array_diff((array) $resourceType, $this->resourceType));
-    }
+	/**
+	 * Returns true or false if the MKCOL operation has at least the specified
+	 * resource type.
+	 *
+	 * If the resourcetype is specified as an array, all resourcetypes are
+	 * checked.
+	 *
+	 * @param string|string[] $resourceType
+	 *
+	 * @return bool
+	 */
+	public function hasResourceType($resourceType)
+	{
+		return 0 === count(array_diff((array) $resourceType, $this->resourceType));
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/File.php

Indentation +70 added lines, -70 removed lines

@@ -16,78 +16,78 @@
  */
 abstract class File extends Node implements IFile
 {
-    /**
-     * Replaces the contents of the file.
-     *
-     * The data argument is a readable stream resource.
-     *
-     * After a successful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * If you don't plan to store the file byte-by-byte, and you return a
-     * different object on a subsequent GET you are strongly recommended to not
-     * return an ETag, and just return null.
-     *
-     * @param string|resource $data
-     *
-     * @return string|null
-     */
-    public function put($data)
-    {
-        throw new Exception\Forbidden('Permission denied to change data');
-    }
+	/**
+	 * Replaces the contents of the file.
+	 *
+	 * The data argument is a readable stream resource.
+	 *
+	 * After a successful put operation, you may choose to return an ETag. The
+	 * etag must always be surrounded by double-quotes. These quotes must
+	 * appear in the actual string you're returning.
+	 *
+	 * Clients may use the ETag from a PUT request to later on make sure that
+	 * when they update the file, the contents haven't changed in the mean
+	 * time.
+	 *
+	 * If you don't plan to store the file byte-by-byte, and you return a
+	 * different object on a subsequent GET you are strongly recommended to not
+	 * return an ETag, and just return null.
+	 *
+	 * @param string|resource $data
+	 *
+	 * @return string|null
+	 */
+	public function put($data)
+	{
+		throw new Exception\Forbidden('Permission denied to change data');
+	}
 
-    /**
-     * Returns the data.
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get()
-    {
-        throw new Exception\Forbidden('Permission denied to read this file');
-    }
+	/**
+	 * Returns the data.
+	 *
+	 * This method may either return a string or a readable stream resource
+	 *
+	 * @return mixed
+	 */
+	public function get()
+	{
+		throw new Exception\Forbidden('Permission denied to read this file');
+	}
 
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return 0;
-    }
+	/**
+	 * Returns the size of the file, in bytes.
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return 0;
+	}
 
-    /**
-     * Returns the ETag for a file.
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag()
-    {
-        return null;
-    }
+	/**
+	 * Returns the ETag for a file.
+	 *
+	 * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+	 *
+	 * Return null if the ETag can not effectively be determined
+	 *
+	 * @return string|null
+	 */
+	public function getETag()
+	{
+		return null;
+	}
 
-    /**
-     * Returns the mime-type for a file.
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType()
-    {
-        return null;
-    }
+	/**
+	 * Returns the mime-type for a file.
+	 *
+	 * If null is returned, we'll assume application/octet-stream
+	 *
+	 * @return string|null
+	 */
+	public function getContentType()
+	{
+		return null;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Collection.php

Indentation +83 added lines, -83 removed lines

@@ -16,91 +16,91 @@
  */
 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);
-    }
+	/**
+	 * 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);
+	/**
+	 * 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;
-        }
-    }
+			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 successful 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 string|null
-     */
-    public function createFile($name, $data = null)
-    {
-        throw new Exception\Forbidden('Permission denied to create file (filename '.$name.')');
-    }
+	/**
+	 * 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 successful 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 string|null
+	 */
+	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
-     */
-    public function createDirectory($name)
-    {
-        throw new Exception\Forbidden('Permission denied to create directory');
-    }
+	/**
+	 * Creates a new subdirectory.
+	 *
+	 * @param string $name
+	 *
+	 * @throws Exception\Forbidden
+	 */
+	public function createDirectory($name)
+	{
+		throw new Exception\Forbidden('Permission denied to create directory');
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php

Indentation +261 added lines, -261 removed lines

@@ -34,265 +34,265 @@
  */
 class TemporaryFileFilterPlugin extends ServerPlugin
 {
-    /**
-     * This is the list of patterns we intercept.
-     * If new patterns are added, they must be valid patterns for preg_match.
-     *
-     * @var array
-     */
-    public $temporaryFilePatterns = [
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
-        '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
-        '/^~lock.(.*)#$/', // Windows 7 lockfiles
-    ];
-
-    /**
-     * A reference to the main Server class.
-     *
-     * @var \Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * This is the directory where this plugin
-     * will store it's files.
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    /**
-     * Creates the plugin.
-     *
-     * Make sure you specify a directory for your files. If you don't, we
-     * will use PHP's directory for session-storage instead, and you might
-     * not want that.
-     *
-     * @param string|null $dataDir
-     */
-    public function __construct($dataDir = null)
-    {
-        if (!$dataDir) {
-            $dataDir = ini_get('session.save_path').'/sabredav/';
-        }
-        if (!is_dir($dataDir)) {
-            mkdir($dataDir);
-        }
-        $this->dataDir = $dataDir;
-    }
-
-    /**
-     * Initialize the plugin.
-     *
-     * This is called automatically be the Server class after this plugin is
-     * added with Sabre\DAV\Server::addPlugin()
-     */
-    public function initialize(Server $server)
-    {
-        $this->server = $server;
-        $server->on('beforeMethod:*', [$this, 'beforeMethod']);
-        $server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
-    }
-
-    /**
-     * This method is called before any HTTP method handler.
-     *
-     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
-     * filenames that are known to match the 'temporary file' regex.
-     *
-     * @return bool
-     */
-    public function beforeMethod(RequestInterface $request, ResponseInterface $response)
-    {
-        if (!$tempLocation = $this->isTempFile($request->getPath())) {
-            return;
-        }
-
-        switch ($request->getMethod()) {
-            case 'GET':
-                return $this->httpGet($request, $response, $tempLocation);
-            case 'PUT':
-                return $this->httpPut($request, $response, $tempLocation);
-            case 'PROPFIND':
-                return $this->httpPropfind($request, $response, $tempLocation);
-            case 'DELETE':
-                return $this->httpDelete($request, $response, $tempLocation);
-        }
-
-        return;
-    }
-
-    /**
-     * This method is invoked if some subsystem creates a new file.
-     *
-     * This is used to deal with HTTP LOCK requests which create a new
-     * file.
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     *
-     * @return bool
-     */
-    public function beforeCreateFile($uri, $data, ICollection $parent, $modified)
-    {
-        if ($tempPath = $this->isTempFile($uri)) {
-            $hR = $this->server->httpResponse;
-            $hR->setHeader('X-Sabre-Temp', 'true');
-            file_put_contents($tempPath, $data);
-
-            return false;
-        }
-
-        return;
-    }
-
-    /**
-     * This method will check if the url matches the temporary file pattern
-     * if it does, it will return an path based on $this->dataDir for the
-     * temporary file storage.
-     *
-     * @param string $path
-     *
-     * @return bool|string
-     */
-    protected function isTempFile($path)
-    {
-        // We're only interested in the basename.
-        list(, $tempPath) = Uri\split($path);
-
-        if (null === $tempPath) {
-            return false;
-        }
-
-        foreach ($this->temporaryFilePatterns as $tempFile) {
-            if (preg_match($tempFile, $tempPath)) {
-                return $this->getDataDir().'/sabredav_'.md5($path).'.tempfile';
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This method handles the GET method for temporary files.
-     * If the file doesn't exist, it will return false which will kick in
-     * the regular system for the GET method.
-     *
-     * @param string $tempLocation
-     *
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $hR, $tempLocation)
-    {
-        if (!file_exists($tempLocation)) {
-            return;
-        }
-
-        $hR->setHeader('Content-Type', 'application/octet-stream');
-        $hR->setHeader('Content-Length', filesize($tempLocation));
-        $hR->setHeader('X-Sabre-Temp', 'true');
-        $hR->setStatus(200);
-        $hR->setBody(fopen($tempLocation, 'r'));
-
-        return false;
-    }
-
-    /**
-     * This method handles the PUT method.
-     *
-     * @param string $tempLocation
-     *
-     * @return bool
-     */
-    public function httpPut(RequestInterface $request, ResponseInterface $hR, $tempLocation)
-    {
-        $hR->setHeader('X-Sabre-Temp', 'true');
-
-        $newFile = !file_exists($tempLocation);
-
-        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
-            throw new Exception\PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
-        }
-
-        file_put_contents($tempLocation, $this->server->httpRequest->getBody());
-        $hR->setStatus($newFile ? 201 : 200);
-
-        return false;
-    }
-
-    /**
-     * This method handles the DELETE method.
-     *
-     * If the file didn't exist, it will return false, which will make the
-     * standard HTTP DELETE handler kick in.
-     *
-     * @param string $tempLocation
-     *
-     * @return bool
-     */
-    public function httpDelete(RequestInterface $request, ResponseInterface $hR, $tempLocation)
-    {
-        if (!file_exists($tempLocation)) {
-            return;
-        }
-
-        unlink($tempLocation);
-        $hR->setHeader('X-Sabre-Temp', 'true');
-        $hR->setStatus(204);
-
-        return false;
-    }
-
-    /**
-     * This method handles the PROPFIND method.
-     *
-     * It's a very lazy method, it won't bother checking the request body
-     * for which properties were requested, and just sends back a default
-     * set of properties.
-     *
-     * @param string $tempLocation
-     *
-     * @return bool
-     */
-    public function httpPropfind(RequestInterface $request, ResponseInterface $hR, $tempLocation)
-    {
-        if (!file_exists($tempLocation)) {
-            return;
-        }
-
-        $hR->setHeader('X-Sabre-Temp', 'true');
-        $hR->setStatus(207);
-        $hR->setHeader('Content-Type', 'application/xml; charset=utf-8');
-
-        $properties = [
-            'href' => $request->getPath(),
-            200 => [
-                '{DAV:}getlastmodified' => new Xml\Property\GetLastModified(filemtime($tempLocation)),
-                '{DAV:}getcontentlength' => filesize($tempLocation),
-                '{DAV:}resourcetype' => new Xml\Property\ResourceType(null),
-                '{'.Server::NS_SABREDAV.'}tempFile' => true,
-            ],
-        ];
-
-        $data = $this->server->generateMultiStatus([$properties]);
-        $hR->setBody($data);
-
-        return false;
-    }
-
-    /**
-     * This method returns the directory where the temporary files should be stored.
-     *
-     * @return string
-     */
-    protected function getDataDir()
-    {
-        return $this->dataDir;
-    }
+	/**
+	 * This is the list of patterns we intercept.
+	 * If new patterns are added, they must be valid patterns for preg_match.
+	 *
+	 * @var array
+	 */
+	public $temporaryFilePatterns = [
+		'/^\._(.*)$/',     // OS/X resource forks
+		'/^.DS_Store$/',   // OS/X custom folder settings
+		'/^desktop.ini$/', // Windows custom folder settings
+		'/^Thumbs.db$/',   // Windows thumbnail cache
+		'/^.(.*).swp$/',   // ViM temporary files
+		'/^\.dat(.*)$/',   // Smultron seems to create these
+		'/^~lock.(.*)#$/', // Windows 7 lockfiles
+	];
+
+	/**
+	 * A reference to the main Server class.
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * This is the directory where this plugin
+	 * will store it's files.
+	 *
+	 * @var string
+	 */
+	private $dataDir;
+
+	/**
+	 * Creates the plugin.
+	 *
+	 * Make sure you specify a directory for your files. If you don't, we
+	 * will use PHP's directory for session-storage instead, and you might
+	 * not want that.
+	 *
+	 * @param string|null $dataDir
+	 */
+	public function __construct($dataDir = null)
+	{
+		if (!$dataDir) {
+			$dataDir = ini_get('session.save_path').'/sabredav/';
+		}
+		if (!is_dir($dataDir)) {
+			mkdir($dataDir);
+		}
+		$this->dataDir = $dataDir;
+	}
+
+	/**
+	 * Initialize the plugin.
+	 *
+	 * This is called automatically be the Server class after this plugin is
+	 * added with Sabre\DAV\Server::addPlugin()
+	 */
+	public function initialize(Server $server)
+	{
+		$this->server = $server;
+		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
+		$server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
+	}
+
+	/**
+	 * This method is called before any HTTP method handler.
+	 *
+	 * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
+	 * filenames that are known to match the 'temporary file' regex.
+	 *
+	 * @return bool
+	 */
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response)
+	{
+		if (!$tempLocation = $this->isTempFile($request->getPath())) {
+			return;
+		}
+
+		switch ($request->getMethod()) {
+			case 'GET':
+				return $this->httpGet($request, $response, $tempLocation);
+			case 'PUT':
+				return $this->httpPut($request, $response, $tempLocation);
+			case 'PROPFIND':
+				return $this->httpPropfind($request, $response, $tempLocation);
+			case 'DELETE':
+				return $this->httpDelete($request, $response, $tempLocation);
+		}
+
+		return;
+	}
+
+	/**
+	 * This method is invoked if some subsystem creates a new file.
+	 *
+	 * This is used to deal with HTTP LOCK requests which create a new
+	 * file.
+	 *
+	 * @param string   $uri
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 *
+	 * @return bool
+	 */
+	public function beforeCreateFile($uri, $data, ICollection $parent, $modified)
+	{
+		if ($tempPath = $this->isTempFile($uri)) {
+			$hR = $this->server->httpResponse;
+			$hR->setHeader('X-Sabre-Temp', 'true');
+			file_put_contents($tempPath, $data);
+
+			return false;
+		}
+
+		return;
+	}
+
+	/**
+	 * This method will check if the url matches the temporary file pattern
+	 * if it does, it will return an path based on $this->dataDir for the
+	 * temporary file storage.
+	 *
+	 * @param string $path
+	 *
+	 * @return bool|string
+	 */
+	protected function isTempFile($path)
+	{
+		// We're only interested in the basename.
+		list(, $tempPath) = Uri\split($path);
+
+		if (null === $tempPath) {
+			return false;
+		}
+
+		foreach ($this->temporaryFilePatterns as $tempFile) {
+			if (preg_match($tempFile, $tempPath)) {
+				return $this->getDataDir().'/sabredav_'.md5($path).'.tempfile';
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * This method handles the GET method for temporary files.
+	 * If the file doesn't exist, it will return false which will kick in
+	 * the regular system for the GET method.
+	 *
+	 * @param string $tempLocation
+	 *
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $hR, $tempLocation)
+	{
+		if (!file_exists($tempLocation)) {
+			return;
+		}
+
+		$hR->setHeader('Content-Type', 'application/octet-stream');
+		$hR->setHeader('Content-Length', filesize($tempLocation));
+		$hR->setHeader('X-Sabre-Temp', 'true');
+		$hR->setStatus(200);
+		$hR->setBody(fopen($tempLocation, 'r'));
+
+		return false;
+	}
+
+	/**
+	 * This method handles the PUT method.
+	 *
+	 * @param string $tempLocation
+	 *
+	 * @return bool
+	 */
+	public function httpPut(RequestInterface $request, ResponseInterface $hR, $tempLocation)
+	{
+		$hR->setHeader('X-Sabre-Temp', 'true');
+
+		$newFile = !file_exists($tempLocation);
+
+		if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
+			throw new Exception\PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
+		}
+
+		file_put_contents($tempLocation, $this->server->httpRequest->getBody());
+		$hR->setStatus($newFile ? 201 : 200);
+
+		return false;
+	}
+
+	/**
+	 * This method handles the DELETE method.
+	 *
+	 * If the file didn't exist, it will return false, which will make the
+	 * standard HTTP DELETE handler kick in.
+	 *
+	 * @param string $tempLocation
+	 *
+	 * @return bool
+	 */
+	public function httpDelete(RequestInterface $request, ResponseInterface $hR, $tempLocation)
+	{
+		if (!file_exists($tempLocation)) {
+			return;
+		}
+
+		unlink($tempLocation);
+		$hR->setHeader('X-Sabre-Temp', 'true');
+		$hR->setStatus(204);
+
+		return false;
+	}
+
+	/**
+	 * This method handles the PROPFIND method.
+	 *
+	 * It's a very lazy method, it won't bother checking the request body
+	 * for which properties were requested, and just sends back a default
+	 * set of properties.
+	 *
+	 * @param string $tempLocation
+	 *
+	 * @return bool
+	 */
+	public function httpPropfind(RequestInterface $request, ResponseInterface $hR, $tempLocation)
+	{
+		if (!file_exists($tempLocation)) {
+			return;
+		}
+
+		$hR->setHeader('X-Sabre-Temp', 'true');
+		$hR->setStatus(207);
+		$hR->setHeader('Content-Type', 'application/xml; charset=utf-8');
+
+		$properties = [
+			'href' => $request->getPath(),
+			200 => [
+				'{DAV:}getlastmodified' => new Xml\Property\GetLastModified(filemtime($tempLocation)),
+				'{DAV:}getcontentlength' => filesize($tempLocation),
+				'{DAV:}resourcetype' => new Xml\Property\ResourceType(null),
+				'{'.Server::NS_SABREDAV.'}tempFile' => true,
+			],
+		];
+
+		$data = $this->server->generateMultiStatus([$properties]);
+		$hR->setBody($data);
+
+		return false;
+	}
+
+	/**
+	 * This method returns the directory where the temporary files should be stored.
+	 *
+	 * @return string
+	 */
+	protected function getDataDir()
+	{
+		return $this->dataDir;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -41,12 +41,12 @@
      * @var array
      */
     public $temporaryFilePatterns = [
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^\._(.*)$/', // OS/X resource forks
+        '/^.DS_Store$/', // OS/X custom folder settings
         '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^Thumbs.db$/', // Windows thumbnail cache
+        '/^.(.*).swp$/', // ViM temporary files
+        '/^\.dat(.*)$/', // Smultron seems to create these
         '/^~lock.(.*)#$/', // Windows 7 lockfiles
     ];
 

htdocs/includes/sabre/sabre/dav/lib/DAV/Locks/Plugin.php

Indentation +523 added lines, -523 removed lines

@@ -24,527 +24,527 @@
  */
 class Plugin extends DAV\ServerPlugin
 {
-    /**
-     * locksBackend.
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $locksBackend;
-
-    /**
-     * server.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * __construct.
-     */
-    public function __construct(Backend\BackendInterface $locksBackend)
-    {
-        $this->locksBackend = $locksBackend;
-    }
-
-    /**
-     * Initializes the plugin.
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-
-        $this->server->xml->elementMap['{DAV:}lockinfo'] = 'Sabre\\DAV\\Xml\\Request\\Lock';
-
-        $server->on('method:LOCK', [$this, 'httpLock']);
-        $server->on('method:UNLOCK', [$this, 'httpUnlock']);
-        $server->on('validateTokens', [$this, 'validateTokens']);
-        $server->on('propFind', [$this, 'propFind']);
-        $server->on('afterUnbind', [$this, 'afterUnbind']);
-    }
-
-    /**
-     * 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 'locks';
-    }
-
-    /**
-     * This method is called after most properties have been found
-     * it allows us to add in any Lock-related properties.
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $propFind->handle('{DAV:}supportedlock', function () {
-            return new DAV\Xml\Property\SupportedLock();
-        });
-        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
-            return new DAV\Xml\Property\LockDiscovery(
-                $this->getLocks($propFind->getPath())
-            );
-        });
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getHTTPMethods($uri)
-    {
-        return ['LOCK', 'UNLOCK'];
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * In this case this is only the number 2. The 2 in the Dav: header
-     * indicates the server supports locks.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return [2];
-    }
-
-    /**
-     * Returns all lock information on a particular uri.
-     *
-     * This function should return an array with Sabre\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
-     *
-     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
-     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
-     * for any possible locks and return those as well.
-     *
-     * @param string $uri
-     * @param bool   $returnChildLocks
-     *
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks = false)
-    {
-        return $this->locksBackend->getLocks($uri, $returnChildLocks);
-    }
-
-    /**
-     * Locks an uri.
-     *
-     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
-     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
-     * of lock (shared or exclusive) and the owner of the lock
-     *
-     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
-     *
-     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
-     *
-     * @return bool
-     */
-    public function httpLock(RequestInterface $request, ResponseInterface $response)
-    {
-        $uri = $request->getPath();
-
-        $existingLocks = $this->getLocks($uri);
-
-        if ($body = $request->getBodyAsString()) {
-            // This is a new lock request
-
-            $existingLock = null;
-            // Checking if there's already non-shared locks on the uri.
-            foreach ($existingLocks as $existingLock) {
-                if (LockInfo::EXCLUSIVE === $existingLock->scope) {
-                    throw new DAV\Exception\ConflictingLock($existingLock);
-                }
-            }
-
-            $lockInfo = $this->parseLockRequest($body);
-            $lockInfo->depth = $this->server->getHTTPDepth();
-            $lockInfo->uri = $uri;
-            if ($existingLock && LockInfo::SHARED != $lockInfo->scope) {
-                throw new DAV\Exception\ConflictingLock($existingLock);
-            }
-        } else {
-            // Gonna check if this was a lock refresh.
-            $existingLocks = $this->getLocks($uri);
-            $conditions = $this->server->getIfConditions($request);
-            $found = null;
-
-            foreach ($existingLocks as $existingLock) {
-                foreach ($conditions as $condition) {
-                    foreach ($condition['tokens'] as $token) {
-                        if ($token['token'] === 'opaquelocktoken:'.$existingLock->token) {
-                            $found = $existingLock;
-                            break 3;
-                        }
-                    }
-                }
-            }
-
-            // If none were found, this request is in error.
-            if (is_null($found)) {
-                if ($existingLocks) {
-                    throw new DAV\Exception\Locked(reset($existingLocks));
-                } else {
-                    throw new DAV\Exception\BadRequest('An xml body is required for lock requests');
-                }
-            }
-
-            // This must have been a lock refresh
-            $lockInfo = $found;
-
-            // The resource could have been locked through another uri.
-            if ($uri != $lockInfo->uri) {
-                $uri = $lockInfo->uri;
-            }
-        }
-
-        if ($timeout = $this->getTimeoutHeader()) {
-            $lockInfo->timeout = $timeout;
-        }
-
-        $newFile = false;
-
-        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
-        try {
-            $this->server->tree->getNodeForPath($uri);
-
-            // We need to call the beforeWriteContent event for RFC3744
-            // Edit: looks like this is not used, and causing problems now.
-            //
-            // See Issue 222
-            // $this->server->emit('beforeWriteContent',array($uri));
-        } catch (DAV\Exception\NotFound $e) {
-            // It didn't, lets create it
-            $this->server->createFile($uri, fopen('php://memory', 'r'));
-            $newFile = true;
-        }
-
-        $this->lockNode($uri, $lockInfo);
-
-        $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $response->setHeader('Lock-Token', '<opaquelocktoken:'.$lockInfo->token.'>');
-        $response->setStatus($newFile ? 201 : 200);
-        $response->setBody($this->generateLockResponse($lockInfo));
-
-        // Returning false will interrupt the event chain and mark this method
-        // as 'handled'.
-        return false;
-    }
-
-    /**
-     * Unlocks a uri.
-     *
-     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
-     * The server should return 204 (No content) on success
-     */
-    public function httpUnlock(RequestInterface $request, ResponseInterface $response)
-    {
-        $lockToken = $request->getHeader('Lock-Token');
-
-        // If the locktoken header is not supplied, we need to throw a bad request exception
-        if (!$lockToken) {
-            throw new DAV\Exception\BadRequest('No lock token was supplied');
-        }
-        $path = $request->getPath();
-        $locks = $this->getLocks($path);
-
-        // Windows sometimes forgets to include < and > in the Lock-Token
-        // header
-        if ('<' !== $lockToken[0]) {
-            $lockToken = '<'.$lockToken.'>';
-        }
-
-        foreach ($locks as $lock) {
-            if ('<opaquelocktoken:'.$lock->token.'>' == $lockToken) {
-                $this->unlockNode($path, $lock);
-                $response->setHeader('Content-Length', '0');
-                $response->setStatus(204);
-
-                // Returning false will break the method chain, and mark the
-                // method as 'handled'.
-                return false;
-            }
-        }
-
-        // If we got here, it means the locktoken was invalid
-        throw new DAV\Exception\LockTokenMatchesRequestUri();
-    }
-
-    /**
-     * This method is called after a node is deleted.
-     *
-     * We use this event to clean up any locks that still exist on the node.
-     *
-     * @param string $path
-     */
-    public function afterUnbind($path)
-    {
-        $locks = $this->getLocks($path, $includeChildren = true);
-        foreach ($locks as $lock) {
-            // don't delete a lock on a parent dir
-            if (0 !== strpos($lock->uri, $path)) {
-                continue;
-            }
-            $this->unlockNode($path, $lock);
-        }
-    }
-
-    /**
-     * Locks a uri.
-     *
-     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
-     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    public function lockNode($uri, LockInfo $lockInfo)
-    {
-        if (!$this->server->emit('beforeLock', [$uri, $lockInfo])) {
-            return;
-        }
-
-        return $this->locksBackend->lock($uri, $lockInfo);
-    }
-
-    /**
-     * Unlocks a uri.
-     *
-     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    public function unlockNode($uri, LockInfo $lockInfo)
-    {
-        if (!$this->server->emit('beforeUnlock', [$uri, $lockInfo])) {
-            return;
-        }
-
-        return $this->locksBackend->unlock($uri, $lockInfo);
-    }
-
-    /**
-     * Returns the contents of the HTTP Timeout header.
-     *
-     * The method formats the header into an integer.
-     *
-     * @return int
-     */
-    public function getTimeoutHeader()
-    {
-        $header = $this->server->httpRequest->getHeader('Timeout');
-
-        if ($header) {
-            if (0 === stripos($header, 'second-')) {
-                $header = (int) (substr($header, 7));
-            } elseif (0 === stripos($header, 'infinite')) {
-                $header = LockInfo::TIMEOUT_INFINITE;
-            } else {
-                throw new DAV\Exception\BadRequest('Invalid HTTP timeout header');
-            }
-        } else {
-            $header = 0;
-        }
-
-        return $header;
-    }
-
-    /**
-     * Generates the response for successful LOCK requests.
-     *
-     * @return string
-     */
-    protected function generateLockResponse(LockInfo $lockInfo)
-    {
-        return $this->server->xml->write('{DAV:}prop', [
-            '{DAV:}lockdiscovery' => new DAV\Xml\Property\LockDiscovery([$lockInfo]),
-        ], $this->server->getBaseUri());
-    }
-
-    /**
-     * The validateTokens event is triggered before every request.
-     *
-     * It's a moment where this plugin can check all the supplied lock tokens
-     * in the If: header, and check if they are valid.
-     *
-     * In addition, it will also ensure that it checks any missing lokens that
-     * must be present in the request, and reject requests without the proper
-     * tokens.
-     *
-     * @param mixed $conditions
-     */
-    public function validateTokens(RequestInterface $request, &$conditions)
-    {
-        // First we need to gather a list of locks that must be satisfied.
-        $mustLocks = [];
-        $method = $request->getMethod();
-
-        // Methods not in that list are operations that doesn't alter any
-        // resources, and we don't need to check the lock-states for.
-        switch ($method) {
-            case 'DELETE':
-                $mustLocks = array_merge($mustLocks, $this->getLocks(
-                    $request->getPath(),
-                    true
-                ));
-                break;
-            case 'MKCOL':
-            case 'MKCALENDAR':
-            case 'PROPPATCH':
-            case 'PUT':
-            case 'PATCH':
-                $mustLocks = array_merge($mustLocks, $this->getLocks(
-                    $request->getPath(),
-                    false
-                ));
-                break;
-            case 'MOVE':
-                $mustLocks = array_merge($mustLocks, $this->getLocks(
-                    $request->getPath(),
-                    true
-                ));
-                $mustLocks = array_merge($mustLocks, $this->getLocks(
-                    $this->server->calculateUri($request->getHeader('Destination')),
-                    false
-                ));
-                break;
-            case 'COPY':
-                $mustLocks = array_merge($mustLocks, $this->getLocks(
-                    $this->server->calculateUri($request->getHeader('Destination')),
-                    false
-                ));
-                break;
-            case 'LOCK':
-                //Temporary measure.. figure out later why this is needed
-                // Here we basically ignore all incoming tokens...
-                foreach ($conditions as $ii => $condition) {
-                    foreach ($condition['tokens'] as $jj => $token) {
-                        $conditions[$ii]['tokens'][$jj]['validToken'] = true;
-                    }
-                }
-
-                return;
-        }
-
-        // It's possible that there's identical locks, because of shared
-        // parents. We're removing the duplicates here.
-        $tmp = [];
-        foreach ($mustLocks as $lock) {
-            $tmp[$lock->token] = $lock;
-        }
-        $mustLocks = array_values($tmp);
-
-        foreach ($conditions as $kk => $condition) {
-            foreach ($condition['tokens'] as $ii => $token) {
-                // Lock tokens always start with opaquelocktoken:
-                if ('opaquelocktoken:' !== substr($token['token'], 0, 16)) {
-                    continue;
-                }
-
-                $checkToken = substr($token['token'], 16);
-                // Looping through our list with locks.
-                foreach ($mustLocks as $jj => $mustLock) {
-                    if ($mustLock->token == $checkToken) {
-                        // We have a match!
-                        // Removing this one from mustlocks
-                        unset($mustLocks[$jj]);
-
-                        // Marking the condition as valid.
-                        $conditions[$kk]['tokens'][$ii]['validToken'] = true;
-
-                        // Advancing to the next token
-                        continue 2;
-                    }
-                }
-
-                // If we got here, it means that there was a
-                // lock-token, but it was not in 'mustLocks'.
-                //
-                // This is an edge-case, as it could mean that token
-                // was specified with a url that was not 'required' to
-                // check. So we're doing one extra lookup to make sure
-                // we really don't know this token.
-                //
-                // This also gets triggered when the user specified a
-                // lock-token that was expired.
-                $oddLocks = $this->getLocks($condition['uri']);
-                foreach ($oddLocks as $oddLock) {
-                    if ($oddLock->token === $checkToken) {
-                        // We have a hit!
-                        $conditions[$kk]['tokens'][$ii]['validToken'] = true;
-                        continue 2;
-                    }
-                }
-
-                // If we get all the way here, the lock-token was
-                // really unknown.
-            }
-        }
-
-        // If there's any locks left in the 'mustLocks' array, it means that
-        // the resource was locked and we must block it.
-        if ($mustLocks) {
-            throw new DAV\Exception\Locked(reset($mustLocks));
-        }
-    }
-
-    /**
-     * Parses a webdav lock xml body, and returns a new Sabre\DAV\Locks\LockInfo object.
-     *
-     * @param string $body
-     *
-     * @return LockInfo
-     */
-    protected function parseLockRequest($body)
-    {
-        $result = $this->server->xml->expect(
-            '{DAV:}lockinfo',
-            $body
-        );
-
-        $lockInfo = new LockInfo();
-
-        $lockInfo->owner = $result->owner;
-        $lockInfo->token = DAV\UUIDUtil::getUUID();
-        $lockInfo->scope = $result->scope;
-
-        return $lockInfo;
-    }
-
-    /**
-     * 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 locks plugin turns this server into a class-2 WebDAV server and adds support for LOCK and UNLOCK',
-            'link' => 'http://sabre.io/dav/locks/',
-        ];
-    }
+	/**
+	 * locksBackend.
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $locksBackend;
+
+	/**
+	 * server.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * __construct.
+	 */
+	public function __construct(Backend\BackendInterface $locksBackend)
+	{
+		$this->locksBackend = $locksBackend;
+	}
+
+	/**
+	 * Initializes the plugin.
+	 *
+	 * This method is automatically called by the Server class after addPlugin.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+
+		$this->server->xml->elementMap['{DAV:}lockinfo'] = 'Sabre\\DAV\\Xml\\Request\\Lock';
+
+		$server->on('method:LOCK', [$this, 'httpLock']);
+		$server->on('method:UNLOCK', [$this, 'httpUnlock']);
+		$server->on('validateTokens', [$this, 'validateTokens']);
+		$server->on('propFind', [$this, 'propFind']);
+		$server->on('afterUnbind', [$this, 'afterUnbind']);
+	}
+
+	/**
+	 * 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 'locks';
+	}
+
+	/**
+	 * This method is called after most properties have been found
+	 * it allows us to add in any Lock-related properties.
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		$propFind->handle('{DAV:}supportedlock', function () {
+			return new DAV\Xml\Property\SupportedLock();
+		});
+		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+			return new DAV\Xml\Property\LockDiscovery(
+				$this->getLocks($propFind->getPath())
+			);
+		});
+	}
+
+	/**
+	 * Use this method to tell the server this plugin defines additional
+	 * HTTP methods.
+	 *
+	 * This method is passed a uri. It should only return HTTP methods that are
+	 * available for the specified uri.
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getHTTPMethods($uri)
+	{
+		return ['LOCK', 'UNLOCK'];
+	}
+
+	/**
+	 * Returns a list of features for the HTTP OPTIONS Dav: header.
+	 *
+	 * In this case this is only the number 2. The 2 in the Dav: header
+	 * indicates the server supports locks.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return [2];
+	}
+
+	/**
+	 * Returns all lock information on a particular uri.
+	 *
+	 * This function should return an array with Sabre\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
+	 *
+	 * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
+	 * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
+	 * for any possible locks and return those as well.
+	 *
+	 * @param string $uri
+	 * @param bool   $returnChildLocks
+	 *
+	 * @return array
+	 */
+	public function getLocks($uri, $returnChildLocks = false)
+	{
+		return $this->locksBackend->getLocks($uri, $returnChildLocks);
+	}
+
+	/**
+	 * Locks an uri.
+	 *
+	 * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+	 * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
+	 * of lock (shared or exclusive) and the owner of the lock
+	 *
+	 * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+	 *
+	 * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+	 *
+	 * @return bool
+	 */
+	public function httpLock(RequestInterface $request, ResponseInterface $response)
+	{
+		$uri = $request->getPath();
+
+		$existingLocks = $this->getLocks($uri);
+
+		if ($body = $request->getBodyAsString()) {
+			// This is a new lock request
+
+			$existingLock = null;
+			// Checking if there's already non-shared locks on the uri.
+			foreach ($existingLocks as $existingLock) {
+				if (LockInfo::EXCLUSIVE === $existingLock->scope) {
+					throw new DAV\Exception\ConflictingLock($existingLock);
+				}
+			}
+
+			$lockInfo = $this->parseLockRequest($body);
+			$lockInfo->depth = $this->server->getHTTPDepth();
+			$lockInfo->uri = $uri;
+			if ($existingLock && LockInfo::SHARED != $lockInfo->scope) {
+				throw new DAV\Exception\ConflictingLock($existingLock);
+			}
+		} else {
+			// Gonna check if this was a lock refresh.
+			$existingLocks = $this->getLocks($uri);
+			$conditions = $this->server->getIfConditions($request);
+			$found = null;
+
+			foreach ($existingLocks as $existingLock) {
+				foreach ($conditions as $condition) {
+					foreach ($condition['tokens'] as $token) {
+						if ($token['token'] === 'opaquelocktoken:'.$existingLock->token) {
+							$found = $existingLock;
+							break 3;
+						}
+					}
+				}
+			}
+
+			// If none were found, this request is in error.
+			if (is_null($found)) {
+				if ($existingLocks) {
+					throw new DAV\Exception\Locked(reset($existingLocks));
+				} else {
+					throw new DAV\Exception\BadRequest('An xml body is required for lock requests');
+				}
+			}
+
+			// This must have been a lock refresh
+			$lockInfo = $found;
+
+			// The resource could have been locked through another uri.
+			if ($uri != $lockInfo->uri) {
+				$uri = $lockInfo->uri;
+			}
+		}
+
+		if ($timeout = $this->getTimeoutHeader()) {
+			$lockInfo->timeout = $timeout;
+		}
+
+		$newFile = false;
+
+		// If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+		try {
+			$this->server->tree->getNodeForPath($uri);
+
+			// We need to call the beforeWriteContent event for RFC3744
+			// Edit: looks like this is not used, and causing problems now.
+			//
+			// See Issue 222
+			// $this->server->emit('beforeWriteContent',array($uri));
+		} catch (DAV\Exception\NotFound $e) {
+			// It didn't, lets create it
+			$this->server->createFile($uri, fopen('php://memory', 'r'));
+			$newFile = true;
+		}
+
+		$this->lockNode($uri, $lockInfo);
+
+		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$response->setHeader('Lock-Token', '<opaquelocktoken:'.$lockInfo->token.'>');
+		$response->setStatus($newFile ? 201 : 200);
+		$response->setBody($this->generateLockResponse($lockInfo));
+
+		// Returning false will interrupt the event chain and mark this method
+		// as 'handled'.
+		return false;
+	}
+
+	/**
+	 * Unlocks a uri.
+	 *
+	 * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+	 * The server should return 204 (No content) on success
+	 */
+	public function httpUnlock(RequestInterface $request, ResponseInterface $response)
+	{
+		$lockToken = $request->getHeader('Lock-Token');
+
+		// If the locktoken header is not supplied, we need to throw a bad request exception
+		if (!$lockToken) {
+			throw new DAV\Exception\BadRequest('No lock token was supplied');
+		}
+		$path = $request->getPath();
+		$locks = $this->getLocks($path);
+
+		// Windows sometimes forgets to include < and > in the Lock-Token
+		// header
+		if ('<' !== $lockToken[0]) {
+			$lockToken = '<'.$lockToken.'>';
+		}
+
+		foreach ($locks as $lock) {
+			if ('<opaquelocktoken:'.$lock->token.'>' == $lockToken) {
+				$this->unlockNode($path, $lock);
+				$response->setHeader('Content-Length', '0');
+				$response->setStatus(204);
+
+				// Returning false will break the method chain, and mark the
+				// method as 'handled'.
+				return false;
+			}
+		}
+
+		// If we got here, it means the locktoken was invalid
+		throw new DAV\Exception\LockTokenMatchesRequestUri();
+	}
+
+	/**
+	 * This method is called after a node is deleted.
+	 *
+	 * We use this event to clean up any locks that still exist on the node.
+	 *
+	 * @param string $path
+	 */
+	public function afterUnbind($path)
+	{
+		$locks = $this->getLocks($path, $includeChildren = true);
+		foreach ($locks as $lock) {
+			// don't delete a lock on a parent dir
+			if (0 !== strpos($lock->uri, $path)) {
+				continue;
+			}
+			$this->unlockNode($path, $lock);
+		}
+	}
+
+	/**
+	 * Locks a uri.
+	 *
+	 * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+	 * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+	 *
+	 * @param string $uri
+	 *
+	 * @return bool
+	 */
+	public function lockNode($uri, LockInfo $lockInfo)
+	{
+		if (!$this->server->emit('beforeLock', [$uri, $lockInfo])) {
+			return;
+		}
+
+		return $this->locksBackend->lock($uri, $lockInfo);
+	}
+
+	/**
+	 * Unlocks a uri.
+	 *
+	 * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+	 *
+	 * @param string $uri
+	 *
+	 * @return bool
+	 */
+	public function unlockNode($uri, LockInfo $lockInfo)
+	{
+		if (!$this->server->emit('beforeUnlock', [$uri, $lockInfo])) {
+			return;
+		}
+
+		return $this->locksBackend->unlock($uri, $lockInfo);
+	}
+
+	/**
+	 * Returns the contents of the HTTP Timeout header.
+	 *
+	 * The method formats the header into an integer.
+	 *
+	 * @return int
+	 */
+	public function getTimeoutHeader()
+	{
+		$header = $this->server->httpRequest->getHeader('Timeout');
+
+		if ($header) {
+			if (0 === stripos($header, 'second-')) {
+				$header = (int) (substr($header, 7));
+			} elseif (0 === stripos($header, 'infinite')) {
+				$header = LockInfo::TIMEOUT_INFINITE;
+			} else {
+				throw new DAV\Exception\BadRequest('Invalid HTTP timeout header');
+			}
+		} else {
+			$header = 0;
+		}
+
+		return $header;
+	}
+
+	/**
+	 * Generates the response for successful LOCK requests.
+	 *
+	 * @return string
+	 */
+	protected function generateLockResponse(LockInfo $lockInfo)
+	{
+		return $this->server->xml->write('{DAV:}prop', [
+			'{DAV:}lockdiscovery' => new DAV\Xml\Property\LockDiscovery([$lockInfo]),
+		], $this->server->getBaseUri());
+	}
+
+	/**
+	 * The validateTokens event is triggered before every request.
+	 *
+	 * It's a moment where this plugin can check all the supplied lock tokens
+	 * in the If: header, and check if they are valid.
+	 *
+	 * In addition, it will also ensure that it checks any missing lokens that
+	 * must be present in the request, and reject requests without the proper
+	 * tokens.
+	 *
+	 * @param mixed $conditions
+	 */
+	public function validateTokens(RequestInterface $request, &$conditions)
+	{
+		// First we need to gather a list of locks that must be satisfied.
+		$mustLocks = [];
+		$method = $request->getMethod();
+
+		// Methods not in that list are operations that doesn't alter any
+		// resources, and we don't need to check the lock-states for.
+		switch ($method) {
+			case 'DELETE':
+				$mustLocks = array_merge($mustLocks, $this->getLocks(
+					$request->getPath(),
+					true
+				));
+				break;
+			case 'MKCOL':
+			case 'MKCALENDAR':
+			case 'PROPPATCH':
+			case 'PUT':
+			case 'PATCH':
+				$mustLocks = array_merge($mustLocks, $this->getLocks(
+					$request->getPath(),
+					false
+				));
+				break;
+			case 'MOVE':
+				$mustLocks = array_merge($mustLocks, $this->getLocks(
+					$request->getPath(),
+					true
+				));
+				$mustLocks = array_merge($mustLocks, $this->getLocks(
+					$this->server->calculateUri($request->getHeader('Destination')),
+					false
+				));
+				break;
+			case 'COPY':
+				$mustLocks = array_merge($mustLocks, $this->getLocks(
+					$this->server->calculateUri($request->getHeader('Destination')),
+					false
+				));
+				break;
+			case 'LOCK':
+				//Temporary measure.. figure out later why this is needed
+				// Here we basically ignore all incoming tokens...
+				foreach ($conditions as $ii => $condition) {
+					foreach ($condition['tokens'] as $jj => $token) {
+						$conditions[$ii]['tokens'][$jj]['validToken'] = true;
+					}
+				}
+
+				return;
+		}
+
+		// It's possible that there's identical locks, because of shared
+		// parents. We're removing the duplicates here.
+		$tmp = [];
+		foreach ($mustLocks as $lock) {
+			$tmp[$lock->token] = $lock;
+		}
+		$mustLocks = array_values($tmp);
+
+		foreach ($conditions as $kk => $condition) {
+			foreach ($condition['tokens'] as $ii => $token) {
+				// Lock tokens always start with opaquelocktoken:
+				if ('opaquelocktoken:' !== substr($token['token'], 0, 16)) {
+					continue;
+				}
+
+				$checkToken = substr($token['token'], 16);
+				// Looping through our list with locks.
+				foreach ($mustLocks as $jj => $mustLock) {
+					if ($mustLock->token == $checkToken) {
+						// We have a match!
+						// Removing this one from mustlocks
+						unset($mustLocks[$jj]);
+
+						// Marking the condition as valid.
+						$conditions[$kk]['tokens'][$ii]['validToken'] = true;
+
+						// Advancing to the next token
+						continue 2;
+					}
+				}
+
+				// If we got here, it means that there was a
+				// lock-token, but it was not in 'mustLocks'.
+				//
+				// This is an edge-case, as it could mean that token
+				// was specified with a url that was not 'required' to
+				// check. So we're doing one extra lookup to make sure
+				// we really don't know this token.
+				//
+				// This also gets triggered when the user specified a
+				// lock-token that was expired.
+				$oddLocks = $this->getLocks($condition['uri']);
+				foreach ($oddLocks as $oddLock) {
+					if ($oddLock->token === $checkToken) {
+						// We have a hit!
+						$conditions[$kk]['tokens'][$ii]['validToken'] = true;
+						continue 2;
+					}
+				}
+
+				// If we get all the way here, the lock-token was
+				// really unknown.
+			}
+		}
+
+		// If there's any locks left in the 'mustLocks' array, it means that
+		// the resource was locked and we must block it.
+		if ($mustLocks) {
+			throw new DAV\Exception\Locked(reset($mustLocks));
+		}
+	}
+
+	/**
+	 * Parses a webdav lock xml body, and returns a new Sabre\DAV\Locks\LockInfo object.
+	 *
+	 * @param string $body
+	 *
+	 * @return LockInfo
+	 */
+	protected function parseLockRequest($body)
+	{
+		$result = $this->server->xml->expect(
+			'{DAV:}lockinfo',
+			$body
+		);
+
+		$lockInfo = new LockInfo();
+
+		$lockInfo->owner = $result->owner;
+		$lockInfo->token = DAV\UUIDUtil::getUUID();
+		$lockInfo->scope = $result->scope;
+
+		return $lockInfo;
+	}
+
+	/**
+	 * 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 locks plugin turns this server into a class-2 WebDAV server and adds support for LOCK and UNLOCK',
+			'link' => 'http://sabre.io/dav/locks/',
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -83,10 +83,10 @@
      */
     public function propFind(DAV\PropFind $propFind, DAV\INode $node)
     {
-        $propFind->handle('{DAV:}supportedlock', function () {
+        $propFind->handle('{DAV:}supportedlock', function() {
             return new DAV\Xml\Property\SupportedLock();
         });
-        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+        $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
             return new DAV\Xml\Property\LockDiscovery(
                 $this->getLocks($propFind->getPath())
             );

htdocs/includes/sabre/sabre/dav/lib/DAV/Locks/Backend/BackendInterface.php

Indentation +31 added lines, -31 removed lines

@@ -16,37 +16,37 @@
  */
 interface BackendInterface
 {
-    /**
-     * 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);
+	/**
+	 * 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);
 
-    /**
-     * Locks a uri.
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    public function lock($uri, Locks\LockInfo $lockInfo);
+	/**
+	 * Locks a uri.
+	 *
+	 * @param string $uri
+	 *
+	 * @return bool
+	 */
+	public function lock($uri, Locks\LockInfo $lockInfo);
 
-    /**
-     * Removes a lock from a uri.
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    public function unlock($uri, Locks\LockInfo $lockInfo);
+	/**
+	 * Removes a lock from a uri.
+	 *
+	 * @param string $uri
+	 *
+	 * @return bool
+	 */
+	public function unlock($uri, Locks\LockInfo $lockInfo);
 }