nextcloud / server

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

Indentation +8 added lines, -8 removed lines

@@ -31,15 +31,15 @@
  */
 class EntityTooLarge extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
 
-		return 413;
+        return 413;
 
-	}
+    }
 
 }

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

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
 		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
 		// we do not provide locking we emulate it using a fake locking plugin.
-		if($this->request->isUserAgent([
+		if ($this->request->isUserAgent([
 				'/WebDAVFS/',
 				'/Microsoft Office OneNote 2013/',
 				'/Microsoft-WebDAV-MiniRedir/',
@@ -130,7 +130,7 @@ 
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
+		$server->on('beforeMethod', function() use ($server, $objectTree, $viewCallBack) {
 			// ensure the skeleton is copied
 			$userFolder = \OC::$server->getUserFolder();
 			
@@ -162,7 +162,7 @@ 
 			);
 			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
 
-			if($this->userSession->isLoggedIn()) {
+			if ($this->userSession->isLoggedIn()) {
 				$server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
 				$server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
 					$objectTree,

Indentation +145 added lines, -145 removed lines

@@ -42,158 +42,158 @@
 use Sabre\DAV\Auth\Backend\BackendInterface;
 
 class ServerFactory {
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-	/** @var IDBConnection */
-	private $databaseConnection;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMountManager */
-	private $mountManager;
-	/** @var ITagManager */
-	private $tagManager;
-	/** @var IRequest */
-	private $request;
-	/** @var IPreview  */
-	private $previewManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+    /** @var IDBConnection */
+    private $databaseConnection;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMountManager */
+    private $mountManager;
+    /** @var ITagManager */
+    private $tagManager;
+    /** @var IRequest */
+    private $request;
+    /** @var IPreview  */
+    private $previewManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param IDBConnection $databaseConnection
-	 * @param IUserSession $userSession
-	 * @param IMountManager $mountManager
-	 * @param ITagManager $tagManager
-	 * @param IRequest $request
-	 * @param IPreview $previewManager
-	 */
-	public function __construct(
-		IConfig $config,
-		ILogger $logger,
-		IDBConnection $databaseConnection,
-		IUserSession $userSession,
-		IMountManager $mountManager,
-		ITagManager $tagManager,
-		IRequest $request,
-		IPreview $previewManager
-	) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->databaseConnection = $databaseConnection;
-		$this->userSession = $userSession;
-		$this->mountManager = $mountManager;
-		$this->tagManager = $tagManager;
-		$this->request = $request;
-		$this->previewManager = $previewManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param IDBConnection $databaseConnection
+     * @param IUserSession $userSession
+     * @param IMountManager $mountManager
+     * @param ITagManager $tagManager
+     * @param IRequest $request
+     * @param IPreview $previewManager
+     */
+    public function __construct(
+        IConfig $config,
+        ILogger $logger,
+        IDBConnection $databaseConnection,
+        IUserSession $userSession,
+        IMountManager $mountManager,
+        ITagManager $tagManager,
+        IRequest $request,
+        IPreview $previewManager
+    ) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->databaseConnection = $databaseConnection;
+        $this->userSession = $userSession;
+        $this->mountManager = $mountManager;
+        $this->tagManager = $tagManager;
+        $this->request = $request;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @param string $baseUri
-	 * @param string $requestUri
-	 * @param BackendInterface $authBackend
-	 * @param callable $viewCallBack callback that should return the view for the dav endpoint
-	 * @return Server
-	 */
-	public function createServer($baseUri,
-								 $requestUri,
-								 BackendInterface $authBackend,
-								 callable $viewCallBack) {
-		// Fire up server
-		$objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree();
-		$server = new \OCA\DAV\Connector\Sabre\Server($objectTree);
-		// Set URL explicitly due to reverse-proxy situations
-		$server->httpRequest->setUrl($requestUri);
-		$server->setBaseUri($baseUri);
+    /**
+     * @param string $baseUri
+     * @param string $requestUri
+     * @param BackendInterface $authBackend
+     * @param callable $viewCallBack callback that should return the view for the dav endpoint
+     * @return Server
+     */
+    public function createServer($baseUri,
+                                    $requestUri,
+                                    BackendInterface $authBackend,
+                                    callable $viewCallBack) {
+        // Fire up server
+        $objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree();
+        $server = new \OCA\DAV\Connector\Sabre\Server($objectTree);
+        // Set URL explicitly due to reverse-proxy situations
+        $server->httpRequest->setUrl($requestUri);
+        $server->setBaseUri($baseUri);
 
-		// Load plugins
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config));
-		$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
-		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if($this->request->isUserAgent([
-				'/WebDAVFS/',
-				'/Microsoft Office OneNote 2013/',
-				'/Microsoft-WebDAV-MiniRedir/',
-		])) {
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
-		}
+        // Load plugins
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config));
+        $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
+        // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
+        $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if($this->request->isUserAgent([
+                '/WebDAVFS/',
+                '/Microsoft Office OneNote 2013/',
+                '/Microsoft-WebDAV-MiniRedir/',
+        ])) {
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
-			$server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
+            $server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
-			// ensure the skeleton is copied
-			$userFolder = \OC::$server->getUserFolder();
+        // wait with registering these until auth is handled and the filesystem is setup
+        $server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
+            // ensure the skeleton is copied
+            $userFolder = \OC::$server->getUserFolder();
 			
-			/** @var \OC\Files\View $view */
-			$view = $viewCallBack($server);
-			if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
-				$rootInfo = $userFolder;
-			} else {
-				$rootInfo = $view->getFileInfo('');
-			}
+            /** @var \OC\Files\View $view */
+            $view = $viewCallBack($server);
+            if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
+                $rootInfo = $userFolder;
+            } else {
+                $rootInfo = $view->getFileInfo('');
+            }
 
-			// Create Nextcloud Dir
-			if ($rootInfo->getType() === 'dir') {
-				$root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree);
-			} else {
-				$root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo);
-			}
-			$objectTree->init($root, $view, $this->mountManager);
+            // Create Nextcloud Dir
+            if ($rootInfo->getType() === 'dir') {
+                $root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree);
+            } else {
+                $root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo);
+            }
+            $objectTree->init($root, $view, $this->mountManager);
 
-			$server->addPlugin(
-				new \OCA\DAV\Connector\Sabre\FilesPlugin(
-					$objectTree,
-					$this->config,
-					$this->request,
-					$this->previewManager,
-					false,
-					!$this->config->getSystemValue('debug', false)
-				)
-			);
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
+            $server->addPlugin(
+                new \OCA\DAV\Connector\Sabre\FilesPlugin(
+                    $objectTree,
+                    $this->config,
+                    $this->request,
+                    $this->previewManager,
+                    false,
+                    !$this->config->getSystemValue('debug', false)
+                )
+            );
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
 
-			if($this->userSession->isLoggedIn()) {
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
-					$objectTree,
-					$this->userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession));
-				$server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin(
-					$objectTree,
-					$view,
-					\OC::$server->getSystemTagManager(),
-					\OC::$server->getSystemTagObjectMapper(),
-					\OC::$server->getTagManager(),
-					$this->userSession,
-					\OC::$server->getGroupManager(),
-					$userFolder
-				));
-				// custom properties plugin must be the last one
-				$server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new \OCA\DAV\Connector\Sabre\CustomPropertiesBackend(
-							$objectTree,
-							$this->databaseConnection,
-							$this->userSession->getUser()
-						)
-					)
-				);
-			}
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin());
-		}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
-		return $server;
-	}
+            if($this->userSession->isLoggedIn()) {
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin(
+                    $objectTree,
+                    $this->userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession));
+                $server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin(
+                    $objectTree,
+                    $view,
+                    \OC::$server->getSystemTagManager(),
+                    \OC::$server->getSystemTagObjectMapper(),
+                    \OC::$server->getTagManager(),
+                    $this->userSession,
+                    \OC::$server->getGroupManager(),
+                    $userFolder
+                ));
+                // custom properties plugin must be the last one
+                $server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new \OCA\DAV\Connector\Sabre\CustomPropertiesBackend(
+                            $objectTree,
+                            $this->databaseConnection,
+                            $this->userSession->getUser()
+                        )
+                    )
+                );
+            }
+            $server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin());
+        }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
+        return $server;
+    }
 }

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

Spacing +5 added lines, -5 removed lines

@@ -130,7 +130,7 @@ 
 		// verify path of the target
 		$this->verifyPath();
 
-		$newPath = $parentPath . '/' . $newName;
+		$newPath = $parentPath.'/'.$newName;
 
 		$this->fileView->rename($this->path, $newPath);
 
@@ -151,7 +151,7 @@ 
 	public function getLastModified() {
 		$timestamp = $this->info->getMtime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return (int) $timestamp;
 		}
 		return $timestamp;
 	}
@@ -178,7 +178,7 @@ 
 	 * @return string
 	 */
 	public function getETag() {
-		return '"' . $this->info->getEtag() . '"';
+		return '"'.$this->info->getEtag().'"';
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 		if ($this->info->getId()) {
 			$instanceId = \OC_Util::getInstanceId();
 			$id = sprintf('%08d', $this->info->getId());
-			return $id . $instanceId;
+			return $id.$instanceId;
 		}
 
 		return null;
@@ -252,7 +252,7 @@ 
 
 		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$permissions = (int)$storage->getShare()->getPermissions();
+			$permissions = (int) $storage->getShare()->getPermissions();
 		} else {
 			$permissions = $storage->getPermissions($path);
 		}

Indentation +306 added lines, -306 removed lines

@@ -43,315 +43,315 @@
 
 abstract class Node implements \Sabre\DAV\INode {
 
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $fileView;
-
-	/**
-	 * The path to the current node
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * node properties cache
-	 *
-	 * @var array
-	 */
-	protected $property_cache = null;
-
-	/**
-	 * @var \OCP\Files\FileInfo
-	 */
-	protected $info;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
-	 * @param IManager $shareManager
-	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
-		$this->fileView = $view;
-		$this->path = $this->fileView->getRelativePath($info->getPath());
-		$this->info = $info;
-		if ($shareManager) {
-			$this->shareManager = $shareManager;
-		} else {
-			$this->shareManager = \OC::$server->getShareManager();
-		}
-	}
-
-	protected function refreshInfo() {
-		$this->info = $this->fileView->getFileInfo($this->path);
-	}
-
-	/**
-	 *  Returns the name of the node
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->info->getName();
-	}
-
-	/**
-	 * Returns the full path
-	 *
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function setName($name) {
-
-		// rename is only allowed if the update privilege is granted
-		if (!$this->info->isUpdateable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-
-		list($parentPath,) = \Sabre\HTTP\URLUtil::splitPath($this->path);
-		list(, $newName) = \Sabre\HTTP\URLUtil::splitPath($name);
-
-		// verify path of the target
-		$this->verifyPath();
-
-		$newPath = $parentPath . '/' . $newName;
-
-		$this->fileView->rename($this->path, $newPath);
-
-		$this->path = $newPath;
-
-		$this->refreshInfo();
-	}
-
-	public function setPropertyCache($property_cache) {
-		$this->property_cache = $property_cache;
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int timestamp as integer
-	 */
-	public function getLastModified() {
-		$timestamp = $this->info->getMtime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
-
-	/**
-	 *  sets the last modification time of the file (mtime) to the value given
-	 *  in the second parameter or to now if the second param is empty.
-	 *  Even if the modification time is set to a custom value the access time is set to now.
-	 */
-	public function touch($mtime) {
-		$this->fileView->touch($this->path, $mtime);
-		$this->refreshInfo();
-	}
-
-	/**
-	 * Returns the ETag for a file
-	 *
-	 * An ETag is a unique identifier representing the current version of the
-	 * file. If the file changes, the ETag MUST change.  The ETag is an
-	 * arbitrary string, but MUST be surrounded by double-quotes.
-	 *
-	 * Return null if the ETag can not effectively be determined
-	 *
-	 * @return string
-	 */
-	public function getETag() {
-		return '"' . $this->info->getEtag() . '"';
-	}
-
-	/**
-	 * Sets the ETag
-	 *
-	 * @param string $etag
-	 *
-	 * @return int file id of updated file or -1 on failure
-	 */
-	public function setETag($etag) {
-		return $this->fileView->putFileInfo($this->path, array('etag' => $etag));
-	}
-
-	/**
-	 * Returns the size of the node, in bytes
-	 *
-	 * @return integer
-	 */
-	public function getSize() {
-		return $this->info->getSize();
-	}
-
-	/**
-	 * Returns the cache's file id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->info->getId();
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getFileId() {
-		if ($this->info->getId()) {
-			$instanceId = \OC_Util::getInstanceId();
-			$id = sprintf('%08d', $this->info->getId());
-			return $id . $instanceId;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return integer
-	 */
-	public function getInternalFileId() {
-		return $this->info->getId();
-	}
-
-	/**
-	 * @param string $user
-	 * @return int
-	 */
-	public function getSharePermissions($user) {
-
-		// check of we access a federated share
-		if ($user !== null) {
-			try {
-				$share = $this->shareManager->getShareByToken($user);
-				return $share->getPermissions();
-			} catch (ShareNotFound $e) {
-				// ignore
-			}
-		}
-
-		$storage = $this->info->getStorage();
-
-		$path = $this->info->getInternalPath();
-
-		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$permissions = (int)$storage->getShare()->getPermissions();
-		} else {
-			$permissions = $storage->getPermissions($path);
-		}
-
-		/*
+    /**
+     * @var \OC\Files\View
+     */
+    protected $fileView;
+
+    /**
+     * The path to the current node
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * node properties cache
+     *
+     * @var array
+     */
+    protected $property_cache = null;
+
+    /**
+     * @var \OCP\Files\FileInfo
+     */
+    protected $info;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\FileInfo $info
+     * @param IManager $shareManager
+     */
+    public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
+        $this->fileView = $view;
+        $this->path = $this->fileView->getRelativePath($info->getPath());
+        $this->info = $info;
+        if ($shareManager) {
+            $this->shareManager = $shareManager;
+        } else {
+            $this->shareManager = \OC::$server->getShareManager();
+        }
+    }
+
+    protected function refreshInfo() {
+        $this->info = $this->fileView->getFileInfo($this->path);
+    }
+
+    /**
+     *  Returns the name of the node
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->info->getName();
+    }
+
+    /**
+     * Returns the full path
+     *
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function setName($name) {
+
+        // rename is only allowed if the update privilege is granted
+        if (!$this->info->isUpdateable()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+
+        list($parentPath,) = \Sabre\HTTP\URLUtil::splitPath($this->path);
+        list(, $newName) = \Sabre\HTTP\URLUtil::splitPath($name);
+
+        // verify path of the target
+        $this->verifyPath();
+
+        $newPath = $parentPath . '/' . $newName;
+
+        $this->fileView->rename($this->path, $newPath);
+
+        $this->path = $newPath;
+
+        $this->refreshInfo();
+    }
+
+    public function setPropertyCache($property_cache) {
+        $this->property_cache = $property_cache;
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int timestamp as integer
+     */
+    public function getLastModified() {
+        $timestamp = $this->info->getMtime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
+
+    /**
+     *  sets the last modification time of the file (mtime) to the value given
+     *  in the second parameter or to now if the second param is empty.
+     *  Even if the modification time is set to a custom value the access time is set to now.
+     */
+    public function touch($mtime) {
+        $this->fileView->touch($this->path, $mtime);
+        $this->refreshInfo();
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the
+     * file. If the file changes, the ETag MUST change.  The ETag is an
+     * arbitrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return string
+     */
+    public function getETag() {
+        return '"' . $this->info->getEtag() . '"';
+    }
+
+    /**
+     * Sets the ETag
+     *
+     * @param string $etag
+     *
+     * @return int file id of updated file or -1 on failure
+     */
+    public function setETag($etag) {
+        return $this->fileView->putFileInfo($this->path, array('etag' => $etag));
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return integer
+     */
+    public function getSize() {
+        return $this->info->getSize();
+    }
+
+    /**
+     * Returns the cache's file id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->info->getId();
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFileId() {
+        if ($this->info->getId()) {
+            $instanceId = \OC_Util::getInstanceId();
+            $id = sprintf('%08d', $this->info->getId());
+            return $id . $instanceId;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getInternalFileId() {
+        return $this->info->getId();
+    }
+
+    /**
+     * @param string $user
+     * @return int
+     */
+    public function getSharePermissions($user) {
+
+        // check of we access a federated share
+        if ($user !== null) {
+            try {
+                $share = $this->shareManager->getShareByToken($user);
+                return $share->getPermissions();
+            } catch (ShareNotFound $e) {
+                // ignore
+            }
+        }
+
+        $storage = $this->info->getStorage();
+
+        $path = $this->info->getInternalPath();
+
+        if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OCA\Files_Sharing\SharedStorage $storage */
+            $permissions = (int)$storage->getShare()->getPermissions();
+        } else {
+            $permissions = $storage->getPermissions($path);
+        }
+
+        /*
 		 * We can always share non moveable mount points with DELETE and UPDATE
 		 * Eventually we need to do this properly
 		 */
-		$mountpoint = $this->info->getMountPoint();
-		if (!($mountpoint instanceof MoveableMount)) {
-			$mountpointpath = $mountpoint->getMountPoint();
-			if (substr($mountpointpath, -1) === '/') {
-				$mountpointpath = substr($mountpointpath, 0, -1);
-			}
-
-			if ($mountpointpath === $this->info->getPath()) {
-				$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
-			}
-		}
-
-		/*
+        $mountpoint = $this->info->getMountPoint();
+        if (!($mountpoint instanceof MoveableMount)) {
+            $mountpointpath = $mountpoint->getMountPoint();
+            if (substr($mountpointpath, -1) === '/') {
+                $mountpointpath = substr($mountpointpath, 0, -1);
+            }
+
+            if ($mountpointpath === $this->info->getPath()) {
+                $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+            }
+        }
+
+        /*
 		 * Files can't have create or delete permissions
 		 */
-		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
-			$permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
-		}
-
-		return $permissions;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDavPermissions() {
-		$p = '';
-		if ($this->info->isShared()) {
-			$p .= 'S';
-		}
-		if ($this->info->isShareable()) {
-			$p .= 'R';
-		}
-		if ($this->info->isMounted()) {
-			$p .= 'M';
-		}
-		if ($this->info->isDeletable()) {
-			$p .= 'D';
-		}
-		if ($this->info->isUpdateable()) {
-			$p .= 'NV'; // Renameable, Moveable
-		}
-		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
-			if ($this->info->isUpdateable()) {
-				$p .= 'W';
-			}
-		} else {
-			if ($this->info->isCreatable()) {
-				$p .= 'CK';
-			}
-		}
-		return $p;
-	}
-
-	public function getOwner() {
-		return $this->info->getOwner();
-	}
-
-	protected function verifyPath() {
-		try {
-			$fileName = basename($this->info->getPath());
-			$this->fileView->verifyPath($this->path, $fileName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function acquireLock($type) {
-		$this->fileView->lockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($type) {
-		$this->fileView->unlockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 */
-	public function changeLock($type) {
-		$this->fileView->changeLock($this->path, $type);
-	}
-
-	public function getFileInfo() {
-		return $this->info;
-	}
+        if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+            $permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
+        }
+
+        return $permissions;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDavPermissions() {
+        $p = '';
+        if ($this->info->isShared()) {
+            $p .= 'S';
+        }
+        if ($this->info->isShareable()) {
+            $p .= 'R';
+        }
+        if ($this->info->isMounted()) {
+            $p .= 'M';
+        }
+        if ($this->info->isDeletable()) {
+            $p .= 'D';
+        }
+        if ($this->info->isUpdateable()) {
+            $p .= 'NV'; // Renameable, Moveable
+        }
+        if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+            if ($this->info->isUpdateable()) {
+                $p .= 'W';
+            }
+        } else {
+            if ($this->info->isCreatable()) {
+                $p .= 'CK';
+            }
+        }
+        return $p;
+    }
+
+    public function getOwner() {
+        return $this->info->getOwner();
+    }
+
+    protected function verifyPath() {
+        try {
+            $fileName = basename($this->info->getPath());
+            $this->fileView->verifyPath($this->path, $fileName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function acquireLock($type) {
+        $this->fileView->lockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($type) {
+        $this->fileView->unlockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     */
+    public function changeLock($type) {
+        $this->fileView->changeLock($this->path, $type);
+    }
+
+    public function getFileInfo() {
+        return $this->info;
+    }
 }

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

Indentation +75 added lines, -75 removed lines

@@ -32,88 +32,88 @@
 use Sabre\HTTP\Response;
 
 class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
-	protected $nonFatalExceptions = [
-		'Sabre\DAV\Exception\NotAuthenticated' => true,
-		// If tokenauth can throw this exception (which is basically as
-		// NotAuthenticated. So not fatal.
-		'OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden' => true,
-		// the sync client uses this to find out whether files exist,
-		// so it is not always an error, log it as debug
-		'Sabre\DAV\Exception\NotFound' => true,
-		// this one mostly happens when the same file is uploaded at
-		// exactly the same time from two clients, only one client
-		// wins, the second one gets "Precondition failed"
-		'Sabre\DAV\Exception\PreconditionFailed' => true,
-		// forbidden can be expected when trying to upload to
-		// read-only folders for example
-		'Sabre\DAV\Exception\Forbidden' => true,
-		// Happens when an external storage or federated share is temporarily
-		// not available
-		'Sabre\DAV\Exception\StorageNotAvailableException' => true,
-	];
+    protected $nonFatalExceptions = [
+        'Sabre\DAV\Exception\NotAuthenticated' => true,
+        // If tokenauth can throw this exception (which is basically as
+        // NotAuthenticated. So not fatal.
+        'OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden' => true,
+        // the sync client uses this to find out whether files exist,
+        // so it is not always an error, log it as debug
+        'Sabre\DAV\Exception\NotFound' => true,
+        // this one mostly happens when the same file is uploaded at
+        // exactly the same time from two clients, only one client
+        // wins, the second one gets "Precondition failed"
+        'Sabre\DAV\Exception\PreconditionFailed' => true,
+        // forbidden can be expected when trying to upload to
+        // read-only folders for example
+        'Sabre\DAV\Exception\Forbidden' => true,
+        // Happens when an external storage or federated share is temporarily
+        // not available
+        'Sabre\DAV\Exception\StorageNotAvailableException' => true,
+    ];
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param string $loggerAppName app name to use when logging
-	 * @param ILogger $logger
-	 */
-	public function __construct($loggerAppName, $logger) {
-		$this->appName = $loggerAppName;
-		$this->logger = $logger;
-	}
+    /**
+     * @param string $loggerAppName app name to use when logging
+     * @param ILogger $logger
+     */
+    public function __construct($loggerAppName, $logger) {
+        $this->appName = $loggerAppName;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * 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) {
 
-		$server->on('exception', array($this, 'logException'), 10);
-	}
+        $server->on('exception', array($this, 'logException'), 10);
+    }
 
-	/**
-	 * Log exception
-	 *
-	 */
-	public function logException(\Exception $ex) {
-		$exceptionClass = get_class($ex);
-		$level = \OCP\Util::FATAL;
-		if (isset($this->nonFatalExceptions[$exceptionClass])) {
-			$level = \OCP\Util::DEBUG;
-		}
+    /**
+     * Log exception
+     *
+     */
+    public function logException(\Exception $ex) {
+        $exceptionClass = get_class($ex);
+        $level = \OCP\Util::FATAL;
+        if (isset($this->nonFatalExceptions[$exceptionClass])) {
+            $level = \OCP\Util::DEBUG;
+        }
 
-		$message = $ex->getMessage();
-		if ($ex instanceof Exception) {
-			if (empty($message)) {
-				$response = new Response($ex->getHTTPCode());
-				$message = $response->getStatusText();
-			}
-			$message = "HTTP/1.1 {$ex->getHTTPCode()} $message";
-		}
+        $message = $ex->getMessage();
+        if ($ex instanceof Exception) {
+            if (empty($message)) {
+                $response = new Response($ex->getHTTPCode());
+                $message = $response->getStatusText();
+            }
+            $message = "HTTP/1.1 {$ex->getHTTPCode()} $message";
+        }
 
-		$user = \OC_User::getUser();
+        $user = \OC_User::getUser();
 
-		$exception = [
-			'Message' => $message,
-			'Exception' => $exceptionClass,
-			'Code' => $ex->getCode(),
-			'Trace' => $ex->getTraceAsString(),
-			'File' => $ex->getFile(),
-			'Line' => $ex->getLine(),
-			'User' => $user,
-		];
-		$this->logger->log($level, 'Exception: ' . json_encode($exception), ['app' => $this->appName]);
-	}
+        $exception = [
+            'Message' => $message,
+            'Exception' => $exceptionClass,
+            'Code' => $ex->getCode(),
+            'Trace' => $ex->getTraceAsString(),
+            'File' => $ex->getFile(),
+            'Line' => $ex->getLine(),
+            'User' => $user,
+        ];
+        $this->logger->log($level, 'Exception: ' . json_encode($exception), ['app' => $this->appName]);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -114,6 +114,6 @@
 			'Line' => $ex->getLine(),
 			'User' => $user,
 		];
-		$this->logger->log($level, 'Exception: ' . json_encode($exception), ['app' => $this->appName]);
+		$this->logger->log($level, 'Exception: '.json_encode($exception), ['app' => $this->appName]);
 	}
 }

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 +177 added lines, -177 removed lines

@@ -32,181 +32,181 @@
  */
 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] = 'OCA\\DAV\\Connector\\Sabre\\ShareTypeList';
-		$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,
-		];
-		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] = 'OCA\\DAV\\Connector\\Sabre\\ShareTypeList';
+        $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,
+        ];
+        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

Doc Comments +1 added lines, -1 removed lines

@@ -448,7 +448,7 @@
 	 *
 	 * @param string $path source path
 	 * @param string $destination destination path
-	 * @return bool|void false to stop handling, void to skip this handler
+	 * @return null|false false to stop handling, void to skip this handler
 	 */
 	public function beforeMoveFutureFile($path, $destination) {
 		$sourceNode = $this->tree->getNodeForPath($path);

Indentation +436 added lines, -436 removed lines

@@ -49,441 +49,441 @@
 
 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 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';
-
-	/**
-	 * 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 View
-	 */
-	private $fileView;
-
-	/**
-	 * @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::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;
-
-		// 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']);
-		$this->server->on('beforeMove', [$this, 'beforeMoveFutureFile']);
-	}
-
-	/**
-	 * 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\HTTP\URLUtil::splitPath($source);
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
-
-		if ($sourceDir !== $destinationDir) {
-			$sourceNodeFileInfo = $sourceNode->getFileInfo();
-			if (is_null($sourceNodeFileInfo)) {
-				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(
-				[
-					\OC\AppFramework\Http\Request::USER_AGENT_IE,
-					\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-					\OC\AppFramework\Http\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) {
-			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::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();
-			});
-		}
-
-		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();
-			});
-		}
-	}
-
-	/**
-	 * 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\HTTP\URLUtil::splitPath($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);
-			}
-		}
-	}
-
-	/**
-	 * Move handler for future file.
-	 *
-	 * This overrides the default move behavior to prevent Sabre
-	 * to delete the target file before moving. Because deleting would
-	 * lose the file id and metadata.
-	 *
-	 * @param string $path source path
-	 * @param string $destination destination path
-	 * @return bool|void false to stop handling, void to skip this handler
-	 */
-	public function beforeMoveFutureFile($path, $destination) {
-		$sourceNode = $this->tree->getNodeForPath($path);
-		if (!$sourceNode instanceof FutureFile) {
-			// skip handling as the source is not a chunked FutureFile
-			return;
-		}
-
-		if (!$this->tree->nodeExists($destination)) {
-			// skip and let the default handler do its work
-			return;
-		}
-
-		// do a move manually, skipping Sabre's default "delete" for existing nodes
-		$this->tree->move($path, $destination);
-
-		// trigger all default events (copied from CorePlugin::move)
-		$this->server->emit('afterMove', [$path, $destination]);
-		$this->server->emit('afterUnbind', [$path]);
-		$this->server->emit('afterBind', [$destination]);
-
-		$response = $this->server->httpResponse;
-		$response->setHeader('Content-Length', '0');
-		$response->setStatus(204);
-
-		return false;
-	}
+    // 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 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';
+
+    /**
+     * 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 View
+     */
+    private $fileView;
+
+    /**
+     * @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::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;
+
+        // 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']);
+        $this->server->on('beforeMove', [$this, 'beforeMoveFutureFile']);
+    }
+
+    /**
+     * 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\HTTP\URLUtil::splitPath($source);
+        list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+
+        if ($sourceDir !== $destinationDir) {
+            $sourceNodeFileInfo = $sourceNode->getFileInfo();
+            if (is_null($sourceNodeFileInfo)) {
+                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(
+                [
+                    \OC\AppFramework\Http\Request::USER_AGENT_IE,
+                    \OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                    \OC\AppFramework\Http\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) {
+            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::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();
+            });
+        }
+
+        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();
+            });
+        }
+    }
+
+    /**
+     * 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\HTTP\URLUtil::splitPath($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);
+            }
+        }
+    }
+
+    /**
+     * Move handler for future file.
+     *
+     * This overrides the default move behavior to prevent Sabre
+     * to delete the target file before moving. Because deleting would
+     * lose the file id and metadata.
+     *
+     * @param string $path source path
+     * @param string $destination destination path
+     * @return bool|void false to stop handling, void to skip this handler
+     */
+    public function beforeMoveFutureFile($path, $destination) {
+        $sourceNode = $this->tree->getNodeForPath($path);
+        if (!$sourceNode instanceof FutureFile) {
+            // skip handling as the source is not a chunked FutureFile
+            return;
+        }
+
+        if (!$this->tree->nodeExists($destination)) {
+            // skip and let the default handler do its work
+            return;
+        }
+
+        // do a move manually, skipping Sabre's default "delete" for existing nodes
+        $this->tree->move($path, $destination);
+
+        // trigger all default events (copied from CorePlugin::move)
+        $this->server->emit('afterMove', [$path, $destination]);
+        $this->server->emit('afterUnbind', [$path]);
+        $this->server->emit('afterBind', [$destination]);
+
+        $response = $this->server->httpResponse;
+        $response->setHeader('Content-Length', '0');
+        $response->setStatus(204);
+
+        return false;
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,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();
@@ -202,11 +202,11 @@ 
 		if ($sourceDir !== $destinationDir) {
 			$sourceNodeFileInfo = $sourceNode->getFileInfo();
 			if (is_null($sourceNodeFileInfo)) {
-				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");
 			}
 		}
 	}
@@ -259,10 +259,10 @@ 
 					\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 					\OC\AppFramework\Http\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).'"');
 			}
 		}
 
@@ -337,13 +337,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();
 			});
 		}
@@ -431,7 +431,7 @@ 
 			list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($filePath);
 			$info = \OC_FileChunking::decodeName($name);
 			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
+				$filePath = $path.'/'.$info['name'];
 			}
 		}
 

apps/dav/lib/Connector/LegacyDAVACL.php

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) = URLUtil::splitPath($principal);
-		if ($toV2) {
-			return "principals/users/$name";
-		}
-		return "principals/$name";
-	}
+    private function convertPrincipal($principal, $toV2) {
+        list(, $name) = URLUtil::splitPath($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);
+    }
 }

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(

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 +149 added lines, -149 removed lines

@@ -40,156 +40,156 @@
 
 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')
-			);
-		});
-
-		/*
+    /**
+     * 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')
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
-	}
-
-	/**
-	 * @param IManager $contactsManager
-	 * @param string $userID
-	 */
-	public function setupContactsProvider(IManager $contactsManager, $userID) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query(ContactsManager::class);
-		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	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')
-			);
-		});
-
-		$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 IManager $contactsManager
+     * @param string $userID
+     */
+    public function setupContactsProvider(IManager $contactsManager, $userID) {
+        /** @var ContactsManager $cm */
+        $cm = $this->getContainer()->query(ContactsManager::class);
+        $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    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')
+            );
+        });
+
+        $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.");
+    }
 }