YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAV/PartialUpdate/Plugin.php

Indentation +190 added lines, -190 removed lines

@@ -22,194 +22,194 @@
  */
 class Plugin extends DAV\ServerPlugin {
 
-    const RANGE_APPEND = 1;
-    const RANGE_START = 2;
-    const RANGE_END = 3;
-
-    /**
-     * Reference to server
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    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
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    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(
-            $request->getHeader('Content-Type')
-        );
-
-        if ($contentType != 'application/x-sabredav-partialupdate') {
-            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.
-     *
-     * @param RequestInterface $request
-     * @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 ($matches[1] === 'append') {
-            return [self::RANGE_APPEND];
-        } elseif (strlen($matches[2]) > 0) {
-            return [self::RANGE_START, $matches[2], $matches[3] ?: null];
-        } else {
-            return [self::RANGE_END, $matches[4]];
-        }
-
-    }
+	const RANGE_APPEND = 1;
+	const RANGE_START = 2;
+	const RANGE_END = 3;
+
+	/**
+	 * Reference to server
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * Initializes the plugin
+	 *
+	 * This method is automatically called by the Server class after addPlugin.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	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
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	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(
+			$request->getHeader('Content-Type')
+		);
+
+		if ($contentType != 'application/x-sabredav-partialupdate') {
+			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.
+	 *
+	 * @param RequestInterface $request
+	 * @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 ($matches[1] === 'append') {
+			return [self::RANGE_APPEND];
+		} elseif (strlen($matches[2]) > 0) {
+			return [self::RANGE_START, $matches[2], $matches[3] ?: null];
+		} else {
+			return [self::RANGE_END, $matches[4]];
+		}
+
+	}
 }

libraries/SabreDAV/DAV/PartialUpdate/IPatchSupport.php

Indentation +28 added lines, -28 removed lines

@@ -15,33 +15,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);
 
 }

libraries/SabreDAV/DAV/IMoveTarget.php

Indentation +21 added lines, -21 removed lines

@@ -19,26 +19,26 @@
  */
 interface IMoveTarget extends ICollection {
 
-    /**
-     * Moves a node into this collection.
-     *
-     * It is up to the implementors to:
-     *   1. Create the new resource.
-     *   2. Remove the old resource.
-     *   3. Transfer any properties or other data.
-     *
-     * Generally you should make very sure that your collection can easily move
-     * the move.
-     *
-     * If you don't, just return false, which will trigger sabre/dav to handle
-     * the move itself. If you return true from this function, the assumption
-     * is that the move was successful.
-     *
-     * @param string $targetName New local file/collection name.
-     * @param string $sourcePath Full path to source node
-     * @param INode $sourceNode Source node itself
-     * @return bool
-     */
-    public function moveInto($targetName, $sourcePath, INode $sourceNode);
+	/**
+	 * Moves a node into this collection.
+	 *
+	 * It is up to the implementors to:
+	 *   1. Create the new resource.
+	 *   2. Remove the old resource.
+	 *   3. Transfer any properties or other data.
+	 *
+	 * Generally you should make very sure that your collection can easily move
+	 * the move.
+	 *
+	 * If you don't, just return false, which will trigger sabre/dav to handle
+	 * the move itself. If you return true from this function, the assumption
+	 * is that the move was successful.
+	 *
+	 * @param string $targetName New local file/collection name.
+	 * @param string $sourcePath Full path to source node
+	 * @param INode $sourceNode Source node itself
+	 * @return bool
+	 */
+	public function moveInto($targetName, $sourcePath, INode $sourceNode);
 
 }

libraries/SabreDAV/DAV/IProperties.php

Indentation +29 added lines, -29 removed lines

@@ -13,35 +13,35 @@
  */
 interface IProperties extends INode {
 
-    /**
-     * Updates properties on this node.
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * To update specific properties, call the 'handle' method on this object.
-     * Read the PropPatch documentation for more information.
-     *
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch(PropPatch $propPatch);
+	/**
+	 * Updates properties on this node.
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * To update specific properties, call the 'handle' method on this object.
+	 * Read the PropPatch documentation for more information.
+	 *
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch(PropPatch $propPatch);
 
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * Note that it's fine to liberally give properties back, instead of
-     * conforming to the list of requested properties.
-     * The Server class will filter out the extra.
-     *
-     * @param array $properties
-     * @return array
-     */
-    public function getProperties($properties);
+	/**
+	 * Returns a list of properties for this nodes.
+	 *
+	 * The properties list is a list of propertynames the client requested,
+	 * encoded in clark-notation {xmlnamespace}tagname
+	 *
+	 * If the array is empty, it means 'all properties' were requested.
+	 *
+	 * Note that it's fine to liberally give properties back, instead of
+	 * conforming to the list of requested properties.
+	 * The Server class will filter out the extra.
+	 *
+	 * @param array $properties
+	 * @return array
+	 */
+	public function getProperties($properties);
 
 }

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

Indentation +56 added lines, -56 removed lines

@@ -17,64 +17,64 @@
  */
 interface BackendInterface {
 
-    /**
-     * Fetches properties for a path.
-     *
-     * This method received a PropFind object, which contains all the
-     * information about the properties that need to be fetched.
-     *
-     * Ususually you would just want to call 'get404Properties' on this object,
-     * as this will give you the _exact_ list of properties that need to be
-     * fetched, and haven't yet.
-     *
-     * However, you can also support the 'allprops' property here. In that
-     * case, you should check for $propFind->isAllProps().
-     *
-     * @param string $path
-     * @param PropFind $propFind
-     * @return void
-     */
-    public function propFind($path, PropFind $propFind);
+	/**
+	 * Fetches properties for a path.
+	 *
+	 * This method received a PropFind object, which contains all the
+	 * information about the properties that need to be fetched.
+	 *
+	 * Ususually you would just want to call 'get404Properties' on this object,
+	 * as this will give you the _exact_ list of properties that need to be
+	 * fetched, and haven't yet.
+	 *
+	 * However, you can also support the 'allprops' property here. In that
+	 * case, you should check for $propFind->isAllProps().
+	 *
+	 * @param string $path
+	 * @param PropFind $propFind
+	 * @return void
+	 */
+	public function propFind($path, PropFind $propFind);
 
-    /**
-     * Updates properties for a path
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * Usually you would want to call 'handleRemaining' on this object, to get;
-     * a list of all properties that need to be stored.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, PropPatch $propPatch);
+	/**
+	 * Updates properties for a path
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * Usually you would want to call 'handleRemaining' on this object, to get;
+	 * a list of all properties that need to be stored.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, PropPatch $propPatch);
 
-    /**
-     * This method is called after a node is deleted.
-     *
-     * This allows a backend to clean up all associated properties.
-     *
-     * The delete method will get called once for the deletion of an entire
-     * tree.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function delete($path);
+	/**
+	 * This method is called after a node is deleted.
+	 *
+	 * This allows a backend to clean up all associated properties.
+	 *
+	 * The delete method will get called once for the deletion of an entire
+	 * tree.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function delete($path);
 
-    /**
-     * This method is called after a successful MOVE
-     *
-     * This should be used to migrate all properties from one path to another.
-     * Note that entire collections may be moved, so ensure that all properties
-     * for children are also moved along.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function move($source, $destination);
+	/**
+	 * This method is called after a successful MOVE
+	 *
+	 * This should be used to migrate all properties from one path to another.
+	 * Note that entire collections may be moved, so ensure that all properties
+	 * for children are also moved along.
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	public function move($source, $destination);
 
 }

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

Indentation +193 added lines, -193 removed lines

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

libraries/SabreDAV/DAV/PropertyStorage/Plugin.php

Indentation +152 added lines, -152 removed lines

@@ -25,156 +25,156 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * If you only want this plugin to store properties for a limited set of
-     * paths, you can use a pathFilter to do this.
-     *
-     * The pathFilter should be a callable. The callable retrieves a path as
-     * its argument, and should return true or false wether it allows
-     * properties to be stored.
-     *
-     * @var callable
-     */
-    public $pathFilter;
-
-    /**
-     * Creates the plugin
-     *
-     * @param Backend\BackendInterface $backend
-     */
-    public function __construct(Backend\BackendInterface $backend) {
-
-        $this->backend = $backend;
-
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $server->on('propFind',    [$this, 'propFind'], 130);
-        $server->on('propPatch',   [$this, 'propPatch'], 300);
-        $server->on('afterMove',   [$this, 'afterMove']);
-        $server->on('afterUnbind', [$this, 'afterUnbind']);
-
-    }
-
-    /**
-     * Called during PROPFIND operations.
-     *
-     * If there's any requested properties that don't have a value yet, this
-     * plugin will look in the property storage backend to find them.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        $path = $propFind->getPath();
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->propFind($propFind->getPath(), $propFind);
-
-    }
-
-    /**
-     * Called during PROPPATCH operations
-     *
-     * If there's any updated properties that haven't been stored, the
-     * propertystorage backend can handle it.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, PropPatch $propPatch) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->propPatch($path, $propPatch);
-
-    }
-
-    /**
-     * Called after a node is deleted.
-     *
-     * This allows the backend to clean up any properties still in the
-     * database.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function afterUnbind($path) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->delete($path);
-
-    }
-
-    /**
-     * Called after a node is moved.
-     *
-     * This allows the backend to move all the associated properties.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function afterMove($source, $destination) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($source)) return;
-        // If the destination is filtered, afterUnbind will handle cleaning up
-        // the properties.
-        if ($pathFilter && !$pathFilter($destination)) return;
-
-        $this->backend->move($source, $destination);
-
-    }
-
-    /**
-     * 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 'property-storage';
-
-    }
-
-    /**
-     * 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' => 'This plugin allows any arbitrary WebDAV property to be set on any resource.',
-            'link'        => 'http://sabre.io/dav/property-storage/',
-        ];
-
-    }
+	/**
+	 * If you only want this plugin to store properties for a limited set of
+	 * paths, you can use a pathFilter to do this.
+	 *
+	 * The pathFilter should be a callable. The callable retrieves a path as
+	 * its argument, and should return true or false wether it allows
+	 * properties to be stored.
+	 *
+	 * @var callable
+	 */
+	public $pathFilter;
+
+	/**
+	 * Creates the plugin
+	 *
+	 * @param Backend\BackendInterface $backend
+	 */
+	public function __construct(Backend\BackendInterface $backend) {
+
+		$this->backend = $backend;
+
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$server->on('propFind',    [$this, 'propFind'], 130);
+		$server->on('propPatch',   [$this, 'propPatch'], 300);
+		$server->on('afterMove',   [$this, 'afterMove']);
+		$server->on('afterUnbind', [$this, 'afterUnbind']);
+
+	}
+
+	/**
+	 * Called during PROPFIND operations.
+	 *
+	 * If there's any requested properties that don't have a value yet, this
+	 * plugin will look in the property storage backend to find them.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		$path = $propFind->getPath();
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->propFind($propFind->getPath(), $propFind);
+
+	}
+
+	/**
+	 * Called during PROPPATCH operations
+	 *
+	 * If there's any updated properties that haven't been stored, the
+	 * propertystorage backend can handle it.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, PropPatch $propPatch) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->propPatch($path, $propPatch);
+
+	}
+
+	/**
+	 * Called after a node is deleted.
+	 *
+	 * This allows the backend to clean up any properties still in the
+	 * database.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function afterUnbind($path) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->delete($path);
+
+	}
+
+	/**
+	 * Called after a node is moved.
+	 *
+	 * This allows the backend to move all the associated properties.
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	public function afterMove($source, $destination) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($source)) return;
+		// If the destination is filtered, afterUnbind will handle cleaning up
+		// the properties.
+		if ($pathFilter && !$pathFilter($destination)) return;
+
+		$this->backend->move($source, $destination);
+
+	}
+
+	/**
+	 * 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 'property-storage';
+
+	}
+
+	/**
+	 * 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' => 'This plugin allows any arbitrary WebDAV property to be set on any resource.',
+			'link'        => 'http://sabre.io/dav/property-storage/',
+		];
+
+	}
 }

libraries/SabreDAV/DAV/INode.php

Indentation +27 added lines, -27 removed lines

@@ -11,35 +11,35 @@
  */
 interface INode {
 
-    /**
-     * Deleted the current node
-     *
-     * @return void
-     */
-    public function delete();
+	/**
+	 * Deleted the current node
+	 *
+	 * @return void
+	 */
+	public function delete();
 
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name);
+	/**
+	 * Renames the node
+	 *
+	 * @param string $name The new name
+	 * @return void
+	 */
+	public function setName($name);
 
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified();
+	/**
+	 * Returns the last modification time, as a unix timestamp
+	 *
+	 * @return int
+	 */
+	public function getLastModified();
 
 }

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

Indentation +160 added lines, -160 removed lines

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