nextcloud / server

apps/dav/lib/Comments/EntityCollection.php

Indentation +140 added lines, -140 removed lines

@@ -41,156 +41,156 @@
  * @package OCA\DAV\Comments
  */
 class EntityCollection extends RootCollection implements IProperties {
-	const PROPERTY_NAME_READ_MARKER  = '{http://owncloud.org/ns}readMarker';
+    const PROPERTY_NAME_READ_MARKER  = '{http://owncloud.org/ns}readMarker';
 
-	/** @var  string */
-	protected $id;
+    /** @var  string */
+    protected $id;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	/**
-	 * @param string $id
-	 * @param string $name
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$id,
-		$name,
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		foreach(['id', 'name'] as $property) {
-			$$property = trim($$property);
-			if(empty($$property) || !is_string($$property)) {
-				throw new \InvalidArgumentException('"' . $property . '" parameter must be non-empty string');
-			}
-		}
-		$this->id = $id;
-		$this->name = $name;
-		$this->commentsManager = $commentsManager;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $id,
+        $name,
+        ICommentsManager $commentsManager,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        foreach(['id', 'name'] as $property) {
+            $$property = trim($$property);
+            if(empty($$property) || !is_string($$property)) {
+                throw new \InvalidArgumentException('"' . $property . '" parameter must be non-empty string');
+            }
+        }
+        $this->id = $id;
+        $this->name = $name;
+        $this->commentsManager = $commentsManager;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * returns the ID of this entity
-	 *
-	 * @return string
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * returns the ID of this entity
+     *
+     * @return string
+     */
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-	 * exist.
-	 *
-	 * @param string $name
-	 * @return \Sabre\DAV\INode
-	 * @throws NotFound
-	 */
-	function getChild($name) {
-		try {
-			$comment = $this->commentsManager->get($name);
-			return new CommentNode(
-				$this->commentsManager,
-				$comment,
-				$this->userManager,
-				$this->userSession,
-				$this->logger
-			);
-		} catch (NotFoundException $e) {
-			throw new NotFound();
-		}
-	}
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * exist.
+     *
+     * @param string $name
+     * @return \Sabre\DAV\INode
+     * @throws NotFound
+     */
+    function getChild($name) {
+        try {
+            $comment = $this->commentsManager->get($name);
+            return new CommentNode(
+                $this->commentsManager,
+                $comment,
+                $this->userManager,
+                $this->userSession,
+                $this->logger
+            );
+        } catch (NotFoundException $e) {
+            throw new NotFound();
+        }
+    }
 
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 */
-	function getChildren() {
-		return $this->findChildren();
-	}
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     */
+    function getChildren() {
+        return $this->findChildren();
+    }
 
-	/**
-	 * Returns an array of comment nodes. Result can be influenced by offset,
-	 * limit and date time parameters.
-	 *
-	 * @param int $limit
-	 * @param int $offset
-	 * @param \DateTime|null $datetime
-	 * @return CommentNode[]
-	 */
-	function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) {
-		$comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime);
-		$result = [];
-		foreach($comments as $comment) {
-			$result[] = new CommentNode(
-				$this->commentsManager,
-				$comment,
-				$this->userManager,
-				$this->userSession,
-				$this->logger
-			);
-		}
-		return $result;
-	}
+    /**
+     * Returns an array of comment nodes. Result can be influenced by offset,
+     * limit and date time parameters.
+     *
+     * @param int $limit
+     * @param int $offset
+     * @param \DateTime|null $datetime
+     * @return CommentNode[]
+     */
+    function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) {
+        $comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime);
+        $result = [];
+        foreach($comments as $comment) {
+            $result[] = new CommentNode(
+                $this->commentsManager,
+                $comment,
+                $this->userManager,
+                $this->userSession,
+                $this->logger
+            );
+        }
+        return $result;
+    }
 
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	function childExists($name) {
-		try {
-			$this->commentsManager->get($name);
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    function childExists($name) {
+        try {
+            $this->commentsManager->get($name);
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * Sets the read marker to the specified date for the logged in user
-	 *
-	 * @param \DateTime $value
-	 * @return bool
-	 */
-	public function setReadMarker($value) {
-		$dateTime = new \DateTime($value);
-		$user = $this->userSession->getUser();
-		$this->commentsManager->setReadMark($this->name, $this->id, $dateTime, $user);
-		return true;
-	}
+    /**
+     * Sets the read marker to the specified date for the logged in user
+     *
+     * @param \DateTime $value
+     * @return bool
+     */
+    public function setReadMarker($value) {
+        $dateTime = new \DateTime($value);
+        $user = $this->userSession->getUser();
+        $this->commentsManager->setReadMark($this->name, $this->id, $dateTime, $user);
+        return true;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function propPatch(PropPatch $propPatch) {
-		$propPatch->handle(self::PROPERTY_NAME_READ_MARKER, [$this, 'setReadMarker']);
-	}
+    /**
+     * @inheritdoc
+     */
+    function propPatch(PropPatch $propPatch) {
+        $propPatch->handle(self::PROPERTY_NAME_READ_MARKER, [$this, 'setReadMarker']);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getProperties($properties) {
-		$marker = null;
-		$user = $this->userSession->getUser();
-		if(!is_null($user)) {
-			$marker = $this->commentsManager->getReadMark($this->name, $this->id, $user);
-		}
-		return [self::PROPERTY_NAME_READ_MARKER => $marker];
-	}
+    /**
+     * @inheritdoc
+     */
+    function getProperties($properties) {
+        $marker = null;
+        $user = $this->userSession->getUser();
+        if(!is_null($user)) {
+            $marker = $this->commentsManager->getReadMark($this->name, $this->id, $user);
+        }
+        return [self::PROPERTY_NAME_READ_MARKER => $marker];
+    }
 }
 

apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php

Indentation +43 added lines, -43 removed lines

@@ -33,50 +33,50 @@
  */
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
 
-	/** @var \Sabre\DAV\Server */
-	private $server;
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
 
-		$server->on('afterMethod', [$this, 'afterMethod']);
-		$server->on('afterMove', [$this, 'afterMove']);
-	}
+        $server->on('afterMethod', [$this, 'afterMethod']);
+        $server->on('afterMove', [$this, 'afterMove']);
+    }
 
-	/**
-	 * After method, copy the "Etag" header to "OC-Etag" header.
-	 *
-	 * @param RequestInterface $request request
-	 * @param ResponseInterface $response response
-	 */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
-		$eTag = $response->getHeader('Etag');
-		if (!empty($eTag)) {
-			$response->setHeader('OC-ETag', $eTag);
-		}
-	}
+    /**
+     * After method, copy the "Etag" header to "OC-Etag" header.
+     *
+     * @param RequestInterface $request request
+     * @param ResponseInterface $response response
+     */
+    public function afterMethod(RequestInterface $request, ResponseInterface $response) {
+        $eTag = $response->getHeader('Etag');
+        if (!empty($eTag)) {
+            $response->setHeader('OC-ETag', $eTag);
+        }
+    }
 
-	/**
-	 * Called after a node is moved.
-	 *
-	 * This allows the backend to move all the associated properties.
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @return void
-	 */
-	function afterMove($source, $destination) {
-		$node = $this->server->tree->getNodeForPath($destination);
-		if ($node instanceof File) {
-			$eTag = $node->getETag();
-			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
-			$this->server->httpResponse->setHeader('ETag', $eTag);
-		}
-	}
+    /**
+     * Called after a node is moved.
+     *
+     * This allows the backend to move all the associated properties.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    function afterMove($source, $destination) {
+        $node = $this->server->tree->getNodeForPath($destination);
+        if ($node instanceof File) {
+            $eTag = $node->getETag();
+            $this->server->httpResponse->setHeader('OC-ETag', $eTag);
+            $this->server->httpResponse->setHeader('ETag', $eTag);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ChecksumList.php

Indentation +33 added lines, -33 removed lines

@@ -32,41 +32,41 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $checksums;
 
-	/**
-	 * @param string $checksum
-	 */
-	public function __construct($checksum) {
-		$this->checksums = explode(',', $checksum);
-	}
+    /**
+     * @param string $checksum
+     */
+    public function __construct($checksum) {
+        $this->checksums = explode(',', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
 
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php

Indentation +48 added lines, -48 removed lines

@@ -34,58 +34,58 @@
  */
 class AppEnabledPlugin extends ServerPlugin {
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var string
-	 */
-	private $app;
+    /**
+     * @var string
+     */
+    private $app;
 
-	/**
-	 * @var \OCP\App\IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var \OCP\App\IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * @param string $app
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($app, IAppManager $appManager) {
-		$this->app = $app;
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $app
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($app, IAppManager $appManager) {
+        $this->app = $app;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * 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 \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * 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 \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$this->server = $server;
-		$this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
-	}
+        $this->server = $server;
+        $this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
+    }
 
-	/**
-	 * This method is called before any HTTP after auth and checks if the user has access to the app
-	 *
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @return bool
-	 */
-	public function checkAppEnabled() {
-		if (!$this->appManager->isEnabledForUser($this->app)) {
-			throw new Forbidden();
-		}
-	}
+    /**
+     * This method is called before any HTTP after auth and checks if the user has access to the app
+     *
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @return bool
+     */
+    public function checkAppEnabled() {
+        if (!$this->appManager->isEnabledForUser($this->app)) {
+            throw new Forbidden();
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php

Indentation +38 added lines, -38 removed lines

@@ -35,47 +35,47 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class BlockLegacyClientPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	protected $server;
-	/** @var IConfig */
-	protected $config;
+    /** @var \Sabre\DAV\Server */
+    protected $server;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
-	}
+    /**
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
+    }
 
-	/**
-	 * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
-	 * exception which will result in a 403 to them.
-	 * @param RequestInterface $request
-	 * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
-	 */
-	public function beforeHandler(RequestInterface $request) {
-		$userAgent = $request->getHeader('User-Agent');
-		if($userAgent === null) {
-			return;
-		}
+    /**
+     * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
+     * exception which will result in a 403 to them.
+     * @param RequestInterface $request
+     * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
+     */
+    public function beforeHandler(RequestInterface $request) {
+        $userAgent = $request->getHeader('User-Agent');
+        if($userAgent === null) {
+            return;
+        }
 
-		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
+        $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
 
-		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
-		// "mirall/%1" for older releases
-		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
-		if(isset($versionMatches[1]) &&
-			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
-			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
-		}
-	}
+        // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
+        // "mirall/%1" for older releases
+        preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
+        if(isset($versionMatches[1]) &&
+            version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
+            throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ShareTypeList.php

Indentation +51 added lines, -51 removed lines

@@ -32,61 +32,61 @@
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * Share types
-	 *
-	 * @var int[]
-	 */
-	private $shareTypes;
+    /**
+     * Share types
+     *
+     * @var int[]
+     */
+    private $shareTypes;
 
-	/**
-	 * @param int[] $shareTypes
-	 */
-	public function __construct($shareTypes) {
-		$this->shareTypes = $shareTypes;
-	}
+    /**
+     * @param int[] $shareTypes
+     */
+    public function __construct($shareTypes) {
+        $this->shareTypes = $shareTypes;
+    }
 
-	/**
-	 * Returns the share types
-	 *
-	 * @return int[]
-	 */
-	public function getShareTypes() {
-		return $this->shareTypes;
-	}
+    /**
+     * Returns the share types
+     *
+     * @return int[]
+     */
+    public function getShareTypes() {
+        return $this->shareTypes;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$shareTypes = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $shareTypes = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
-			}
-		}
-		return new self($shareTypes);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
+                $shareTypes[] = (int)$elem['value'];
+            }
+        }
+        return new self($shareTypes);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
-		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+        foreach ($this->shareTypes as $shareType) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/LockPlugin.php

Indentation +46 added lines, -46 removed lines

@@ -34,53 +34,53 @@
 use Sabre\HTTP\RequestInterface;
 
 class LockPlugin extends ServerPlugin {
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod', [$this, 'getLock'], 50);
-		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod', [$this, 'getLock'], 50);
+        $this->server->on('afterMethod', [$this, 'releaseLock'], 50);
+    }
 
-	public function getLock(RequestInterface $request) {
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
-		// so instead we limit ourselves to the PUT method manually
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			try {
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-		}
-	}
+    public function getLock(RequestInterface $request) {
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+        // so instead we limit ourselves to the PUT method manually
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            try {
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+    }
 
-	public function releaseLock(RequestInterface $request) {
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-		}
-	}
+    public function releaseLock(RequestInterface $request) {
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/Forbidden.php

Indentation +32 added lines, -32 removed lines

@@ -24,42 +24,42 @@
 
 class Forbidden extends \Sabre\DAV\Exception\Forbidden {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @var bool
-	 */
-	private $retry;
+    /**
+     * @var bool
+     */
+    private $retry;
 
-	/**
-	 * @param string $message
-	 * @param bool $retry
-	 * @param \Exception $previous
-	 */
-	public function __construct($message, $retry = false, \Exception $previous = null) {
-		parent::__construct($message, 0, $previous);
-		$this->retry = $retry;
-	}
+    /**
+     * @param string $message
+     * @param bool $retry
+     * @param \Exception $previous
+     */
+    public function __construct($message, $retry = false, \Exception $previous = null) {
+        parent::__construct($message, 0, $previous);
+        $this->retry = $retry;
+    }
 
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @param \DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param \Sabre\DAV\Server $server
+     * @param \DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
 
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
-		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
-		$errorNode->appendChild($error);
+        // adding the retry node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+        $errorNode->appendChild($error);
 
-		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
-		$errorNode->appendChild($error);
-	}
+        // adding the message node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+        $errorNode->appendChild($error);
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php

Indentation +22 added lines, -22 removed lines

@@ -29,27 +29,27 @@
 
 class PasswordLoginForbidden extends NotAuthenticated {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-
-	public function getHTTPCode() {
-		return 401;
-	}
-
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param Server $server
-	 * @param DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(Server $server, DOMElement $errorNode) {
-
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
-
-		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden');
-		$errorNode->appendChild($error);
-	}
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+    public function getHTTPCode() {
+        return 401;
+    }
+
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Server $server, DOMElement $errorNode) {
+
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+
+        $error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden');
+        $errorNode->appendChild($error);
+    }
 
 }