nextcloud / server

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

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 
 		$shareTypesByFileId = [];
 
-		foreach($shares as $fileId => $sharesForFile) {
+		foreach ($shares as $fileId => $sharesForFile) {
 			$types = array_map(function(IShare $share) {
 				return $share->getShareType();
 			}, $sharesForFile);
@@ -189,7 +189,7 @@ 
 			}
 		}
 
-		$propFind->handle(self::SHARETYPES_PROPERTYNAME, function () use ($sabreNode) {
+		$propFind->handle(self::SHARETYPES_PROPERTYNAME, function() use ($sabreNode) {
 			if (isset($this->cachedShareTypes[$sabreNode->getId()])) {
 				$shareTypes = $this->cachedShareTypes[$sabreNode->getId()];
 			} else {

Indentation +179 added lines, -179 removed lines

@@ -36,183 +36,183 @@
  */
 class SharesPlugin extends \Sabre\DAV\ServerPlugin {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var \OCP\Share\IManager
-	 */
-	private $shareManager;
-
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var string
-	 */
-	private $userId;
-
-	/**
-	 * @var \OCP\Files\Folder
-	 */
-	private $userFolder;
-
-	/**
-	 * @var IShare[]
-	 */
-	private $cachedShareTypes;
-
-	private $cachedFolders = [];
-
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param IUserSession $userSession user session
-	 * @param \OCP\Files\Folder $userFolder user home folder
-	 * @param \OCP\Share\IManager $shareManager share manager
-	 */
-	public function __construct(
-		\Sabre\DAV\Tree $tree,
-		IUserSession $userSession,
-		\OCP\Files\Folder $userFolder,
-		\OCP\Share\IManager $shareManager
-	) {
-		$this->tree = $tree;
-		$this->shareManager = $shareManager;
-		$this->userFolder = $userFolder;
-		$this->userId = $userSession->getUser()->getUID();
-		$this->cachedShareTypes = [];
-	}
-
-	/**
-	 * 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
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::SHARETYPES_PROPERTYNAME] = ShareTypeList::class;
-		$server->protectedProperties[] = self::SHARETYPES_PROPERTYNAME;
-
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-	}
-
-	/**
-	 * Return a list of share types for outgoing shares
-	 *
-	 * @param \OCP\Files\Node $node file node
-	 *
-	 * @return int[] array of share types
-	 */
-	private function getShareTypes(\OCP\Files\Node $node) {
-		$shareTypes = [];
-		$requestedShareTypes = [
-			\OCP\Share::SHARE_TYPE_USER,
-			\OCP\Share::SHARE_TYPE_GROUP,
-			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE,
-			\OCP\Share::SHARE_TYPE_EMAIL,
-			\OCP\Share::SHARE_TYPE_ROOM,
-			\OCP\Share::SHARE_TYPE_CIRCLE,
-		];
-		foreach ($requestedShareTypes as $requestedShareType) {
-			// one of each type is enough to find out about the types
-			$shares = $this->shareManager->getSharesBy(
-				$this->userId,
-				$requestedShareType,
-				$node,
-				false,
-				1
-			);
-			if (!empty($shares)) {
-				$shareTypes[] = $requestedShareType;
-			}
-		}
-		return $shareTypes;
-	}
-
-	private function getSharesTypesInFolder(\OCP\Files\Folder $node) {
-		$shares = $this->shareManager->getSharesInFolder(
-			$this->userId,
-			$node,
-			true
-		);
-
-		$shareTypesByFileId = [];
-
-		foreach($shares as $fileId => $sharesForFile) {
-			$types = array_map(function(IShare $share) {
-				return $share->getShareType();
-			}, $sharesForFile);
-			$types = array_unique($types);
-			sort($types);
-			$shareTypesByFileId[$fileId] = $types;
-		}
-
-		return $shareTypesByFileId;
-	}
-
-	/**
-	 * Adds shares to propfind response
-	 *
-	 * @param PropFind $propFind propfind object
-	 * @param \Sabre\DAV\INode $sabreNode sabre node
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $sabreNode
-	) {
-		if (!($sabreNode instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
-
-		// need prefetch ?
-		if ($sabreNode instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& !is_null($propFind->getStatus(self::SHARETYPES_PROPERTYNAME))
-		) {
-			$folderNode = $this->userFolder->get($sabreNode->getPath());
-
-			$childShares = $this->getSharesTypesInFolder($folderNode);
-			$this->cachedFolders[] = $sabreNode->getPath();
-			$this->cachedShareTypes[$folderNode->getId()] = $this->getShareTypes($folderNode);
-			foreach ($childShares as $id => $shares) {
-				$this->cachedShareTypes[$id] = $shares;
-			}
-		}
-
-		$propFind->handle(self::SHARETYPES_PROPERTYNAME, function () use ($sabreNode) {
-			if (isset($this->cachedShareTypes[$sabreNode->getId()])) {
-				$shareTypes = $this->cachedShareTypes[$sabreNode->getId()];
-			} else {
-				list($parentPath,) = \Sabre\Uri\split($sabreNode->getPath());
-				if ($parentPath === '') {
-					$parentPath = '/';
-				}
-				// if we already cached the folder this file is in we know there are no shares for this file
-				if (array_search($parentPath, $this->cachedFolders) === false) {
-					$node = $this->userFolder->get($sabreNode->getPath());
-					$shareTypes = $this->getShareTypes($node);
-				} else {
-					return [];
-				}
-			}
-
-			return new ShareTypeList($shareTypes);
-		});
-	}
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var \OCP\Share\IManager
+     */
+    private $shareManager;
+
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
+
+    /**
+     * @var string
+     */
+    private $userId;
+
+    /**
+     * @var \OCP\Files\Folder
+     */
+    private $userFolder;
+
+    /**
+     * @var IShare[]
+     */
+    private $cachedShareTypes;
+
+    private $cachedFolders = [];
+
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param IUserSession $userSession user session
+     * @param \OCP\Files\Folder $userFolder user home folder
+     * @param \OCP\Share\IManager $shareManager share manager
+     */
+    public function __construct(
+        \Sabre\DAV\Tree $tree,
+        IUserSession $userSession,
+        \OCP\Files\Folder $userFolder,
+        \OCP\Share\IManager $shareManager
+    ) {
+        $this->tree = $tree;
+        $this->shareManager = $shareManager;
+        $this->userFolder = $userFolder;
+        $this->userId = $userSession->getUser()->getUID();
+        $this->cachedShareTypes = [];
+    }
+
+    /**
+     * 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
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::SHARETYPES_PROPERTYNAME] = ShareTypeList::class;
+        $server->protectedProperties[] = self::SHARETYPES_PROPERTYNAME;
+
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+    }
+
+    /**
+     * Return a list of share types for outgoing shares
+     *
+     * @param \OCP\Files\Node $node file node
+     *
+     * @return int[] array of share types
+     */
+    private function getShareTypes(\OCP\Files\Node $node) {
+        $shareTypes = [];
+        $requestedShareTypes = [
+            \OCP\Share::SHARE_TYPE_USER,
+            \OCP\Share::SHARE_TYPE_GROUP,
+            \OCP\Share::SHARE_TYPE_LINK,
+            \OCP\Share::SHARE_TYPE_REMOTE,
+            \OCP\Share::SHARE_TYPE_EMAIL,
+            \OCP\Share::SHARE_TYPE_ROOM,
+            \OCP\Share::SHARE_TYPE_CIRCLE,
+        ];
+        foreach ($requestedShareTypes as $requestedShareType) {
+            // one of each type is enough to find out about the types
+            $shares = $this->shareManager->getSharesBy(
+                $this->userId,
+                $requestedShareType,
+                $node,
+                false,
+                1
+            );
+            if (!empty($shares)) {
+                $shareTypes[] = $requestedShareType;
+            }
+        }
+        return $shareTypes;
+    }
+
+    private function getSharesTypesInFolder(\OCP\Files\Folder $node) {
+        $shares = $this->shareManager->getSharesInFolder(
+            $this->userId,
+            $node,
+            true
+        );
+
+        $shareTypesByFileId = [];
+
+        foreach($shares as $fileId => $sharesForFile) {
+            $types = array_map(function(IShare $share) {
+                return $share->getShareType();
+            }, $sharesForFile);
+            $types = array_unique($types);
+            sort($types);
+            $shareTypesByFileId[$fileId] = $types;
+        }
+
+        return $shareTypesByFileId;
+    }
+
+    /**
+     * Adds shares to propfind response
+     *
+     * @param PropFind $propFind propfind object
+     * @param \Sabre\DAV\INode $sabreNode sabre node
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $sabreNode
+    ) {
+        if (!($sabreNode instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
+
+        // need prefetch ?
+        if ($sabreNode instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && !is_null($propFind->getStatus(self::SHARETYPES_PROPERTYNAME))
+        ) {
+            $folderNode = $this->userFolder->get($sabreNode->getPath());
+
+            $childShares = $this->getSharesTypesInFolder($folderNode);
+            $this->cachedFolders[] = $sabreNode->getPath();
+            $this->cachedShareTypes[$folderNode->getId()] = $this->getShareTypes($folderNode);
+            foreach ($childShares as $id => $shares) {
+                $this->cachedShareTypes[$id] = $shares;
+            }
+        }
+
+        $propFind->handle(self::SHARETYPES_PROPERTYNAME, function () use ($sabreNode) {
+            if (isset($this->cachedShareTypes[$sabreNode->getId()])) {
+                $shareTypes = $this->cachedShareTypes[$sabreNode->getId()];
+            } else {
+                list($parentPath,) = \Sabre\Uri\split($sabreNode->getPath());
+                if ($parentPath === '') {
+                    $parentPath = '/';
+                }
+                // if we already cached the folder this file is in we know there are no shares for this file
+                if (array_search($parentPath, $this->cachedFolders) === false) {
+                    $node = $this->userFolder->get($sabreNode->getPath());
+                    $shareTypes = $this->getShareTypes($node);
+                } else {
+                    return [];
+                }
+            }
+
+            return new ShareTypeList($shareTypes);
+        });
+    }
 }

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

Braces +3 added lines, -1 removed lines

@@ -245,7 +245,9 @@
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
 		// Only handle valid files
 		$node = $this->tree->getNodeForPath($request->getPath());
-		if (!($node instanceof IFile)) return;
+		if (!($node instanceof IFile)) {
+		    return;
+		}
 
 		// adds a 'Content-Disposition: attachment' header in case no disposition
 		// header has been set before

Indentation +444 added lines, -444 removed lines

@@ -51,452 +51,452 @@
 
 class FilesPlugin extends ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
-	const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
-	const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
-	const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
-	const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
-	const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
-	const GETETAG_PROPERTYNAME = '{DAV:}getetag';
-	const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
-	const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
-	const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
-	const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
-	const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
-	const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
-	const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
-	const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
-	const SHARE_NOTE = '{http://nextcloud.org/ns}note';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * Whether this is public webdav.
-	 * If true, some returned information will be stripped off.
-	 *
-	 * @var bool
-	 */
-	private $isPublic;
-
-	/**
-	 * @var bool
-	 */
-	private $downloadAttachment;
-
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/**
-	 * @var IRequest
-	 */
-	private $request;
-
-	/**
-	 * @var IPreview
-	 */
-	private $previewManager;
-
-	/**
-	 * @param Tree $tree
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 * @param IPreview $previewManager
-	 * @param bool $isPublic
-	 * @param bool $downloadAttachment
-	 */
-	public function __construct(Tree $tree,
-								IConfig $config,
-								IRequest $request,
-								IPreview $previewManager,
-								$isPublic = false,
-								$downloadAttachment = true) {
-		$this->tree = $tree;
-		$this->config = $config;
-		$this->request = $request;
-		$this->isPublic = $isPublic;
-		$this->downloadAttachment = $downloadAttachment;
-		$this->previewManager = $previewManager;
-	}
-
-	/**
-	 * 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) {
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
-		$server->protectedProperties[] = self::FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::OCM_SHARE_PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
-		$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
-		$server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
-		$server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
-		$server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
-		$server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME;
-		$server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_NOTE;
-
-		// normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
-		$allowedProperties = ['{DAV:}getetag'];
-		$server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
-
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
-		$this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
-		$this->server->on('afterResponse', function($request, ResponseInterface $response) {
-			$body = $response->getBody();
-			if (is_resource($body)) {
-				fclose($body);
-			}
-		});
-		$this->server->on('beforeMove', [$this, 'checkMove']);
-	}
-
-	/**
-	 * Plugin that checks if a move can actually be performed.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 * @throws Forbidden
-	 * @throws NotFound
-	 */
-	function checkMove($source, $destination) {
-		$sourceNode = $this->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof Node) {
-			return;
-		}
-		list($sourceDir,) = \Sabre\Uri\split($source);
-		list($destinationDir,) = \Sabre\Uri\split($destination);
-
-		if ($sourceDir !== $destinationDir) {
-			$sourceNodeFileInfo = $sourceNode->getFileInfo();
-			if ($sourceNodeFileInfo === null) {
-				throw new NotFound($source . ' does not exist');
- 			}
-
-			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
-			}
-		}
-	}
-
-	/**
-	 * This sets a cookie to be able to recognize the start of the download
-	 * the content must not be longer than 32 characters and must only contain
-	 * alphanumeric characters
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-
-		/**
-		 * this sets a cookie to be able to recognize the start of the download
-		 * the content must not be longer than 32 characters and must only contain
-		 * alphanumeric characters
-		 */
-		if (isset($queryParams['downloadStartSecret'])) {
-			$token = $queryParams['downloadStartSecret'];
-			if (!isset($token[32])
-				&& preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
-				// FIXME: use $response->setHeader() instead
-				setcookie('ocDownloadStarted', $token, time() + 20, '/');
-			}
-		}
-	}
-
-	/**
-	 * Add headers to file download
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		// Only handle valid files
-		$node = $this->tree->getNodeForPath($request->getPath());
-		if (!($node instanceof IFile)) return;
-
-		// adds a 'Content-Disposition: attachment' header in case no disposition
-		// header has been set before
-		if ($this->downloadAttachment &&
-			$response->getHeader('Content-Disposition') === null) {
-			$filename = $node->getName();
-			if ($this->request->isUserAgent(
-				[
-					Request::USER_AGENT_IE,
-					Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-					Request::USER_AGENT_FREEBOX,
-				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
-			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
-			}
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			//Add OC-Checksum header
-			/** @var $node File */
-			$checksum = $node->getChecksum();
-			if ($checksum !== null && $checksum !== '') {
-				$response->addHeader('OC-Checksum', $checksum);
-			}
-		}
-	}
-
-	/**
-	 * Adds all ownCloud-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
-
-		$httpRequest = $this->server->httpRequest;
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			/**
-			 * This was disabled, because it made dir listing throw an exception,
-			 * so users were unable to navigate into folders where one subitem
-			 * is blocked by the files_accesscontrol app, see:
-			 * https://github.com/nextcloud/files_accesscontrol/issues/65
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
+    const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
+    const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
+    const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
+    const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
+    const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
+    const GETETAG_PROPERTYNAME = '{DAV:}getetag';
+    const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
+    const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
+    const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
+    const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
+    const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
+    const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
+    const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
+    const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
+    const SHARE_NOTE = '{http://nextcloud.org/ns}note';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * Whether this is public webdav.
+     * If true, some returned information will be stripped off.
+     *
+     * @var bool
+     */
+    private $isPublic;
+
+    /**
+     * @var bool
+     */
+    private $downloadAttachment;
+
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /**
+     * @var IRequest
+     */
+    private $request;
+
+    /**
+     * @var IPreview
+     */
+    private $previewManager;
+
+    /**
+     * @param Tree $tree
+     * @param IConfig $config
+     * @param IRequest $request
+     * @param IPreview $previewManager
+     * @param bool $isPublic
+     * @param bool $downloadAttachment
+     */
+    public function __construct(Tree $tree,
+                                IConfig $config,
+                                IRequest $request,
+                                IPreview $previewManager,
+                                $isPublic = false,
+                                $downloadAttachment = true) {
+        $this->tree = $tree;
+        $this->config = $config;
+        $this->request = $request;
+        $this->isPublic = $isPublic;
+        $this->downloadAttachment = $downloadAttachment;
+        $this->previewManager = $previewManager;
+    }
+
+    /**
+     * 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) {
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
+        $server->protectedProperties[] = self::FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::OCM_SHARE_PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SIZE_PROPERTYNAME;
+        $server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
+        $server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
+        $server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
+        $server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
+        $server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME;
+        $server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_NOTE;
+
+        // normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
+        $allowedProperties = ['{DAV:}getetag'];
+        $server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
+
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+        $this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+        $this->server->on('afterBind', array($this, 'sendFileIdHeader'));
+        $this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
+        $this->server->on('afterMethod:GET', [$this,'httpGet']);
+        $this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
+        $this->server->on('afterResponse', function($request, ResponseInterface $response) {
+            $body = $response->getBody();
+            if (is_resource($body)) {
+                fclose($body);
+            }
+        });
+        $this->server->on('beforeMove', [$this, 'checkMove']);
+    }
+
+    /**
+     * Plugin that checks if a move can actually be performed.
+     *
+     * @param string $source source path
+     * @param string $destination destination path
+     * @throws Forbidden
+     * @throws NotFound
+     */
+    function checkMove($source, $destination) {
+        $sourceNode = $this->tree->getNodeForPath($source);
+        if (!$sourceNode instanceof Node) {
+            return;
+        }
+        list($sourceDir,) = \Sabre\Uri\split($source);
+        list($destinationDir,) = \Sabre\Uri\split($destination);
+
+        if ($sourceDir !== $destinationDir) {
+            $sourceNodeFileInfo = $sourceNode->getFileInfo();
+            if ($sourceNodeFileInfo === null) {
+                throw new NotFound($source . ' does not exist');
+                }
+
+            if (!$sourceNodeFileInfo->isDeletable()) {
+                throw new Forbidden($source . " cannot be deleted");
+            }
+        }
+    }
+
+    /**
+     * This sets a cookie to be able to recognize the start of the download
+     * the content must not be longer than 32 characters and must only contain
+     * alphanumeric characters
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
+        $queryParams = $request->getQueryParameters();
+
+        /**
+         * this sets a cookie to be able to recognize the start of the download
+         * the content must not be longer than 32 characters and must only contain
+         * alphanumeric characters
+         */
+        if (isset($queryParams['downloadStartSecret'])) {
+            $token = $queryParams['downloadStartSecret'];
+            if (!isset($token[32])
+                && preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
+                // FIXME: use $response->setHeader() instead
+                setcookie('ocDownloadStarted', $token, time() + 20, '/');
+            }
+        }
+    }
+
+    /**
+     * Add headers to file download
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
+        // Only handle valid files
+        $node = $this->tree->getNodeForPath($request->getPath());
+        if (!($node instanceof IFile)) return;
+
+        // adds a 'Content-Disposition: attachment' header in case no disposition
+        // header has been set before
+        if ($this->downloadAttachment &&
+            $response->getHeader('Content-Disposition') === null) {
+            $filename = $node->getName();
+            if ($this->request->isUserAgent(
+                [
+                    Request::USER_AGENT_IE,
+                    Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                    Request::USER_AGENT_FREEBOX,
+                ])) {
+                $response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+            } else {
+                $response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
+                                                        . '; filename="' . rawurlencode($filename) . '"');
+            }
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            //Add OC-Checksum header
+            /** @var $node File */
+            $checksum = $node->getChecksum();
+            if ($checksum !== null && $checksum !== '') {
+                $response->addHeader('OC-Checksum', $checksum);
+            }
+        }
+    }
+
+    /**
+     * Adds all ownCloud-specific properties
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
+
+        $httpRequest = $this->server->httpRequest;
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            /**
+             * This was disabled, because it made dir listing throw an exception,
+             * so users were unable to navigate into folders where one subitem
+             * is blocked by the files_accesscontrol app, see:
+             * https://github.com/nextcloud/files_accesscontrol/issues/65
 			if (!$node->getFileInfo()->isReadable()) {
 				// avoid detecting files through this means
 				throw new NotFound();
 			}
-			 */
-
-			$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
-				return $node->getFileId();
-			});
-
-			$propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
-				return $node->getInternalFileId();
-			});
-
-			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function() use ($node) {
-				$perms = $node->getDavPermissions();
-				if ($this->isPublic) {
-					// remove mount information
-					$perms = str_replace(['S', 'M'], '', $perms);
-				}
-				return $perms;
-			});
-
-			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
-				return $node->getSharePermissions(
-					$httpRequest->getRawServerValue('PHP_AUTH_USER')
-				);
-			});
-
-			$propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
-				$ncPermissions = $node->getSharePermissions(
-					$httpRequest->getRawServerValue('PHP_AUTH_USER')
-				);
-				$ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
-				return json_encode($ocmPermissions);
-			});
-
-			$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
-				return $node->getETag();
-			});
-
-			$propFind->handle(self::OWNER_ID_PROPERTYNAME, function() use ($node) {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getUID();
-				}
-			});
-			$propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function() use ($node) {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getDisplayName();
-				}
-			});
-
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
-				return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
-			});
-			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
-				return $node->getSize();
-			});
-			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
-				return $node->getFileInfo()->getMountPoint()->getMountType();
-			});
-
-			$propFind->handle(self::SHARE_NOTE, function() use ($node, $httpRequest) {
-				return $node->getNoteFromShare(
-					$httpRequest->getRawServerValue('PHP_AUTH_USER')
-				);
-			});
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
-				return $this->config->getSystemValue('data-fingerprint', '');
-			});
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function() use ($node) {
-				/** @var $node \OCA\DAV\Connector\Sabre\File */
-				try {
-					$directDownloadUrl = $node->getDirectDownload();
-					if (isset($directDownloadUrl['url'])) {
-						return $directDownloadUrl['url'];
-					}
-				} catch (StorageNotAvailableException $e) {
-					return false;
-				} catch (ForbiddenException $e) {
-					return false;
-				}
-				return false;
-			});
-
-			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
-				$checksum = $node->getChecksum();
-				if ($checksum === NULL || $checksum === '') {
-					return null;
-				}
-
-				return new ChecksumList($checksum);
-			});
-
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory) {
-			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
-				return $node->getSize();
-			});
-
-			$propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) {
-				return $node->getFileInfo()->isEncrypted() ? '1' : '0';
-			});
-		}
-	}
-
-	/**
-	 * translate Nextcloud permissions to OCM Permissions
-	 *
-	 * @param $ncPermissions
-	 * @return array
-	 */
-	protected function ncPermissions2ocmPermissions($ncPermissions) {
-
-		$ocmPermissions = [];
-
-		if ($ncPermissions & Constants::PERMISSION_SHARE) {
-			$ocmPermissions[] = 'share';
-		}
-
-		if ($ncPermissions & Constants::PERMISSION_READ) {
-			$ocmPermissions[] = 'read';
-		}
-
-		if (($ncPermissions & Constants::PERMISSION_CREATE) ||
-			($ncPermissions & Constants::PERMISSION_UPDATE)) {
-			$ocmPermissions[] = 'write';
-		}
-
-		return $ocmPermissions;
-
-	}
-
-	/**
-	 * Update ownCloud-specific properties
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
-
-		$propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($node) {
-			if (empty($time)) {
-				return false;
-			}
-			$node->touch($time);
-			return true;
-		});
-		$propPatch->handle(self::GETETAG_PROPERTYNAME, function($etag) use ($node) {
-			if (empty($etag)) {
-				return false;
-			}
-			if ($node->setEtag($etag) !== -1) {
-				return true;
-			}
-			return false;
-		});
-	}
-
-	/**
-	 * @param string $filePath
-	 * @param \Sabre\DAV\INode $node
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
-		// chunked upload handling
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			list($path, $name) = \Sabre\Uri\split($filePath);
-			$info = \OC_FileChunking::decodeName($name);
-			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
-			}
-		}
-
-		// we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
-		if (!$this->server->tree->nodeExists($filePath)) {
-			return;
-		}
-		$node = $this->server->tree->getNodeForPath($filePath);
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			$fileId = $node->getFileId();
-			if (!is_null($fileId)) {
-				$this->server->httpResponse->setHeader('OC-FileId', $fileId);
-			}
-		}
-	}
+             */
+
+            $propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
+                return $node->getFileId();
+            });
+
+            $propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
+                return $node->getInternalFileId();
+            });
+
+            $propFind->handle(self::PERMISSIONS_PROPERTYNAME, function() use ($node) {
+                $perms = $node->getDavPermissions();
+                if ($this->isPublic) {
+                    // remove mount information
+                    $perms = str_replace(['S', 'M'], '', $perms);
+                }
+                return $perms;
+            });
+
+            $propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
+                return $node->getSharePermissions(
+                    $httpRequest->getRawServerValue('PHP_AUTH_USER')
+                );
+            });
+
+            $propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
+                $ncPermissions = $node->getSharePermissions(
+                    $httpRequest->getRawServerValue('PHP_AUTH_USER')
+                );
+                $ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
+                return json_encode($ocmPermissions);
+            });
+
+            $propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
+                return $node->getETag();
+            });
+
+            $propFind->handle(self::OWNER_ID_PROPERTYNAME, function() use ($node) {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getUID();
+                }
+            });
+            $propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function() use ($node) {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getDisplayName();
+                }
+            });
+
+            $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+                return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
+            });
+            $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
+                return $node->getSize();
+            });
+            $propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
+                return $node->getFileInfo()->getMountPoint()->getMountType();
+            });
+
+            $propFind->handle(self::SHARE_NOTE, function() use ($node, $httpRequest) {
+                return $node->getNoteFromShare(
+                    $httpRequest->getRawServerValue('PHP_AUTH_USER')
+                );
+            });
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            $propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
+                return $this->config->getSystemValue('data-fingerprint', '');
+            });
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            $propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function() use ($node) {
+                /** @var $node \OCA\DAV\Connector\Sabre\File */
+                try {
+                    $directDownloadUrl = $node->getDirectDownload();
+                    if (isset($directDownloadUrl['url'])) {
+                        return $directDownloadUrl['url'];
+                    }
+                } catch (StorageNotAvailableException $e) {
+                    return false;
+                } catch (ForbiddenException $e) {
+                    return false;
+                }
+                return false;
+            });
+
+            $propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
+                $checksum = $node->getChecksum();
+                if ($checksum === NULL || $checksum === '') {
+                    return null;
+                }
+
+                return new ChecksumList($checksum);
+            });
+
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory) {
+            $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
+                return $node->getSize();
+            });
+
+            $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) {
+                return $node->getFileInfo()->isEncrypted() ? '1' : '0';
+            });
+        }
+    }
+
+    /**
+     * translate Nextcloud permissions to OCM Permissions
+     *
+     * @param $ncPermissions
+     * @return array
+     */
+    protected function ncPermissions2ocmPermissions($ncPermissions) {
+
+        $ocmPermissions = [];
+
+        if ($ncPermissions & Constants::PERMISSION_SHARE) {
+            $ocmPermissions[] = 'share';
+        }
+
+        if ($ncPermissions & Constants::PERMISSION_READ) {
+            $ocmPermissions[] = 'read';
+        }
+
+        if (($ncPermissions & Constants::PERMISSION_CREATE) ||
+            ($ncPermissions & Constants::PERMISSION_UPDATE)) {
+            $ocmPermissions[] = 'write';
+        }
+
+        return $ocmPermissions;
+
+    }
+
+    /**
+     * Update ownCloud-specific properties
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
+
+        $propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($node) {
+            if (empty($time)) {
+                return false;
+            }
+            $node->touch($time);
+            return true;
+        });
+        $propPatch->handle(self::GETETAG_PROPERTYNAME, function($etag) use ($node) {
+            if (empty($etag)) {
+                return false;
+            }
+            if ($node->setEtag($etag) !== -1) {
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * @param string $filePath
+     * @param \Sabre\DAV\INode $node
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
+        // chunked upload handling
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            list($path, $name) = \Sabre\Uri\split($filePath);
+            $info = \OC_FileChunking::decodeName($name);
+            if (!empty($info)) {
+                $filePath = $path . '/' . $info['name'];
+            }
+        }
+
+        // we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
+        if (!$this->server->tree->nodeExists($filePath)) {
+            return;
+        }
+        $node = $this->server->tree->getNodeForPath($filePath);
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            $fileId = $node->getFileId();
+            if (!is_null($fileId)) {
+                $this->server->httpResponse->setHeader('OC-FileId', $fileId);
+            }
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -173,7 +173,7 @@ 
 		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
 		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
+		$this->server->on('afterMethod:GET', [$this, 'httpGet']);
 		$this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
 		$this->server->on('afterResponse', function($request, ResponseInterface $response) {
 			$body = $response->getBody();
@@ -203,11 +203,11 @@ 
 		if ($sourceDir !== $destinationDir) {
 			$sourceNodeFileInfo = $sourceNode->getFileInfo();
 			if ($sourceNodeFileInfo === null) {
-				throw new NotFound($source . ' does not exist');
+				throw new NotFound($source.' does not exist');
  			}
 
 			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
+				throw new Forbidden($source." cannot be deleted");
 			}
 		}
 	}
@@ -260,10 +260,10 @@ 
 					Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 					Request::USER_AGENT_FREEBOX,
 				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename="'.rawurlencode($filename).'"');
 			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\''.rawurlencode($filename)
+													 . '; filename="'.rawurlencode($filename).'"');
 			}
 		}
 
@@ -352,13 +352,13 @@ 
 				}
 			});
 
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 				return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
 			});
 			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
 				return $node->getSize();
 			});
-			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function() use ($node) {
 				return $node->getFileInfo()->getMountPoint()->getMountType();
 			});
 
@@ -483,7 +483,7 @@ 
 			list($path, $name) = \Sabre\Uri\split($filePath);
 			$info = \OC_FileChunking::decodeName($name);
 			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
+				$filePath = $path.'/'.$info['name'];
 			}
 		}
 

apps/dav/lib/Connector/LegacyDAVACL.php

Spacing +2 added lines, -2 removed lines

@@ -60,9 +60,9 @@
 
 	public function propFind(PropFind $propFind, INode $node) {
 		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
+		$propFind->handle('{DAV:}current-user-principal', function() {
 			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
+				return new Principal(Principal::HREF, $url.'/');
 			} else {
 				return new Principal(Principal::UNAUTHENTICATED);
 			}

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 	public function getCurrentUserPrincipals() {
 		$principalV2 = $this->getCurrentUserPrincipal();
 
-		if (is_null($principalV2)) return [];
+		if (is_null($principalV2)) {
+		    return [];
+		}
 
 		$principalV1 = $this->convertPrincipal($principalV2, false);
 		return array_merge(

Indentation +33 added lines, -33 removed lines

@@ -32,42 +32,42 @@
 
 class LegacyDAVACL extends DavAclPlugin {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getCurrentUserPrincipals() {
-		$principalV2 = $this->getCurrentUserPrincipal();
+    /**
+     * @inheritdoc
+     */
+    public function getCurrentUserPrincipals() {
+        $principalV2 = $this->getCurrentUserPrincipal();
 
-		if (is_null($principalV2)) return [];
+        if (is_null($principalV2)) return [];
 
-		$principalV1 = $this->convertPrincipal($principalV2, false);
-		return array_merge(
-			[
-				$principalV2,
-				$principalV1
-			],
-			$this->getPrincipalMembership($principalV1)
-		);
-	}
+        $principalV1 = $this->convertPrincipal($principalV2, false);
+        return array_merge(
+            [
+                $principalV2,
+                $principalV1
+            ],
+            $this->getPrincipalMembership($principalV1)
+        );
+    }
 
-	private function convertPrincipal($principal, $toV2) {
-		list(, $name) = \Sabre\Uri\split($principal);
-		if ($toV2) {
-			return "principals/users/$name";
-		}
-		return "principals/$name";
-	}
+    private function convertPrincipal($principal, $toV2) {
+        list(, $name) = \Sabre\Uri\split($principal);
+        if ($toV2) {
+            return "principals/users/$name";
+        }
+        return "principals/$name";
+    }
 
-	public function propFind(PropFind $propFind, INode $node) {
-		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
-			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
-			} else {
-				return new Principal(Principal::UNAUTHENTICATED);
-			}
-		});
+    public function propFind(PropFind $propFind, INode $node) {
+        /* Overload current-user-principal */
+        $propFind->handle('{DAV:}current-user-principal', function () {
+            if ($url = parent::getCurrentUserPrincipal()) {
+                return new Principal(Principal::HREF, $url . '/');
+            } else {
+                return new Principal(Principal::UNAUTHENTICATED);
+            }
+        });
 
-		return parent::propFind($propFind, $node);
-	}
+        return parent::propFind($propFind, $node);
+    }
 }

apps/dav/lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
 
 		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+		$dispatcher->addListener(IUser::class.'::firstLogin', function($event) use ($hm) {
 			if ($event instanceof GenericEvent) {
 				$hm->firstLogin($event->getSubject());
 			}

Indentation +178 added lines, -178 removed lines

@@ -43,185 +43,185 @@
 
 class Application extends App {
 
-	/**
-	 * Application constructor.
-	 */
-	public function __construct() {
-		parent::__construct('dav');
-
-		$container = $this->getContainer();
-		$server = $container->getServer();
-
-		$container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) {
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$server->getLogger()
-			);
-		});
-
-		/*
+    /**
+     * Application constructor.
+     */
+    public function __construct() {
+        parent::__construct('dav');
+
+        $container = $this->getContainer();
+        $server = $container->getServer();
+
+        $container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) {
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $server->getLogger()
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
-	}
-
-	/**
-	 * @param IContactsManager $contactsManager
-	 * @param string $userID
-	 */
-	public function setupContactsProvider(IContactsManager $contactsManager, $userID) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query(ContactsManager::class);
-		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	/**
-	 * @param IContactsManager $contactsManager
-	 */
-	public function setupSystemContactsProvider(IContactsManager $contactsManager) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query(ContactsManager::class);
-		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
-
-	/**
-	 * @param ICalendarManager $calendarManager
-	 * @param string $userId
-	 */
-	public function setupCalendarProvider(ICalendarManager $calendarManager, $userId) {
-		$cm = $this->getContainer()->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerHooks() {
-		/** @var HookManager $hm */
-		$hm = $this->getContainer()->query(HookManager::class);
-		$hm->setup();
-
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
-
-		// carddav/caldav sync event setup
-		$listener = function($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query(BirthdayService::class);
-				$b->onCardChanged(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri'),
-					$event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query(BirthdayService::class);
-				$b->onCardDeleted(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		});
-
-		$clearPhotoCache = function($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $this->getContainer()->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
-
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) {
-			$user = $event->getSubject();
-			$syncService = $this->getContainer()->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarAdd(
-				$event->getArgument('calendarData')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarUpdate(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('propertyMutations')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarDelete(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
-
-		$listener = function(GenericEvent $event, $eventName) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-
-			$subject = Event::SUBJECT_OBJECT_ADD;
-			if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_UPDATE;
-			} else if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_DELETE;
-			}
-			$backend->onTouchCalendarObject(
-				$subject,
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('objectData')
-			);
-		};
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
-	}
-
-	public function getSyncService() {
-		return $this->getContainer()->query(SyncService::class);
-	}
+        $container->registerCapability(Capabilities::class);
+    }
+
+    /**
+     * @param IContactsManager $contactsManager
+     * @param string $userID
+     */
+    public function setupContactsProvider(IContactsManager $contactsManager, $userID) {
+        /** @var ContactsManager $cm */
+        $cm = $this->getContainer()->query(ContactsManager::class);
+        $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    /**
+     * @param IContactsManager $contactsManager
+     */
+    public function setupSystemContactsProvider(IContactsManager $contactsManager) {
+        /** @var ContactsManager $cm */
+        $cm = $this->getContainer()->query(ContactsManager::class);
+        $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
+
+    /**
+     * @param ICalendarManager $calendarManager
+     * @param string $userId
+     */
+    public function setupCalendarProvider(ICalendarManager $calendarManager, $userId) {
+        $cm = $this->getContainer()->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerHooks() {
+        /** @var HookManager $hm */
+        $hm = $this->getContainer()->query(HookManager::class);
+        $hm->setup();
+
+        $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
+
+        // carddav/caldav sync event setup
+        $listener = function($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $this->getContainer()->query(BirthdayService::class);
+                $b->onCardChanged(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri'),
+                    $event->getArgument('cardData')
+                );
+            }
+        };
+
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $listener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $listener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $this->getContainer()->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        });
+
+        $clearPhotoCache = function($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $this->getContainer()->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) {
+            $user = $event->getSubject();
+            $syncService = $this->getContainer()->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarAdd(
+                $event->getArgument('calendarData')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarUpdate(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('propertyMutations')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarDelete(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
+
+        $listener = function(GenericEvent $event, $eventName) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+
+            $subject = Event::SUBJECT_OBJECT_ADD;
+            if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_UPDATE;
+            } else if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_DELETE;
+            }
+            $backend->onTouchCalendarObject(
+                $subject,
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('objectData')
+            );
+        };
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
+    }
+
+    public function getSyncService() {
+        return $this->getContainer()->query(SyncService::class);
+    }
 
 }

apps/dav/lib/Migration/FixBirthdayCalendarComponent.php

Indentation +31 added lines, -31 removed lines

@@ -28,35 +28,35 @@
 
 class FixBirthdayCalendarComponent implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * FixBirthdayCalendarComponent constructor.
-	 *
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Fix component of birthday calendars';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$query = $this->connection->getQueryBuilder();
-		$updated = $query->update('calendars')
-			->set('components', $query->createNamedParameter('VEVENT'))
-			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
-			->execute();
-
-		$output->info("$updated birthday calendars updated.");
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * FixBirthdayCalendarComponent constructor.
+     *
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Fix component of birthday calendars';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $query = $this->connection->getQueryBuilder();
+        $updated = $query->update('calendars')
+            ->set('components', $query->createNamedParameter('VEVENT'))
+            ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+            ->execute();
+
+        $output->info("$updated birthday calendars updated.");
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function() use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function() use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-	}
+        $progress->finish();
+        $output->writeln('');
+    }
 }

apps/dav/lib/Command/CreateAddressBook.php

Indentation +34 added lines, -34 removed lines

@@ -36,43 +36,43 @@
 
 class CreateAddressBook extends Command {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var CardDavBackend */
-	private $cardDavBackend;
+    /** @var CardDavBackend */
+    private $cardDavBackend;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param CardDavBackend $cardDavBackend
-	 */
-	function __construct(IUserManager $userManager,
-						 CardDavBackend $cardDavBackend
-	) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->cardDavBackend = $cardDavBackend;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param CardDavBackend $cardDavBackend
+     */
+    function __construct(IUserManager $userManager,
+                            CardDavBackend $cardDavBackend
+    ) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->cardDavBackend = $cardDavBackend;
+    }
 
-	protected function configure() {
-		$this
-				->setName('dav:create-addressbook')
-				->setDescription('Create a dav addressbook')
-				->addArgument('user',
-						InputArgument::REQUIRED,
-						'User for whom the addressbook will be created')
-				->addArgument('name',
-						InputArgument::REQUIRED,
-						'Name of the addressbook');
-	}
+    protected function configure() {
+        $this
+                ->setName('dav:create-addressbook')
+                ->setDescription('Create a dav addressbook')
+                ->addArgument('user',
+                        InputArgument::REQUIRED,
+                        'User for whom the addressbook will be created')
+                ->addArgument('name',
+                        InputArgument::REQUIRED,
+                        'Name of the addressbook');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getArgument('user');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> in unknown.");
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getArgument('user');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> in unknown.");
+        }
 
-		$name = $input->getArgument('name');
-		$this->cardDavBackend->createAddressBook("principals/users/$user", $name, []);
-	}
+        $name = $input->getArgument('name');
+        $this->cardDavBackend->createAddressBook("principals/users/$user", $name, []);
+    }
 }

apps/dav/lib/Capabilities.php

Indentation +7 added lines, -7 removed lines

@@ -26,11 +26,11 @@
 
 class Capabilities implements ICapability {
 
-	public function getCapabilities() {
-		return [
-			'dav' => [
-				'chunking' => '1.0',
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'dav' => [
+                'chunking' => '1.0',
+            ]
+        ];
+    }
 }

apps/dav/lib/Files/BrowserErrorPagePlugin.php

Indentation +69 added lines, -69 removed lines

@@ -31,78 +31,78 @@
 use Sabre\DAV\ServerPlugin;
 
 class BrowserErrorPagePlugin extends ServerPlugin {
-	/** @var Server */
-	private $server;
+    /** @var Server */
+    private $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 Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		$this->server = $server;
-		$server->on('exception', array($this, 'logException'), 1000);
-	}
+    /**
+     * 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
+     */
+    function initialize(Server $server) {
+        $this->server = $server;
+        $server->on('exception', array($this, 'logException'), 1000);
+    }
 
-	/**
-	 * @param IRequest $request
-	 * @return bool
-	 */
-	public static function isBrowserRequest(IRequest $request) {
-		if ($request->getMethod() !== 'GET') {
-			return false;
-		}
-		return $request->isUserAgent([
-			Request::USER_AGENT_IE,
-			Request::USER_AGENT_MS_EDGE,
-			Request::USER_AGENT_CHROME,
-			Request::USER_AGENT_FIREFOX,
-			Request::USER_AGENT_SAFARI,
-		]);
-	}
+    /**
+     * @param IRequest $request
+     * @return bool
+     */
+    public static function isBrowserRequest(IRequest $request) {
+        if ($request->getMethod() !== 'GET') {
+            return false;
+        }
+        return $request->isUserAgent([
+            Request::USER_AGENT_IE,
+            Request::USER_AGENT_MS_EDGE,
+            Request::USER_AGENT_CHROME,
+            Request::USER_AGENT_FIREFOX,
+            Request::USER_AGENT_SAFARI,
+        ]);
+    }
 
-	/**
-	 * @param \Exception $ex
-	 */
-	public function logException(\Exception $ex) {
-		if ($ex instanceof Exception) {
-			$httpCode = $ex->getHTTPCode();
-			$headers = $ex->getHTTPHeaders($this->server);
-		} else {
-			$httpCode = 500;
-			$headers = [];
-		}
-		$this->server->httpResponse->addHeaders($headers);
-		$this->server->httpResponse->setStatus($httpCode);
-		$body = $this->generateBody();
-		$this->server->httpResponse->setBody($body);
-		$this->sendResponse();
-	}
+    /**
+     * @param \Exception $ex
+     */
+    public function logException(\Exception $ex) {
+        if ($ex instanceof Exception) {
+            $httpCode = $ex->getHTTPCode();
+            $headers = $ex->getHTTPHeaders($this->server);
+        } else {
+            $httpCode = 500;
+            $headers = [];
+        }
+        $this->server->httpResponse->addHeaders($headers);
+        $this->server->httpResponse->setStatus($httpCode);
+        $body = $this->generateBody();
+        $this->server->httpResponse->setBody($body);
+        $this->sendResponse();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 * @return bool|string
-	 */
-	public function generateBody() {
-		$request = \OC::$server->getRequest();
-		$content = new OC_Template('dav', 'exception', 'guest');
-		$content->assign('title', $this->server->httpResponse->getStatusText());
-		$content->assign('remoteAddr', $request->getRemoteAddress());
-		$content->assign('requestID', $request->getId());
-		return $content->fetchPage();
-	}
+    /**
+     * @codeCoverageIgnore
+     * @return bool|string
+     */
+    public function generateBody() {
+        $request = \OC::$server->getRequest();
+        $content = new OC_Template('dav', 'exception', 'guest');
+        $content->assign('title', $this->server->httpResponse->getStatusText());
+        $content->assign('remoteAddr', $request->getRemoteAddress());
+        $content->assign('requestID', $request->getId());
+        return $content->fetchPage();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function sendResponse() {
-		$this->server->sapi->sendResponse($this->server->httpResponse);
-		exit();
-	}
+    /**
+     * @codeCoverageIgnore
+     */
+    public function sendResponse() {
+        $this->server->sapi->sendResponse($this->server->httpResponse);
+        exit();
+    }
 }