Dolibarr / dolibarr

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

Indentation +9 added lines, -9 removed lines

@@ -17,13 +17,13 @@
  */
 class NotFound extends DAV\Exception
 {
-    /**
-     * Returns the HTTP statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 404;
-    }
+	/**
+	 * Returns the HTTP statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 404;
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -18,13 +18,13 @@
  */
 class ServiceUnavailable extends DAV\Exception
 {
-    /**
-     * Returns the HTTP statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 503;
-    }
+	/**
+	 * Returns the HTTP statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 503;
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -18,13 +18,13 @@
  */
 class UnsupportedMediaType extends DAV\Exception
 {
-    /**
-     * returns the http statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 415;
-    }
+	/**
+	 * returns the http statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 415;
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -18,13 +18,13 @@
  */
 class NotAuthenticated extends DAV\Exception
 {
-    /**
-     * Returns the HTTP statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 401;
-    }
+	/**
+	 * Returns the HTTP statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 401;
+	}
 }

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

Indentation +40 added lines, -40 removed lines

@@ -19,47 +19,47 @@
  */
 class PreconditionFailed extends DAV\Exception
 {
-    /**
-     * When this exception is thrown, the header-name might be set.
-     *
-     * This allows the exception-catching code to determine which HTTP header
-     * caused the exception.
-     *
-     * @var string
-     */
-    public $header = null;
+	/**
+	 * When this exception is thrown, the header-name might be set.
+	 *
+	 * This allows the exception-catching code to determine which HTTP header
+	 * caused the exception.
+	 *
+	 * @var string
+	 */
+	public $header = null;
 
-    /**
-     * Create the exception.
-     *
-     * @param string $message
-     * @param string $header
-     */
-    public function __construct($message, $header = null)
-    {
-        parent::__construct($message);
-        $this->header = $header;
-    }
+	/**
+	 * Create the exception.
+	 *
+	 * @param string $message
+	 * @param string $header
+	 */
+	public function __construct($message, $header = null)
+	{
+		parent::__construct($message);
+		$this->header = $header;
+	}
 
-    /**
-     * Returns the HTTP statuscode for this exception.
-     *
-     * @return int
-     */
-    public function getHTTPCode()
-    {
-        return 412;
-    }
+	/**
+	 * Returns the HTTP statuscode for this exception.
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode()
+	{
+		return 412;
+	}
 
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response.
-     */
-    public function serialize(DAV\Server $server, \DOMElement $errorNode)
-    {
-        if ($this->header) {
-            $prop = $errorNode->ownerDocument->createElement('s:header');
-            $prop->nodeValue = $this->header;
-            $errorNode->appendChild($prop);
-        }
-    }
+	/**
+	 * This method allows the exception to include additional information into the WebDAV error response.
+	 */
+	public function serialize(DAV\Server $server, \DOMElement $errorNode)
+	{
+		if ($this->header) {
+			$prop = $errorNode->ownerDocument->createElement('s:header');
+			$prop->nodeValue = $this->header;
+			$errorNode->appendChild($prop);
+		}
+	}
 }

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

Indentation +31 added lines, -31 removed lines

@@ -15,37 +15,37 @@
  */
 abstract class Node implements INode
 {
-    /**
-     * Returns the last modification time as a unix timestamp.
-     *
-     * If the information is not available, return null.
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return null;
-    }
+	/**
+	 * Returns the last modification time as a unix timestamp.
+	 *
+	 * If the information is not available, return null.
+	 *
+	 * @return int
+	 */
+	public function getLastModified()
+	{
+		return null;
+	}
 
-    /**
-     * Deletes the current node.
-     *
-     * @throws Exception\Forbidden
-     */
-    public function delete()
-    {
-        throw new Exception\Forbidden('Permission denied to delete node');
-    }
+	/**
+	 * Deletes the current node.
+	 *
+	 * @throws Exception\Forbidden
+	 */
+	public function delete()
+	{
+		throw new Exception\Forbidden('Permission denied to delete node');
+	}
 
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     *
-     * @throws Exception\Forbidden
-     */
-    public function setName($name)
-    {
-        throw new Exception\Forbidden('Permission denied to rename file');
-    }
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 *
+	 * @throws Exception\Forbidden
+	 */
+	public function setName($name)
+	{
+		throw new Exception\Forbidden('Permission denied to rename file');
+	}
 }

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

Indentation +294 added lines, -294 removed lines

@@ -12,324 +12,324 @@
  */
 class PropFind
 {
-    /**
-     * A normal propfind.
-     */
-    const NORMAL = 0;
+	/**
+	 * A normal propfind.
+	 */
+	const NORMAL = 0;
 
-    /**
-     * An allprops request.
-     *
-     * While this was originally intended for instructing the server to really
-     * fetch every property, because it was used so often and it's so heavy
-     * this turned into a small list of default properties after a while.
-     *
-     * So 'all properties' now means a hardcoded list.
-     */
-    const ALLPROPS = 1;
+	/**
+	 * An allprops request.
+	 *
+	 * While this was originally intended for instructing the server to really
+	 * fetch every property, because it was used so often and it's so heavy
+	 * this turned into a small list of default properties after a while.
+	 *
+	 * So 'all properties' now means a hardcoded list.
+	 */
+	const ALLPROPS = 1;
 
-    /**
-     * A propname request. This just returns a list of properties that are
-     * defined on a node, without their values.
-     */
-    const PROPNAME = 2;
+	/**
+	 * A propname request. This just returns a list of properties that are
+	 * defined on a node, without their values.
+	 */
+	const PROPNAME = 2;
 
-    /**
-     * Creates the PROPFIND object.
-     *
-     * @param string $path
-     * @param int    $depth
-     * @param int    $requestType
-     */
-    public function __construct($path, array $properties, $depth = 0, $requestType = self::NORMAL)
-    {
-        $this->path = $path;
-        $this->properties = $properties;
-        $this->depth = $depth;
-        $this->requestType = $requestType;
+	/**
+	 * Creates the PROPFIND object.
+	 *
+	 * @param string $path
+	 * @param int    $depth
+	 * @param int    $requestType
+	 */
+	public function __construct($path, array $properties, $depth = 0, $requestType = self::NORMAL)
+	{
+		$this->path = $path;
+		$this->properties = $properties;
+		$this->depth = $depth;
+		$this->requestType = $requestType;
 
-        if (self::ALLPROPS === $requestType) {
-            $this->properties = [
-                '{DAV:}getlastmodified',
-                '{DAV:}getcontentlength',
-                '{DAV:}resourcetype',
-                '{DAV:}quota-used-bytes',
-                '{DAV:}quota-available-bytes',
-                '{DAV:}getetag',
-                '{DAV:}getcontenttype',
-            ];
-        }
+		if (self::ALLPROPS === $requestType) {
+			$this->properties = [
+				'{DAV:}getlastmodified',
+				'{DAV:}getcontentlength',
+				'{DAV:}resourcetype',
+				'{DAV:}quota-used-bytes',
+				'{DAV:}quota-available-bytes',
+				'{DAV:}getetag',
+				'{DAV:}getcontenttype',
+			];
+		}
 
-        foreach ($this->properties as $propertyName) {
-            // Seeding properties with 404's.
-            $this->result[$propertyName] = [404, null];
-        }
-        $this->itemsLeft = count($this->result);
-    }
+		foreach ($this->properties as $propertyName) {
+			// Seeding properties with 404's.
+			$this->result[$propertyName] = [404, null];
+		}
+		$this->itemsLeft = count($this->result);
+	}
 
-    /**
-     * Handles a specific property.
-     *
-     * This method checks whether the specified property was requested in this
-     * PROPFIND request, and if so, it will call the callback and use the
-     * return value for it's value.
-     *
-     * Example:
-     *
-     * $propFind->handle('{DAV:}displayname', function() {
-     *      return 'hello';
-     * });
-     *
-     * Note that handle will only work the first time. If null is returned, the
-     * value is ignored.
-     *
-     * It's also possible to not pass a callback, but immediately pass a value
-     *
-     * @param string $propertyName
-     * @param mixed  $valueOrCallBack
-     */
-    public function handle($propertyName, $valueOrCallBack)
-    {
-        if ($this->itemsLeft && isset($this->result[$propertyName]) && 404 === $this->result[$propertyName][0]) {
-            if (is_callable($valueOrCallBack)) {
-                $value = $valueOrCallBack();
-            } else {
-                $value = $valueOrCallBack;
-            }
-            if (!is_null($value)) {
-                --$this->itemsLeft;
-                $this->result[$propertyName] = [200, $value];
-            }
-        }
-    }
+	/**
+	 * Handles a specific property.
+	 *
+	 * This method checks whether the specified property was requested in this
+	 * PROPFIND request, and if so, it will call the callback and use the
+	 * return value for it's value.
+	 *
+	 * Example:
+	 *
+	 * $propFind->handle('{DAV:}displayname', function() {
+	 *      return 'hello';
+	 * });
+	 *
+	 * Note that handle will only work the first time. If null is returned, the
+	 * value is ignored.
+	 *
+	 * It's also possible to not pass a callback, but immediately pass a value
+	 *
+	 * @param string $propertyName
+	 * @param mixed  $valueOrCallBack
+	 */
+	public function handle($propertyName, $valueOrCallBack)
+	{
+		if ($this->itemsLeft && isset($this->result[$propertyName]) && 404 === $this->result[$propertyName][0]) {
+			if (is_callable($valueOrCallBack)) {
+				$value = $valueOrCallBack();
+			} else {
+				$value = $valueOrCallBack;
+			}
+			if (!is_null($value)) {
+				--$this->itemsLeft;
+				$this->result[$propertyName] = [200, $value];
+			}
+		}
+	}
 
-    /**
-     * Sets the value of the property.
-     *
-     * If status is not supplied, the status will default to 200 for non-null
-     * properties, and 404 for null properties.
-     *
-     * @param string $propertyName
-     * @param mixed  $value
-     * @param int    $status
-     */
-    public function set($propertyName, $value, $status = null)
-    {
-        if (is_null($status)) {
-            $status = is_null($value) ? 404 : 200;
-        }
-        // If this is an ALLPROPS request and the property is
-        // unknown, add it to the result; else ignore it:
-        if (!isset($this->result[$propertyName])) {
-            if (self::ALLPROPS === $this->requestType) {
-                $this->result[$propertyName] = [$status, $value];
-            }
+	/**
+	 * Sets the value of the property.
+	 *
+	 * If status is not supplied, the status will default to 200 for non-null
+	 * properties, and 404 for null properties.
+	 *
+	 * @param string $propertyName
+	 * @param mixed  $value
+	 * @param int    $status
+	 */
+	public function set($propertyName, $value, $status = null)
+	{
+		if (is_null($status)) {
+			$status = is_null($value) ? 404 : 200;
+		}
+		// If this is an ALLPROPS request and the property is
+		// unknown, add it to the result; else ignore it:
+		if (!isset($this->result[$propertyName])) {
+			if (self::ALLPROPS === $this->requestType) {
+				$this->result[$propertyName] = [$status, $value];
+			}
 
-            return;
-        }
-        if (404 !== $status && 404 === $this->result[$propertyName][0]) {
-            --$this->itemsLeft;
-        } elseif (404 === $status && 404 !== $this->result[$propertyName][0]) {
-            ++$this->itemsLeft;
-        }
-        $this->result[$propertyName] = [$status, $value];
-    }
+			return;
+		}
+		if (404 !== $status && 404 === $this->result[$propertyName][0]) {
+			--$this->itemsLeft;
+		} elseif (404 === $status && 404 !== $this->result[$propertyName][0]) {
+			++$this->itemsLeft;
+		}
+		$this->result[$propertyName] = [$status, $value];
+	}
 
-    /**
-     * Returns the current value for a property.
-     *
-     * @param string $propertyName
-     *
-     * @return mixed
-     */
-    public function get($propertyName)
-    {
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
-    }
+	/**
+	 * Returns the current value for a property.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return mixed
+	 */
+	public function get($propertyName)
+	{
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
+	}
 
-    /**
-     * Returns the current status code for a property name.
-     *
-     * If the property does not appear in the list of requested properties,
-     * null will be returned.
-     *
-     * @param string $propertyName
-     *
-     * @return int|null
-     */
-    public function getStatus($propertyName)
-    {
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : null;
-    }
+	/**
+	 * Returns the current status code for a property name.
+	 *
+	 * If the property does not appear in the list of requested properties,
+	 * null will be returned.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return int|null
+	 */
+	public function getStatus($propertyName)
+	{
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : null;
+	}
 
-    /**
-     * Updates the path for this PROPFIND.
-     *
-     * @param string $path
-     */
-    public function setPath($path)
-    {
-        $this->path = $path;
-    }
+	/**
+	 * Updates the path for this PROPFIND.
+	 *
+	 * @param string $path
+	 */
+	public function setPath($path)
+	{
+		$this->path = $path;
+	}
 
-    /**
-     * Returns the path this PROPFIND request is for.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
+	/**
+	 * Returns the path this PROPFIND request is for.
+	 *
+	 * @return string
+	 */
+	public function getPath()
+	{
+		return $this->path;
+	}
 
-    /**
-     * Returns the depth of this propfind request.
-     *
-     * @return int
-     */
-    public function getDepth()
-    {
-        return $this->depth;
-    }
+	/**
+	 * Returns the depth of this propfind request.
+	 *
+	 * @return int
+	 */
+	public function getDepth()
+	{
+		return $this->depth;
+	}
 
-    /**
-     * Updates the depth of this propfind request.
-     *
-     * @param int $depth
-     */
-    public function setDepth($depth)
-    {
-        $this->depth = $depth;
-    }
+	/**
+	 * Updates the depth of this propfind request.
+	 *
+	 * @param int $depth
+	 */
+	public function setDepth($depth)
+	{
+		$this->depth = $depth;
+	}
 
-    /**
-     * Returns all propertynames that have a 404 status, and thus don't have a
-     * value yet.
-     *
-     * @return array
-     */
-    public function get404Properties()
-    {
-        if (0 === $this->itemsLeft) {
-            return [];
-        }
-        $result = [];
-        foreach ($this->result as $propertyName => $stuff) {
-            if (404 === $stuff[0]) {
-                $result[] = $propertyName;
-            }
-        }
+	/**
+	 * Returns all propertynames that have a 404 status, and thus don't have a
+	 * value yet.
+	 *
+	 * @return array
+	 */
+	public function get404Properties()
+	{
+		if (0 === $this->itemsLeft) {
+			return [];
+		}
+		$result = [];
+		foreach ($this->result as $propertyName => $stuff) {
+			if (404 === $stuff[0]) {
+				$result[] = $propertyName;
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns the full list of requested properties.
-     *
-     * This returns just their names, not a status or value.
-     *
-     * @return array
-     */
-    public function getRequestedProperties()
-    {
-        return $this->properties;
-    }
+	/**
+	 * Returns the full list of requested properties.
+	 *
+	 * This returns just their names, not a status or value.
+	 *
+	 * @return array
+	 */
+	public function getRequestedProperties()
+	{
+		return $this->properties;
+	}
 
-    /**
-     * Returns true if this was an '{DAV:}allprops' request.
-     *
-     * @return bool
-     */
-    public function isAllProps()
-    {
-        return self::ALLPROPS === $this->requestType;
-    }
+	/**
+	 * Returns true if this was an '{DAV:}allprops' request.
+	 *
+	 * @return bool
+	 */
+	public function isAllProps()
+	{
+		return self::ALLPROPS === $this->requestType;
+	}
 
-    /**
-     * Returns a result array that's often used in multistatus responses.
-     *
-     * The array uses status codes as keys, and property names and value pairs
-     * as the value of the top array.. such as :
-     *
-     * [
-     *  200 => [ '{DAV:}displayname' => 'foo' ],
-     * ]
-     *
-     * @return array
-     */
-    public function getResultForMultiStatus()
-    {
-        $r = [
-            200 => [],
-            404 => [],
-        ];
-        foreach ($this->result as $propertyName => $info) {
-            if (!isset($r[$info[0]])) {
-                $r[$info[0]] = [$propertyName => $info[1]];
-            } else {
-                $r[$info[0]][$propertyName] = $info[1];
-            }
-        }
-        // Removing the 404's for multi-status requests.
-        if (self::ALLPROPS === $this->requestType) {
-            unset($r[404]);
-        }
+	/**
+	 * Returns a result array that's often used in multistatus responses.
+	 *
+	 * The array uses status codes as keys, and property names and value pairs
+	 * as the value of the top array.. such as :
+	 *
+	 * [
+	 *  200 => [ '{DAV:}displayname' => 'foo' ],
+	 * ]
+	 *
+	 * @return array
+	 */
+	public function getResultForMultiStatus()
+	{
+		$r = [
+			200 => [],
+			404 => [],
+		];
+		foreach ($this->result as $propertyName => $info) {
+			if (!isset($r[$info[0]])) {
+				$r[$info[0]] = [$propertyName => $info[1]];
+			} else {
+				$r[$info[0]][$propertyName] = $info[1];
+			}
+		}
+		// Removing the 404's for multi-status requests.
+		if (self::ALLPROPS === $this->requestType) {
+			unset($r[404]);
+		}
 
-        return $r;
-    }
+		return $r;
+	}
 
-    /**
-     * The path that we're fetching properties for.
-     *
-     * @var string
-     */
-    protected $path;
+	/**
+	 * The path that we're fetching properties for.
+	 *
+	 * @var string
+	 */
+	protected $path;
 
-    /**
-     * The Depth of the request.
-     *
-     * 0 means only the current item. 1 means the current item + its children.
-     * It can also be DEPTH_INFINITY if this is enabled in the server.
-     *
-     * @var int
-     */
-    protected $depth = 0;
+	/**
+	 * The Depth of the request.
+	 *
+	 * 0 means only the current item. 1 means the current item + its children.
+	 * It can also be DEPTH_INFINITY if this is enabled in the server.
+	 *
+	 * @var int
+	 */
+	protected $depth = 0;
 
-    /**
-     * The type of request. See the TYPE constants.
-     */
-    protected $requestType;
+	/**
+	 * The type of request. See the TYPE constants.
+	 */
+	protected $requestType;
 
-    /**
-     * A list of requested properties.
-     *
-     * @var array
-     */
-    protected $properties = [];
+	/**
+	 * A list of requested properties.
+	 *
+	 * @var array
+	 */
+	protected $properties = [];
 
-    /**
-     * The result of the operation.
-     *
-     * The keys in this array are property names.
-     * The values are an array with two elements: the http status code and then
-     * optionally a value.
-     *
-     * Example:
-     *
-     * [
-     *    "{DAV:}owner" : [404],
-     *    "{DAV:}displayname" : [200, "Admin"]
-     * ]
-     *
-     * @var array
-     */
-    protected $result = [];
+	/**
+	 * The result of the operation.
+	 *
+	 * The keys in this array are property names.
+	 * The values are an array with two elements: the http status code and then
+	 * optionally a value.
+	 *
+	 * Example:
+	 *
+	 * [
+	 *    "{DAV:}owner" : [404],
+	 *    "{DAV:}displayname" : [200, "Admin"]
+	 * ]
+	 *
+	 * @var array
+	 */
+	protected $result = [];
 
-    /**
-     * This is used as an internal counter for the number of properties that do
-     * not yet have a value.
-     *
-     * @var int
-     */
-    protected $itemsLeft;
+	/**
+	 * This is used as an internal counter for the number of properties that do
+	 * not yet have a value.
+	 *
+	 * @var int
+	 */
+	protected $itemsLeft;
 }

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

Indentation +185 added lines, -185 removed lines

@@ -24,189 +24,189 @@
  */
 class Plugin extends DAV\ServerPlugin
 {
-    const RANGE_APPEND = 1;
-    const RANGE_START = 2;
-    const RANGE_END = 3;
-
-    /**
-     * Reference to server.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin.
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-        $server->on('method:PATCH', [$this, 'httpPatch']);
-    }
-
-    /**
-     * 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 'partialupdate';
-    }
-
-    /**
-     * 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.
-     *
-     * We claim to support PATCH method (partirl update) if and only if
-     *     - the node exist
-     *     - the node implements our partial update interface
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getHTTPMethods($uri)
-    {
-        $tree = $this->server->tree;
-
-        if ($tree->nodeExists($uri)) {
-            $node = $tree->getNodeForPath($uri);
-            if ($node instanceof IPatchSupport) {
-                return ['PATCH'];
-            }
-        }
-
-        return [];
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['sabredav-partialupdate'];
-    }
-
-    /**
-     * Patch an uri.
-     *
-     * The WebDAV patch request can be used to modify only a part of an
-     * existing resource. If the resource does not exist yet and the first
-     * offset is not 0, the request fails
-     */
-    public function httpPatch(RequestInterface $request, ResponseInterface $response)
-    {
-        $path = $request->getPath();
-
-        // Get the node. Will throw a 404 if not found
-        $node = $this->server->tree->getNodeForPath($path);
-        if (!$node instanceof IPatchSupport) {
-            throw new DAV\Exception\MethodNotAllowed('The target resource does not support the PATCH method.');
-        }
-
-        $range = $this->getHTTPUpdateRange($request);
-
-        if (!$range) {
-            throw new DAV\Exception\BadRequest('No valid "X-Update-Range" found in the headers');
-        }
-
-        $contentType = strtolower(
-            (string) $request->getHeader('Content-Type')
-        );
-
-        if ('application/x-sabredav-partialupdate' != $contentType) {
-            throw new DAV\Exception\UnsupportedMediaType('Unknown Content-Type header "'.$contentType.'"');
-        }
-
-        $len = $this->server->httpRequest->getHeader('Content-Length');
-        if (!$len) {
-            throw new DAV\Exception\LengthRequired('A Content-Length header is required');
-        }
-        switch ($range[0]) {
-            case self::RANGE_START:
-                // Calculate the end-range if it doesn't exist.
-                if (!$range[2]) {
-                    $range[2] = $range[1] + $len - 1;
-                } else {
-                    if ($range[2] < $range[1]) {
-                        throw new DAV\Exception\RequestedRangeNotSatisfiable('The end offset ('.$range[2].') is lower than the start offset ('.$range[1].')');
-                    }
-                    if ($range[2] - $range[1] + 1 != $len) {
-                        throw new DAV\Exception\RequestedRangeNotSatisfiable('Actual data length ('.$len.') is not consistent with begin ('.$range[1].') and end ('.$range[2].') offsets');
-                    }
-                }
-                break;
-        }
-
-        if (!$this->server->emit('beforeWriteContent', [$path, $node, null])) {
-            return;
-        }
-
-        $body = $this->server->httpRequest->getBody();
-
-        $etag = $node->patch($body, $range[0], isset($range[1]) ? $range[1] : null);
-
-        $this->server->emit('afterWriteContent', [$path, $node]);
-
-        $response->setHeader('Content-Length', '0');
-        if ($etag) {
-            $response->setHeader('ETag', $etag);
-        }
-        $response->setStatus(204);
-
-        // Breaks the event chain
-        return false;
-    }
-
-    /**
-     * Returns the HTTP custom range update header.
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header. It returns array(1) if it was an append request, array(2,
-     * $start, $end) if it's a start and end range, lastly it's array(3,
-     * $endoffset) if the offset was negative, and should be calculated from
-     * the end of the file.
-     *
-     * Examples:
-     *
-     * null - invalid
-     * [1] - append
-     * [2,10,15] - update bytes 10, 11, 12, 13, 14, 15
-     * [2,10,null] - update bytes 10 until the end of the patch body
-     * [3,-5] - update from 5 bytes from the end of the file.
-     *
-     * @return array|null
-     */
-    public function getHTTPUpdateRange(RequestInterface $request)
-    {
-        $range = $request->getHeader('X-Update-Range');
-        if (is_null($range)) {
-            return null;
-        }
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^(append)|(?:bytes=([0-9]+)-([0-9]*))|(?:bytes=(-[0-9]+))$/i', $range, $matches)) {
-            return null;
-        }
-
-        if ('append' === $matches[1]) {
-            return [self::RANGE_APPEND];
-        } elseif (strlen($matches[2]) > 0) {
-            return [self::RANGE_START, (int) $matches[2], (int) $matches[3] ?: null];
-        } else {
-            return [self::RANGE_END, (int) $matches[4]];
-        }
-    }
+	const RANGE_APPEND = 1;
+	const RANGE_START = 2;
+	const RANGE_END = 3;
+
+	/**
+	 * Reference to server.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * Initializes the plugin.
+	 *
+	 * This method is automatically called by the Server class after addPlugin.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+		$server->on('method:PATCH', [$this, 'httpPatch']);
+	}
+
+	/**
+	 * 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 'partialupdate';
+	}
+
+	/**
+	 * 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.
+	 *
+	 * We claim to support PATCH method (partirl update) if and only if
+	 *     - the node exist
+	 *     - the node implements our partial update interface
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getHTTPMethods($uri)
+	{
+		$tree = $this->server->tree;
+
+		if ($tree->nodeExists($uri)) {
+			$node = $tree->getNodeForPath($uri);
+			if ($node instanceof IPatchSupport) {
+				return ['PATCH'];
+			}
+		}
+
+		return [];
+	}
+
+	/**
+	 * Returns a list of features for the HTTP OPTIONS Dav: header.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['sabredav-partialupdate'];
+	}
+
+	/**
+	 * Patch an uri.
+	 *
+	 * The WebDAV patch request can be used to modify only a part of an
+	 * existing resource. If the resource does not exist yet and the first
+	 * offset is not 0, the request fails
+	 */
+	public function httpPatch(RequestInterface $request, ResponseInterface $response)
+	{
+		$path = $request->getPath();
+
+		// Get the node. Will throw a 404 if not found
+		$node = $this->server->tree->getNodeForPath($path);
+		if (!$node instanceof IPatchSupport) {
+			throw new DAV\Exception\MethodNotAllowed('The target resource does not support the PATCH method.');
+		}
+
+		$range = $this->getHTTPUpdateRange($request);
+
+		if (!$range) {
+			throw new DAV\Exception\BadRequest('No valid "X-Update-Range" found in the headers');
+		}
+
+		$contentType = strtolower(
+			(string) $request->getHeader('Content-Type')
+		);
+
+		if ('application/x-sabredav-partialupdate' != $contentType) {
+			throw new DAV\Exception\UnsupportedMediaType('Unknown Content-Type header "'.$contentType.'"');
+		}
+
+		$len = $this->server->httpRequest->getHeader('Content-Length');
+		if (!$len) {
+			throw new DAV\Exception\LengthRequired('A Content-Length header is required');
+		}
+		switch ($range[0]) {
+			case self::RANGE_START:
+				// Calculate the end-range if it doesn't exist.
+				if (!$range[2]) {
+					$range[2] = $range[1] + $len - 1;
+				} else {
+					if ($range[2] < $range[1]) {
+						throw new DAV\Exception\RequestedRangeNotSatisfiable('The end offset ('.$range[2].') is lower than the start offset ('.$range[1].')');
+					}
+					if ($range[2] - $range[1] + 1 != $len) {
+						throw new DAV\Exception\RequestedRangeNotSatisfiable('Actual data length ('.$len.') is not consistent with begin ('.$range[1].') and end ('.$range[2].') offsets');
+					}
+				}
+				break;
+		}
+
+		if (!$this->server->emit('beforeWriteContent', [$path, $node, null])) {
+			return;
+		}
+
+		$body = $this->server->httpRequest->getBody();
+
+		$etag = $node->patch($body, $range[0], isset($range[1]) ? $range[1] : null);
+
+		$this->server->emit('afterWriteContent', [$path, $node]);
+
+		$response->setHeader('Content-Length', '0');
+		if ($etag) {
+			$response->setHeader('ETag', $etag);
+		}
+		$response->setStatus(204);
+
+		// Breaks the event chain
+		return false;
+	}
+
+	/**
+	 * Returns the HTTP custom range update header.
+	 *
+	 * This method returns null if there is no well-formed HTTP range request
+	 * header. It returns array(1) if it was an append request, array(2,
+	 * $start, $end) if it's a start and end range, lastly it's array(3,
+	 * $endoffset) if the offset was negative, and should be calculated from
+	 * the end of the file.
+	 *
+	 * Examples:
+	 *
+	 * null - invalid
+	 * [1] - append
+	 * [2,10,15] - update bytes 10, 11, 12, 13, 14, 15
+	 * [2,10,null] - update bytes 10 until the end of the patch body
+	 * [3,-5] - update from 5 bytes from the end of the file.
+	 *
+	 * @return array|null
+	 */
+	public function getHTTPUpdateRange(RequestInterface $request)
+	{
+		$range = $request->getHeader('X-Update-Range');
+		if (is_null($range)) {
+			return null;
+		}
+
+		// Matching "Range: bytes=1234-5678: both numbers are optional
+
+		if (!preg_match('/^(append)|(?:bytes=([0-9]+)-([0-9]*))|(?:bytes=(-[0-9]+))$/i', $range, $matches)) {
+			return null;
+		}
+
+		if ('append' === $matches[1]) {
+			return [self::RANGE_APPEND];
+		} elseif (strlen($matches[2]) > 0) {
+			return [self::RANGE_START, (int) $matches[2], (int) $matches[3] ?: null];
+		} else {
+			return [self::RANGE_END, (int) $matches[4]];
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/PartialUpdate/IPatchSupport.php

Indentation +29 added lines, -29 removed lines

@@ -17,33 +17,33 @@
  */
 interface IPatchSupport extends DAV\IFile
 {
-    /**
-     * Updates the file based on a range specification.
-     *
-     * The first argument is the data, which is either a readable stream
-     * resource or a string.
-     *
-     * The second argument is the type of update we're doing.
-     * This is either:
-     * * 1. append
-     * * 2. update based on a start byte
-     * * 3. update based on an end byte
-     *;
-     * The third argument is the start or end byte.
-     *
-     * 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.
-     *
-     * @param resource|string $data
-     * @param int             $rangeType
-     * @param int             $offset
-     *
-     * @return string|null
-     */
-    public function patch($data, $rangeType, $offset = null);
+	/**
+	 * Updates the file based on a range specification.
+	 *
+	 * The first argument is the data, which is either a readable stream
+	 * resource or a string.
+	 *
+	 * The second argument is the type of update we're doing.
+	 * This is either:
+	 * * 1. append
+	 * * 2. update based on a start byte
+	 * * 3. update based on an end byte
+	 *;
+	 * The third argument is the start or end byte.
+	 *
+	 * 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.
+	 *
+	 * @param resource|string $data
+	 * @param int             $rangeType
+	 * @param int             $offset
+	 *
+	 * @return string|null
+	 */
+	public function patch($data, $rangeType, $offset = null);
 }