nextcloud / server

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

Indentation +298 added lines, -298 removed lines

@@ -41,302 +41,302 @@
 
 class ObjectTree extends \Sabre\DAV\Tree {
 
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $fileView;
-
-	/**
-	 * @var  \OCP\Files\Mount\IMountManager
-	 */
-	protected $mountManager;
-
-	/**
-	 * Creates the object
-	 */
-	public function __construct() {
-	}
-
-	/**
-	 * @param \Sabre\DAV\INode $rootNode
-	 * @param \OC\Files\View $view
-	 * @param  \OCP\Files\Mount\IMountManager $mountManager
-	 */
-	public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
-		$this->rootNode = $rootNode;
-		$this->fileView = $view;
-		$this->mountManager = $mountManager;
-	}
-
-	/**
-	 * If the given path is a chunked file name, converts it
-	 * to the real file name. Only applies if the OC-CHUNKED header
-	 * is present.
-	 *
-	 * @param string $path chunk file path to convert
-	 *
-	 * @return string path to real file
-	 */
-	private function resolveChunkFile($path) {
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			// resolve to real file name to find the proper node
-			list($dir, $name) = \Sabre\HTTP\URLUtil::splitPath($path);
-			if ($dir == '/' || $dir == '.') {
-				$dir = '';
-			}
-
-			$info = \OC_FileChunking::decodeName($name);
-			// only replace path if it was really the chunked file
-			if (isset($info['transferid'])) {
-				// getNodePath is called for multiple nodes within a chunk
-				// upload call
-				$path = $dir . '/' . $info['name'];
-				$path = ltrim($path, '/');
-			}
-		}
-		return $path;
-	}
-
-	public function cacheNode(Node $node) {
-		$this->cache[trim($node->getPath(), '/')] = $node;
-	}
-
-	/**
-	 * Returns the INode object for the requested path
-	 *
-	 * @param string $path
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getNodeForPath($path) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-		$path = trim($path, '/');
-
-		if (isset($this->cache[$path])) {
-			return $this->cache[$path];
-		}
-
-		if ($path) {
-			try {
-				$this->fileView->verifyPath($path, basename($path));
-			} catch (\OCP\Files\InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-		}
-
-		// Is it the root node?
-		if (!strlen($path)) {
-			return $this->rootNode;
-		}
-
-		if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
-			// read from storage
-			$absPath = $this->fileView->getAbsolutePath($path);
-			$mount = $this->fileView->getMount($path);
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absPath);
-			if ($storage && $storage->file_exists($internalPath)) {
-				/**
-				 * @var \OC\Files\Storage\Storage $storage
-				 */
-				// get data directly
-				$data = $storage->getMetaData($internalPath);
-				$info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
-			} else {
-				$info = null;
-			}
-		} else {
-			// resolve chunk file name to real name, if applicable
-			$path = $this->resolveChunkFile($path);
-
-			// read from cache
-			try {
-				$info = $this->fileView->getFileInfo($path);
-			} catch (StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
-			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
-			} catch (LockedException $e) {
-				throw new \Sabre\DAV\Exception\Locked();
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		}
-
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
-
-		if ($info->getType() === 'dir') {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
-		} else {
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
-		}
-
-		$this->cache[$path] = $node;
-		return $node;
-
-	}
-
-	/**
-	 * Moves a file from one location to another
-	 *
-	 * @param string $sourcePath The path to the file which should be moved
-	 * @param string $destinationPath The full destination path, so not just the destination parent node
-	 * @throws FileLocked
-	 * @throws Forbidden
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 * @return int
-	 */
-	public function move($sourcePath, $destinationPath) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-		$infoDestination = $this->fileView->getFileInfo(dirname($destinationPath));
-		if (dirname($destinationPath) === dirname($sourcePath)) {
-			$sourcePermission = $infoDestination && $infoDestination->isUpdateable();
-			$destinationPermission = $sourcePermission;
-		} else {
-			$infoSource = $this->fileView->getFileInfo($sourcePath);
-			if ($this->fileView->file_exists($destinationPath)) {
-				$destinationPermission = $infoDestination && $infoDestination->isUpdateable();
-			} else {
-				$destinationPermission = $infoDestination && $infoDestination->isCreatable();
-			}
-			$sourcePermission =  $infoSource && $infoSource->isDeletable();
-		}
-
-		if (!$destinationPermission || !$sourcePermission) {
-			throw new Forbidden('No permissions to move object.');
-		}
-
-		$targetNodeExists = $this->nodeExists($destinationPath);
-		$sourceNode = $this->getNodeForPath($sourcePath);
-		if ($sourceNode instanceof \Sabre\DAV\ICollection && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
-		}
-		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourcePath);
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destinationPath);
-
-		$isMovableMount = false;
-		$sourceMount = $this->mountManager->find($this->fileView->getAbsolutePath($sourcePath));
-		$internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
-		if ($sourceMount instanceof MoveableMount && $internalPath === '') {
-			$isMovableMount = true;
-		}
-
-		try {
-			$sameFolder = ($sourceDir === $destinationDir);
-			// if we're overwriting or same folder
-			if ($targetNodeExists || $sameFolder) {
-				// note that renaming a share mount point is always allowed
-				if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			} else {
-				if (!$this->fileView->isCreatable($destinationDir)) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			if (!$sameFolder) {
-				// moving to a different folder, source will be gone, like a deletion
-				// note that moving a share mount point is always allowed
-				if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			$fileName = basename($destinationPath);
-			try {
-				$this->fileView->verifyPath($destinationDir, $fileName);
-			} catch (\OCP\Files\InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-
-			$renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
-			if (!$renameOkay) {
-				throw new \Sabre\DAV\Exception\Forbidden('');
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		$this->markDirty($sourceDir);
-		$this->markDirty($destinationDir);
-
-	}
-
-	/**
-	 * Copies a file or directory.
-	 *
-	 * This method must work recursively and delete the destination
-	 * if it exists
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @throws FileLocked
-	 * @throws Forbidden
-	 * @throws InvalidPath
-	 * @throws \Exception
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 * @return void
-	 */
-	public function copy($source, $destination) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-
-		$info = $this->fileView->getFileInfo(dirname($destination));
-		if ($this->fileView->file_exists($destination)) {
-			$destinationPermission = $info && $info->isUpdateable();
-		} else {
-			$destinationPermission = $info && $info->isCreatable();
-		}
-		if (!$destinationPermission) {
-			throw new Forbidden('No permissions to copy object.');
-		}
-
-		// this will trigger existence check
-		$this->getNodeForPath($source);
-
-		list($destinationDir, $destinationName) = \Sabre\HTTP\URLUtil::splitPath($destination);
-		try {
-			$this->fileView->verifyPath($destinationDir, $destinationName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-
-		try {
-			$this->fileView->copy($source, $destination);
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
-		$this->markDirty($destinationDir);
-	}
+    /**
+     * @var \OC\Files\View
+     */
+    protected $fileView;
+
+    /**
+     * @var  \OCP\Files\Mount\IMountManager
+     */
+    protected $mountManager;
+
+    /**
+     * Creates the object
+     */
+    public function __construct() {
+    }
+
+    /**
+     * @param \Sabre\DAV\INode $rootNode
+     * @param \OC\Files\View $view
+     * @param  \OCP\Files\Mount\IMountManager $mountManager
+     */
+    public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
+        $this->rootNode = $rootNode;
+        $this->fileView = $view;
+        $this->mountManager = $mountManager;
+    }
+
+    /**
+     * If the given path is a chunked file name, converts it
+     * to the real file name. Only applies if the OC-CHUNKED header
+     * is present.
+     *
+     * @param string $path chunk file path to convert
+     *
+     * @return string path to real file
+     */
+    private function resolveChunkFile($path) {
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            // resolve to real file name to find the proper node
+            list($dir, $name) = \Sabre\HTTP\URLUtil::splitPath($path);
+            if ($dir == '/' || $dir == '.') {
+                $dir = '';
+            }
+
+            $info = \OC_FileChunking::decodeName($name);
+            // only replace path if it was really the chunked file
+            if (isset($info['transferid'])) {
+                // getNodePath is called for multiple nodes within a chunk
+                // upload call
+                $path = $dir . '/' . $info['name'];
+                $path = ltrim($path, '/');
+            }
+        }
+        return $path;
+    }
+
+    public function cacheNode(Node $node) {
+        $this->cache[trim($node->getPath(), '/')] = $node;
+    }
+
+    /**
+     * Returns the INode object for the requested path
+     *
+     * @param string $path
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getNodeForPath($path) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+        $path = trim($path, '/');
+
+        if (isset($this->cache[$path])) {
+            return $this->cache[$path];
+        }
+
+        if ($path) {
+            try {
+                $this->fileView->verifyPath($path, basename($path));
+            } catch (\OCP\Files\InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+        }
+
+        // Is it the root node?
+        if (!strlen($path)) {
+            return $this->rootNode;
+        }
+
+        if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
+            // read from storage
+            $absPath = $this->fileView->getAbsolutePath($path);
+            $mount = $this->fileView->getMount($path);
+            $storage = $mount->getStorage();
+            $internalPath = $mount->getInternalPath($absPath);
+            if ($storage && $storage->file_exists($internalPath)) {
+                /**
+                 * @var \OC\Files\Storage\Storage $storage
+                 */
+                // get data directly
+                $data = $storage->getMetaData($internalPath);
+                $info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
+            } else {
+                $info = null;
+            }
+        } else {
+            // resolve chunk file name to real name, if applicable
+            $path = $this->resolveChunkFile($path);
+
+            // read from cache
+            try {
+                $info = $this->fileView->getFileInfo($path);
+            } catch (StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
+            } catch (StorageInvalidException $e) {
+                throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+            } catch (LockedException $e) {
+                throw new \Sabre\DAV\Exception\Locked();
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        }
+
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
+
+        if ($info->getType() === 'dir') {
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
+        } else {
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+        }
+
+        $this->cache[$path] = $node;
+        return $node;
+
+    }
+
+    /**
+     * Moves a file from one location to another
+     *
+     * @param string $sourcePath The path to the file which should be moved
+     * @param string $destinationPath The full destination path, so not just the destination parent node
+     * @throws FileLocked
+     * @throws Forbidden
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     * @return int
+     */
+    public function move($sourcePath, $destinationPath) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+        $infoDestination = $this->fileView->getFileInfo(dirname($destinationPath));
+        if (dirname($destinationPath) === dirname($sourcePath)) {
+            $sourcePermission = $infoDestination && $infoDestination->isUpdateable();
+            $destinationPermission = $sourcePermission;
+        } else {
+            $infoSource = $this->fileView->getFileInfo($sourcePath);
+            if ($this->fileView->file_exists($destinationPath)) {
+                $destinationPermission = $infoDestination && $infoDestination->isUpdateable();
+            } else {
+                $destinationPermission = $infoDestination && $infoDestination->isCreatable();
+            }
+            $sourcePermission =  $infoSource && $infoSource->isDeletable();
+        }
+
+        if (!$destinationPermission || !$sourcePermission) {
+            throw new Forbidden('No permissions to move object.');
+        }
+
+        $targetNodeExists = $this->nodeExists($destinationPath);
+        $sourceNode = $this->getNodeForPath($sourcePath);
+        if ($sourceNode instanceof \Sabre\DAV\ICollection && $targetNodeExists) {
+            throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+        }
+        list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourcePath);
+        list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destinationPath);
+
+        $isMovableMount = false;
+        $sourceMount = $this->mountManager->find($this->fileView->getAbsolutePath($sourcePath));
+        $internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
+        if ($sourceMount instanceof MoveableMount && $internalPath === '') {
+            $isMovableMount = true;
+        }
+
+        try {
+            $sameFolder = ($sourceDir === $destinationDir);
+            // if we're overwriting or same folder
+            if ($targetNodeExists || $sameFolder) {
+                // note that renaming a share mount point is always allowed
+                if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            } else {
+                if (!$this->fileView->isCreatable($destinationDir)) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            if (!$sameFolder) {
+                // moving to a different folder, source will be gone, like a deletion
+                // note that moving a share mount point is always allowed
+                if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            $fileName = basename($destinationPath);
+            try {
+                $this->fileView->verifyPath($destinationDir, $fileName);
+            } catch (\OCP\Files\InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+
+            $renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
+            if (!$renameOkay) {
+                throw new \Sabre\DAV\Exception\Forbidden('');
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        $this->markDirty($sourceDir);
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     *
+     * @param string $source
+     * @param string $destination
+     * @throws FileLocked
+     * @throws Forbidden
+     * @throws InvalidPath
+     * @throws \Exception
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     * @return void
+     */
+    public function copy($source, $destination) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+
+        $info = $this->fileView->getFileInfo(dirname($destination));
+        if ($this->fileView->file_exists($destination)) {
+            $destinationPermission = $info && $info->isUpdateable();
+        } else {
+            $destinationPermission = $info && $info->isCreatable();
+        }
+        if (!$destinationPermission) {
+            throw new Forbidden('No permissions to copy object.');
+        }
+
+        // this will trigger existence check
+        $this->getNodeForPath($source);
+
+        list($destinationDir, $destinationName) = \Sabre\HTTP\URLUtil::splitPath($destination);
+        try {
+            $this->fileView->verifyPath($destinationDir, $destinationName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+
+        try {
+            $this->fileView->copy($source, $destination);
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+        $this->markDirty($destinationDir);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
 			if (isset($info['transferid'])) {
 				// getNodePath is called for multiple nodes within a chunk
 				// upload call
-				$path = $dir . '/' . $info['name'];
+				$path = $dir.'/'.$info['name'];
 				$path = ltrim($path, '/');
 			}
 		}
@@ -161,7 +161,7 @@ 
 			} catch (StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
 			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+				throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid');
 			} catch (LockedException $e) {
 				throw new \Sabre\DAV\Exception\Locked();
 			} catch (ForbiddenException $e) {
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getType() === 'dir') {
@@ -214,7 +214,7 @@ 
 			} else {
 				$destinationPermission = $infoDestination && $infoDestination->isCreatable();
 			}
-			$sourcePermission =  $infoSource && $infoSource->isDeletable();
+			$sourcePermission = $infoSource && $infoSource->isDeletable();
 		}
 
 		if (!$destinationPermission || !$sourcePermission) {
@@ -224,7 +224,7 @@ 
 		$targetNodeExists = $this->nodeExists($destinationPath);
 		$sourceNode = $this->getNodeForPath($sourcePath);
 		if ($sourceNode instanceof \Sabre\DAV\ICollection && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists');
 		}
 		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourcePath);
 		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destinationPath);

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

Indentation +222 added lines, -222 removed lines

@@ -49,250 +49,250 @@
 class TagsPlugin extends \Sabre\DAV\ServerPlugin
 {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+    const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+    const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var \OCP\ITagManager
-	 */
-	private $tagManager;
+    /**
+     * @var \OCP\ITagManager
+     */
+    private $tagManager;
 
-	/**
-	 * @var \OCP\ITags
-	 */
-	private $tagger;
+    /**
+     * @var \OCP\ITags
+     */
+    private $tagger;
 
-	/**
-	 * Array of file id to tags array
-	 * The null value means the cache wasn't initialized.
-	 *
-	 * @var array
-	 */
-	private $cachedTags;
+    /**
+     * Array of file id to tags array
+     * The null value means the cache wasn't initialized.
+     *
+     * @var array
+     */
+    private $cachedTags;
 
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
 
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param \OCP\ITagManager $tagManager tag manager
-	 */
-	public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
-		$this->tree = $tree;
-		$this->tagManager = $tagManager;
-		$this->tagger = null;
-		$this->cachedTags = array();
-	}
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param \OCP\ITagManager $tagManager tag manager
+     */
+    public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
+        $this->tree = $tree;
+        $this->tagManager = $tagManager;
+        $this->tagger = null;
+        $this->cachedTags = array();
+    }
 
-	/**
-	 * 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->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::TAGS_PROPERTYNAME] = 'OCA\\DAV\\Connector\\Sabre\\TagList';
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::TAGS_PROPERTYNAME] = 'OCA\\DAV\\Connector\\Sabre\\TagList';
 
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-	}
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+        $this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+    }
 
-	/**
-	 * Returns the tagger
-	 *
-	 * @return \OCP\ITags tagger
-	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-		}
-		return $this->tagger;
-	}
+    /**
+     * Returns the tagger
+     *
+     * @return \OCP\ITags tagger
+     */
+    private function getTagger() {
+        if (!$this->tagger) {
+            $this->tagger = $this->tagManager->load('files');
+        }
+        return $this->tagger;
+    }
 
-	/**
-	 * Returns tags and favorites.
-	 *
-	 * @param integer $fileId file id
-	 * @return array list($tags, $favorite) with $tags as tag array
-	 * and $favorite is a boolean whether the file was favorited
-	 */
-	private function getTagsAndFav($fileId) {
-		$isFav = false;
-		$tags = $this->getTags($fileId);
-		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
-			if ($favPos !== false) {
-				$isFav = true;
-				unset($tags[$favPos]);
-			}
-		}
-		return array($tags, $isFav);
-	}
+    /**
+     * Returns tags and favorites.
+     *
+     * @param integer $fileId file id
+     * @return array list($tags, $favorite) with $tags as tag array
+     * and $favorite is a boolean whether the file was favorited
+     */
+    private function getTagsAndFav($fileId) {
+        $isFav = false;
+        $tags = $this->getTags($fileId);
+        if ($tags) {
+            $favPos = array_search(self::TAG_FAVORITE, $tags);
+            if ($favPos !== false) {
+                $isFav = true;
+                unset($tags[$favPos]);
+            }
+        }
+        return array($tags, $isFav);
+    }
 
-	/**
-	 * Returns tags for the given file id
-	 *
-	 * @param integer $fileId file id
-	 * @return array list of tags for that file
-	 */
-	private function getTags($fileId) {
-		if (isset($this->cachedTags[$fileId])) {
-			return $this->cachedTags[$fileId];
-		} else {
-			$tags = $this->getTagger()->getTagsForObjects(array($fileId));
-			if ($tags !== false) {
-				if (empty($tags)) {
-					return array();
-				}
-				return current($tags);
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns tags for the given file id
+     *
+     * @param integer $fileId file id
+     * @return array list of tags for that file
+     */
+    private function getTags($fileId) {
+        if (isset($this->cachedTags[$fileId])) {
+            return $this->cachedTags[$fileId];
+        } else {
+            $tags = $this->getTagger()->getTagsForObjects(array($fileId));
+            if ($tags !== false) {
+                if (empty($tags)) {
+                    return array();
+                }
+                return current($tags);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Updates the tags of the given file id
-	 *
-	 * @param int $fileId
-	 * @param array $tags array of tag strings
-	 */
-	private function updateTags($fileId, $tags) {
-		$tagger = $this->getTagger();
-		$currentTags = $this->getTags($fileId);
+    /**
+     * Updates the tags of the given file id
+     *
+     * @param int $fileId
+     * @param array $tags array of tag strings
+     */
+    private function updateTags($fileId, $tags) {
+        $tagger = $this->getTagger();
+        $currentTags = $this->getTags($fileId);
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->unTag($fileId, $tag);
-		}
-	}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->unTag($fileId, $tag);
+        }
+    }
 
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
-			|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
-		)) {
-			// note: pre-fetching only supported for depth <= 1
-			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
-			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
-			}
-			$tags = $this->getTagger()->getTagsForObjects($fileIds);
-			if ($tags === false) {
-				// the tags API returns false on error...
-				$tags = array();
-			}
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
+            || !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
+        )) {
+            // note: pre-fetching only supported for depth <= 1
+            $folderContent = $node->getChildren();
+            $fileIds[] = (int)$node->getId();
+            foreach ($folderContent as $info) {
+                $fileIds[] = (int)$info->getId();
+            }
+            $tags = $this->getTagger()->getTagsForObjects($fileIds);
+            if ($tags === false) {
+                // the tags API returns false on error...
+                $tags = array();
+            }
 
-			$this->cachedTags = $this->cachedTags + $tags;
-			$emptyFileIds = array_diff($fileIds, array_keys($tags));
-			// also cache the ones that were not found
-			foreach ($emptyFileIds as $fileId) {
-				$this->cachedTags[$fileId] = [];
-			}
-		}
+            $this->cachedTags = $this->cachedTags + $tags;
+            $emptyFileIds = array_diff($fileIds, array_keys($tags));
+            // also cache the ones that were not found
+            foreach ($emptyFileIds as $fileId) {
+                $this->cachedTags[$fileId] = [];
+            }
+        }
 
-		$tags = null;
-		$isFav = null;
+        $tags = null;
+        $isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function() use ($tags, &$isFav, $node) {
-			list($tags, $isFav) = $this->getTagsAndFav($node->getId());
-			return new TagList($tags);
-		});
+        $propFind->handle(self::TAGS_PROPERTYNAME, function() use ($tags, &$isFav, $node) {
+            list($tags, $isFav) = $this->getTagsAndFav($node->getId());
+            return new TagList($tags);
+        });
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
-			if (is_null($isFav)) {
-				list(, $isFav) = $this->getTagsAndFav($node->getId());
-			}
-			if ($isFav) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	}
+        $propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
+            if (is_null($isFav)) {
+                list(, $isFav) = $this->getTagsAndFav($node->getId());
+            }
+            if ($isFav) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+    }
 
-	/**
-	 * Updates tags and favorites properties, if applicable.
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($path) {
-			$node = $this->tree->getNodeForPath($path);
-			if (is_null($node)) {
-				return 404;
-			}
-			$this->updateTags($node->getId(), $tagList->getTags());
-			return true;
-		});
+    /**
+     * Updates tags and favorites properties, if applicable.
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($path) {
+            $node = $this->tree->getNodeForPath($path);
+            if (is_null($node)) {
+                return 404;
+            }
+            $this->updateTags($node->getId(), $tagList->getTags());
+            return true;
+        });
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($path) {
-			$node = $this->tree->getNodeForPath($path);
-			if (is_null($node)) {
-				return 404;
-			}
-			if ((int)$favState === 1 || $favState === 'true') {
-				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
-			} else {
-				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
-			}
+        $propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($path) {
+            $node = $this->tree->getNodeForPath($path);
+            if (is_null($node)) {
+                return 404;
+            }
+            if ((int)$favState === 1 || $favState === 'true') {
+                $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
+            } else {
+                $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
+            }
 
-			if (is_null($favState)) {
-				// confirm deletion
-				return 204;
-			}
+            if (is_null($favState)) {
+                // confirm deletion
+                return 204;
+            }
 
-			return 200;
-		});
-	}
+            return 200;
+        });
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -220,9 +220,9 @@ 
 		)) {
 			// note: pre-fetching only supported for depth <= 1
 			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
+			$fileIds[] = (int) $node->getId();
 			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
+				$fileIds[] = (int) $info->getId();
 			}
 			$tags = $this->getTagger()->getTagsForObjects($fileIds);
 			if ($tags === false) {
@@ -281,7 +281,7 @@ 
 			if (is_null($node)) {
 				return 404;
 			}
-			if ((int)$favState === 1 || $favState === 'true') {
+			if ((int) $favState === 1 || $favState === 'true') {
 				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
 			} else {
 				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);

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

Indentation +358 added lines, -358 removed lines

@@ -41,362 +41,362 @@
 
 class FilesReportPlugin extends ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
-	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var View
-	 */
-	private $fileView;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Manager for private tags
-	 *
-	 * @var ITagManager
-	 */
-	private $fileTagger;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var Folder
-	 */
-	private $userFolder;
-
-	/**
-	 * @param Tree $tree
-	 * @param View $view
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param ITagManager $fileTagger manager for private tags
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param Folder $userFolder
-	 */
-	public function __construct(Tree $tree,
-								View $view,
-								ISystemTagManager $tagManager,
-								ISystemTagObjectMapper $tagMapper,
-								ITagManager $fileTagger,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								Folder $userFolder
-	) {
-		$this->tree = $tree;
-		$this->fileView = $view;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->fileTagger = $fileTagger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->userFolder = $userFolder;
-	}
-
-	/**
-	 * 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';
-
-		$this->server = $server;
-		$this->server->on('report', array($this, 'onReport'));
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for files
-	 *
-	 * @param string $reportName
-	 * @param $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws PreconditionFailed
-	 * @internal param $ [] $report
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$reportTargetNode = $this->server->tree->getNodeForPath($uri);
-		if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
-			return;
-		}
-
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$requestedProps = [];
-		$filterRules = [];
-
-		// parse report properties and gather filter info
-		foreach ($report as $reportProps) {
-			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
-				$filterRules = $reportProps['value'];
-			} else if ($name === '{DAV:}prop') {
-				// propfind properties
-				foreach ($reportProps['value'] as $propVal) {
-					$requestedProps[] = $propVal['name'];
-				}
-			}
-		}
-
-		if (empty($filterRules)) {
-			// an empty filter would return all existing files which would be slow
-			throw new BadRequest('Missing filter-rule block in request');
-		}
-
-		// gather all file ids matching filter
-		try {
-			$resultFileIds = $this->processFilterRules($filterRules);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
-		}
-
-		// find sabre nodes by file id, restricted to the root node path
-		$results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
-
-		$filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
-		$responses = $this->prepareResponses($filesUri, $requestedProps, $results);
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Returns the base uri of the files root by removing
-	 * the subpath from the URI
-	 *
-	 * @param string $uri URI from this request
-	 * @param string $subPath subpath to remove from the URI
-	 *
-	 * @return string files base uri
-	 */
-	private function getFilesBaseUri($uri, $subPath) {
-		$uri = trim($uri, '/');
-		$subPath = trim($subPath, '/');
-		if (empty($subPath)) {
-			$filesUri = $uri;
-		} else {
-			$filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
-		}
-		$filesUri = trim($filesUri, '/');
-		if (empty($filesUri)) {
-			return '';
-		}
-		return '/' . $filesUri;
-	}
-
-	/**
-	 * Find file ids matching the given filter rules
-	 *
-	 * @param array $filterRules
-	 * @return array array of unique file id results
-	 *
-	 * @throws TagNotFoundException whenever a tag was not found
-	 */
-	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$resultFileIds = null;
-		$systemTagIds = [];
-		$favoriteFilter = null;
-		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
-				$systemTagIds[] = $filterRule['value'];
-			}
-			if ($filterRule['name'] === $ns . 'favorite') {
-				$favoriteFilter = true;
-			}
-		}
-
-		if ($favoriteFilter !== null) {
-			$resultFileIds = $this->fileTagger->load('files')->getFavorites();
-			if (empty($resultFileIds)) {
-				return [];
-			}
-		}
-
-		if (!empty($systemTagIds)) {
-			$fileIds = $this->getSystemTagFileIds($systemTagIds);
-			if (empty($resultFileIds)) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($fileIds, $resultFileIds);
-			}
-		}
-
-		return $resultFileIds;
-	}
-
-	private function getSystemTagFileIds($systemTagIds) {
-		$resultFileIds = null;
-
-		// check user permissions, if applicable
-		if (!$this->isAdmin()) {
-			// check visibility/permission
-			$tags = $this->tagManager->getTagsByIds($systemTagIds);
-			$unknownTagIds = [];
-			foreach ($tags as $tag) {
-				if (!$tag->isUserVisible()) {
-					$unknownTagIds[] = $tag->getId();
-				}
-			}
-
-			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
-			}
-		}
-
-		// fetch all file ids and intersect them
-		foreach ($systemTagIds as $systemTagId) {
-			$fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
-
-			if (empty($fileIds)) {
-				// This tag has no files, nothing can ever show up
-				return [];
-			}
-
-			// first run ?
-			if ($resultFileIds === null) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($resultFileIds, $fileIds);
-			}
-
-			if (empty($resultFileIds)) {
-				// Empty intersection, nothing can show up anymore
-				return [];
-			}
-		}
-		return $resultFileIds;
-	}
-
-	/**
-	 * Prepare propfind response for the given nodes
-	 *
-	 * @param string $filesUri $filesUri URI leading to root of the files URI,
-	 * with a leading slash but no trailing slash
-	 * @param string[] $requestedProps requested properties
-	 * @param Node[] nodes nodes for which to fetch and prepare responses
-	 * @return Response[]
-	 */
-	public function prepareResponses($filesUri, $requestedProps, $nodes) {
-		$responses = [];
-		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
-
-			$this->server->getPropertiesByNode($propFind, $node);
-			// copied from Sabre Server's getPropertiesForPath
-			$result = $propFind->getResultForMultiStatus();
-			$result['href'] = $propFind->getPath();
-
-			$resourceType = $this->server->getResourceTypeForNode($node);
-			if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-				$result['href'] .= '/';
-			}
-
-			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
-				$result,
-				200
-			);
-		}
-		return $responses;
-	}
-
-	/**
-	 * Find Sabre nodes by file ids
-	 *
-	 * @param Node $rootNode root node for search
-	 * @param array $fileIds file ids
-	 * @return Node[] array of Sabre nodes
-	 */
-	public function findNodesByFileIds($rootNode, $fileIds) {
-		$folder = $this->userFolder;
-		if (trim($rootNode->getPath(), '/') !== '') {
-			$folder = $folder->get($rootNode->getPath());
-		}
-
-		$results = [];
-		foreach ($fileIds as $fileId) {
-			$entry = $folder->getById($fileId);
-			if ($entry) {
-				$entry = current($entry);
-				if ($entry instanceof \OCP\Files\File) {
-					$results[] = new File($this->fileView, $entry);
-				} else if ($entry instanceof \OCP\Files\Folder) {
-					$results[] = new Directory($this->fileView, $entry);
-				}
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
+    const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * @var View
+     */
+    private $fileView;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Manager for private tags
+     *
+     * @var ITagManager
+     */
+    private $fileTagger;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var Folder
+     */
+    private $userFolder;
+
+    /**
+     * @param Tree $tree
+     * @param View $view
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param ITagManager $fileTagger manager for private tags
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param Folder $userFolder
+     */
+    public function __construct(Tree $tree,
+                                View $view,
+                                ISystemTagManager $tagManager,
+                                ISystemTagObjectMapper $tagMapper,
+                                ITagManager $fileTagger,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                Folder $userFolder
+    ) {
+        $this->tree = $tree;
+        $this->fileView = $view;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->fileTagger = $fileTagger;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->userFolder = $userFolder;
+    }
+
+    /**
+     * 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';
+
+        $this->server = $server;
+        $this->server->on('report', array($this, 'onReport'));
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for files
+     *
+     * @param string $reportName
+     * @param $report
+     * @param string $uri
+     * @return bool
+     * @throws BadRequest
+     * @throws PreconditionFailed
+     * @internal param $ [] $report
+     */
+    public function onReport($reportName, $report, $uri) {
+        $reportTargetNode = $this->server->tree->getNodeForPath($uri);
+        if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
+            return;
+        }
+
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $requestedProps = [];
+        $filterRules = [];
+
+        // parse report properties and gather filter info
+        foreach ($report as $reportProps) {
+            $name = $reportProps['name'];
+            if ($name === $ns . 'filter-rules') {
+                $filterRules = $reportProps['value'];
+            } else if ($name === '{DAV:}prop') {
+                // propfind properties
+                foreach ($reportProps['value'] as $propVal) {
+                    $requestedProps[] = $propVal['name'];
+                }
+            }
+        }
+
+        if (empty($filterRules)) {
+            // an empty filter would return all existing files which would be slow
+            throw new BadRequest('Missing filter-rule block in request');
+        }
+
+        // gather all file ids matching filter
+        try {
+            $resultFileIds = $this->processFilterRules($filterRules);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
+        }
+
+        // find sabre nodes by file id, restricted to the root node path
+        $results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
+
+        $filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
+        $responses = $this->prepareResponses($filesUri, $requestedProps, $results);
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Returns the base uri of the files root by removing
+     * the subpath from the URI
+     *
+     * @param string $uri URI from this request
+     * @param string $subPath subpath to remove from the URI
+     *
+     * @return string files base uri
+     */
+    private function getFilesBaseUri($uri, $subPath) {
+        $uri = trim($uri, '/');
+        $subPath = trim($subPath, '/');
+        if (empty($subPath)) {
+            $filesUri = $uri;
+        } else {
+            $filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
+        }
+        $filesUri = trim($filesUri, '/');
+        if (empty($filesUri)) {
+            return '';
+        }
+        return '/' . $filesUri;
+    }
+
+    /**
+     * Find file ids matching the given filter rules
+     *
+     * @param array $filterRules
+     * @return array array of unique file id results
+     *
+     * @throws TagNotFoundException whenever a tag was not found
+     */
+    protected function processFilterRules($filterRules) {
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $resultFileIds = null;
+        $systemTagIds = [];
+        $favoriteFilter = null;
+        foreach ($filterRules as $filterRule) {
+            if ($filterRule['name'] === $ns . 'systemtag') {
+                $systemTagIds[] = $filterRule['value'];
+            }
+            if ($filterRule['name'] === $ns . 'favorite') {
+                $favoriteFilter = true;
+            }
+        }
+
+        if ($favoriteFilter !== null) {
+            $resultFileIds = $this->fileTagger->load('files')->getFavorites();
+            if (empty($resultFileIds)) {
+                return [];
+            }
+        }
+
+        if (!empty($systemTagIds)) {
+            $fileIds = $this->getSystemTagFileIds($systemTagIds);
+            if (empty($resultFileIds)) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($fileIds, $resultFileIds);
+            }
+        }
+
+        return $resultFileIds;
+    }
+
+    private function getSystemTagFileIds($systemTagIds) {
+        $resultFileIds = null;
+
+        // check user permissions, if applicable
+        if (!$this->isAdmin()) {
+            // check visibility/permission
+            $tags = $this->tagManager->getTagsByIds($systemTagIds);
+            $unknownTagIds = [];
+            foreach ($tags as $tag) {
+                if (!$tag->isUserVisible()) {
+                    $unknownTagIds[] = $tag->getId();
+                }
+            }
+
+            if (!empty($unknownTagIds)) {
+                throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+            }
+        }
+
+        // fetch all file ids and intersect them
+        foreach ($systemTagIds as $systemTagId) {
+            $fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
+
+            if (empty($fileIds)) {
+                // This tag has no files, nothing can ever show up
+                return [];
+            }
+
+            // first run ?
+            if ($resultFileIds === null) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($resultFileIds, $fileIds);
+            }
+
+            if (empty($resultFileIds)) {
+                // Empty intersection, nothing can show up anymore
+                return [];
+            }
+        }
+        return $resultFileIds;
+    }
+
+    /**
+     * Prepare propfind response for the given nodes
+     *
+     * @param string $filesUri $filesUri URI leading to root of the files URI,
+     * with a leading slash but no trailing slash
+     * @param string[] $requestedProps requested properties
+     * @param Node[] nodes nodes for which to fetch and prepare responses
+     * @return Response[]
+     */
+    public function prepareResponses($filesUri, $requestedProps, $nodes) {
+        $responses = [];
+        foreach ($nodes as $node) {
+            $propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+
+            $this->server->getPropertiesByNode($propFind, $node);
+            // copied from Sabre Server's getPropertiesForPath
+            $result = $propFind->getResultForMultiStatus();
+            $result['href'] = $propFind->getPath();
+
+            $resourceType = $this->server->getResourceTypeForNode($node);
+            if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+                $result['href'] .= '/';
+            }
+
+            $responses[] = new Response(
+                rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+                $result,
+                200
+            );
+        }
+        return $responses;
+    }
+
+    /**
+     * Find Sabre nodes by file ids
+     *
+     * @param Node $rootNode root node for search
+     * @param array $fileIds file ids
+     * @return Node[] array of Sabre nodes
+     */
+    public function findNodesByFileIds($rootNode, $fileIds) {
+        $folder = $this->userFolder;
+        if (trim($rootNode->getPath(), '/') !== '') {
+            $folder = $folder->get($rootNode->getPath());
+        }
+
+        $results = [];
+        foreach ($fileIds as $fileId) {
+            $entry = $folder->getById($fileId);
+            if ($entry) {
+                $entry = current($entry);
+                if ($entry instanceof \OCP\Files\File) {
+                    $results[] = new File($this->fileView, $entry);
+                } else if ($entry instanceof \OCP\Files\Folder) {
+                    $results[] = new Directory($this->fileView, $entry);
+                }
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -172,14 +172,14 @@ 
 			return;
 		}
 
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$requestedProps = [];
 		$filterRules = [];
 
 		// parse report properties and gather filter info
 		foreach ($report as $reportProps) {
 			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
+			if ($name === $ns.'filter-rules') {
 				$filterRules = $reportProps['value'];
 			} else if ($name === '{DAV:}prop') {
 				// propfind properties
@@ -240,7 +240,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -252,15 +252,15 @@ 
 	 * @throws TagNotFoundException whenever a tag was not found
 	 */
 	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$resultFileIds = null;
 		$systemTagIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
+			if ($filterRule['name'] === $ns.'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
-			if ($filterRule['name'] === $ns . 'favorite') {
+			if ($filterRule['name'] === $ns.'favorite') {
 				$favoriteFilter = true;
 			}
 		}
@@ -299,7 +299,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -339,7 +339,7 @@ 
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
 		$responses = [];
 		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+			$propFind = new PropFind($filesUri.$node->getPath(), $requestedProps);
 
 			$this->server->getPropertiesByNode($propFind, $node);
 			// copied from Sabre Server's getPropertiesForPath
@@ -352,7 +352,7 @@ 
 			}
 
 			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+				rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(),
 				$result,
 				200
 			);

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

Indentation +43 added lines, -43 removed lines

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

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

Indentation +48 added lines, -48 removed lines

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

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

Indentation +248 added lines, -248 removed lines

@@ -39,276 +39,276 @@
 use Sabre\DAV\Exception\Locked;
 
 class Directory extends \OCA\DAV\Connector\Sabre\Node
-	implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
+    implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
 
-	/**
-	 * Cached directory content
-	 *
-	 * @var \OCP\Files\FileInfo[]
-	 */
-	private $dirContent;
+    /**
+     * Cached directory content
+     *
+     * @var \OCP\Files\FileInfo[]
+     */
+    private $dirContent;
 
-	/**
-	 * Cached quota info
-	 *
-	 * @var array
-	 */
-	private $quotaInfo;
+    /**
+     * Cached quota info
+     *
+     * @var array
+     */
+    private $quotaInfo;
 
-	/**
-	 * @var ObjectTree|null
-	 */
-	private $tree;
+    /**
+     * @var ObjectTree|null
+     */
+    private $tree;
 
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\FileInfo $info
-	 * @param ObjectTree|null $tree
-	 * @param \OCP\Share\IManager $shareManager
-	 */
-	public function __construct($view, $info, $tree = null, $shareManager = null) {
-		parent::__construct($view, $info, $shareManager);
-		$this->tree = $tree;
-	}
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\FileInfo $info
+     * @param ObjectTree|null $tree
+     * @param \OCP\Share\IManager $shareManager
+     */
+    public function __construct($view, $info, $tree = null, $shareManager = null) {
+        parent::__construct($view, $info, $shareManager);
+        $this->tree = $tree;
+    }
 
-	/**
-	 * Creates a new file in the directory
-	 *
-	 * Data will either be supplied as a stream resource, or in certain cases
-	 * as a string. Keep in mind that you may have to support either.
-	 *
-	 * After successful creation of the file, you may choose to return the ETag
-	 * of the new file here.
-	 *
-	 * The returned ETag must be surrounded by double-quotes (The quotes should
-	 * be part of the actual string).
-	 *
-	 * If you cannot accurately determine the ETag, you should not return it.
-	 * If you don't store the file exactly as-is (you're transforming it
-	 * somehow) you should also not return an ETag.
-	 *
-	 * This means that if a subsequent GET to this new file does not exactly
-	 * return the same contents of what was submitted here, you are strongly
-	 * recommended to omit the ETag.
-	 *
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Exception\EntityTooLarge
-	 * @throws Exception\UnsupportedMediaType
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createFile($name, $data = null) {
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After successful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Exception\EntityTooLarge
+     * @throws Exception\UnsupportedMediaType
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createFile($name, $data = null) {
 
-		try {
-			// for chunked upload also updating a existing file is a "createFile"
-			// because we create all the chunks before re-assemble them to the existing file.
-			if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+        try {
+            // for chunked upload also updating a existing file is a "createFile"
+            // because we create all the chunks before re-assemble them to the existing file.
+            if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 
-				// exit if we can't create a new file and we don't updatable existing file
-				$info = \OC_FileChunking::decodeName($name);
-				if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])
-				) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
+                // exit if we can't create a new file and we don't updatable existing file
+                $info = \OC_FileChunking::decodeName($name);
+                if (!$this->fileView->isCreatable($this->path) &&
+                    !$this->fileView->isUpdatable($this->path . '/' . $info['name'])
+                ) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
 
-			} else {
-				// For non-chunked upload it is enough to check if we can create a new file
-				if (!$this->fileView->isCreatable($this->path)) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
+            } else {
+                // For non-chunked upload it is enough to check if we can create a new file
+                if (!$this->fileView->isCreatable($this->path)) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
 
-			$this->fileView->verifyPath($this->path, $name);
+            $this->fileView->verifyPath($this->path, $name);
 
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
-			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
-			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
-			$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			return $node->put($data);
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
+            $path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+            // using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
+            $info = new \OC\Files\FileInfo($path, null, null, array(), null);
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+            $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            return $node->put($data);
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
 
-	/**
-	 * Creates a new subdirectory
-	 *
-	 * @param string $name
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createDirectory($name) {
-		try {
-			if (!$this->info->isCreatable()) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createDirectory($name) {
+        try {
+            if (!$this->info->isCreatable()) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
 
-			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
-			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
-			}
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
+            $this->fileView->verifyPath($this->path, $name);
+            $newPath = $this->path . '/' . $name;
+            if (!$this->fileView->mkdir($newPath)) {
+                throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+            }
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
 
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * @param string $name
-	 * @param \OCP\Files\FileInfo $info
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getChild($name, $info = null) {
-		$path = $this->path . '/' . $name;
-		if (is_null($info)) {
-			try {
-				$this->fileView->verifyPath($this->path, $name);
-				$info = $this->fileView->getFileInfo($path);
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-			} catch (\OCP\Files\InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		}
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @param \OCP\Files\FileInfo $info
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getChild($name, $info = null) {
+        $path = $this->path . '/' . $name;
+        if (is_null($info)) {
+            try {
+                $this->fileView->verifyPath($this->path, $name);
+                $info = $this->fileView->getFileInfo($path);
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+            } catch (\OCP\Files\InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        }
 
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
 
-		if ($info['mimetype'] == 'httpd/unix-directory') {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
-		} else {
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
-		}
-		if ($this->tree) {
-			$this->tree->cacheNode($node);
-		}
-		return $node;
-	}
+        if ($info['mimetype'] == 'httpd/unix-directory') {
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
+        } else {
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
+        }
+        if ($this->tree) {
+            $this->tree->cacheNode($node);
+        }
+        return $node;
+    }
 
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 */
-	public function getChildren() {
-		if (!is_null($this->dirContent)) {
-			return $this->dirContent;
-		}
-		try {
-			$folderContent = $this->fileView->getDirectoryContent($this->path);
-		} catch (LockedException $e) {
-			throw new Locked();
-		}
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     */
+    public function getChildren() {
+        if (!is_null($this->dirContent)) {
+            return $this->dirContent;
+        }
+        try {
+            $folderContent = $this->fileView->getDirectoryContent($this->path);
+        } catch (LockedException $e) {
+            throw new Locked();
+        }
 
-		$nodes = array();
-		foreach ($folderContent as $info) {
-			$node = $this->getChild($info->getName(), $info);
-			$nodes[] = $node;
-		}
-		$this->dirContent = $nodes;
-		return $this->dirContent;
-	}
+        $nodes = array();
+        foreach ($folderContent as $info) {
+            $node = $this->getChild($info->getName(), $info);
+            $nodes[] = $node;
+        }
+        $this->dirContent = $nodes;
+        return $this->dirContent;
+    }
 
-	/**
-	 * Checks if a child exists.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		// note: here we do NOT resolve the chunk file name to the real file name
-		// to make sure we return false when checking for file existence with a chunk
-		// file name.
-		// This is to make sure that "createFile" is still triggered
-		// (required old code) instead of "updateFile".
-		//
-		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
-		return $this->fileView->file_exists($path);
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        // note: here we do NOT resolve the chunk file name to the real file name
+        // to make sure we return false when checking for file existence with a chunk
+        // file name.
+        // This is to make sure that "createFile" is still triggered
+        // (required old code) instead of "updateFile".
+        //
+        // TODO: resolve chunk file name here and implement "updateFile"
+        $path = $this->path . '/' . $name;
+        return $this->fileView->file_exists($path);
 
-	}
+    }
 
-	/**
-	 * Deletes all files in this directory, and then itself
-	 *
-	 * @return void
-	 * @throws FileLocked
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function delete() {
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return void
+     * @throws FileLocked
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function delete() {
 
-		if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
+        if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
 
-		try {
-			if (!$this->fileView->rmdir($this->path)) {
-				// assume it wasn't possible to remove due to permission issue
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
+        try {
+            if (!$this->fileView->rmdir($this->path)) {
+                // assume it wasn't possible to remove due to permission issue
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
 
-	/**
-	 * Returns available diskspace information
-	 *
-	 * @return array
-	 */
-	public function getQuotaInfo() {
-		if ($this->quotaInfo) {
-			return $this->quotaInfo;
-		}
-		try {
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
-			if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				$free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-			} else {
-				$free = $storageInfo['free'];
-			}
-			$this->quotaInfo = array(
-				$storageInfo['used'],
-				$free
-			);
-			return $this->quotaInfo;
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			return array(0, 0);
-		}
-	}
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+        if ($this->quotaInfo) {
+            return $this->quotaInfo;
+        }
+        try {
+            $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
+            if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                $free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+            } else {
+                $free = $storageInfo['free'];
+            }
+            $this->quotaInfo = array(
+                $storageInfo['used'],
+                $free
+            );
+            return $this->quotaInfo;
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
+            return array(0, 0);
+        }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -115,7 +115,7 @@ 
 				// exit if we can't create a new file and we don't updatable existing file
 				$info = \OC_FileChunking::decodeName($name);
 				if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])
+					!$this->fileView->isUpdatable($this->path.'/'.$info['name'])
 				) {
 					throw new \Sabre\DAV\Exception\Forbidden();
 				}
@@ -129,7 +129,7 @@ 
 
 			$this->fileView->verifyPath($this->path, $name);
 
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
 			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
 			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
@@ -162,9 +162,9 @@ 
 			}
 
 			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
+			$newPath = $this->path.'/'.$name;
 			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
 			}
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -188,7 +188,7 @@ 
 	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
 	 */
 	public function getChild($name, $info = null) {
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		if (is_null($info)) {
 			try {
 				$this->fileView->verifyPath($this->path, $name);
@@ -203,7 +203,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info['mimetype'] == 'httpd/unix-directory') {
@@ -255,7 +255,7 @@ 
 		// (required old code) instead of "updateFile".
 		//
 		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		return $this->fileView->file_exists($path);
 
 	}

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

Indentation +38 added lines, -38 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function beforeHandler(RequestInterface $request) {
 		$userAgent = $request->getHeader('User-Agent');
-		if($userAgent === null) {
+		if ($userAgent === null) {
 			return;
 		}
 
@@ -73,7 +73,7 @@ 
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
 		// "mirall/%1" for older releases
 		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
-		if(isset($versionMatches[1]) &&
+		if (isset($versionMatches[1]) &&
 			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
 			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
 		}

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

Indentation +98 added lines, -98 removed lines

@@ -29,103 +29,103 @@
 
 class CommentPropertiesPlugin extends ServerPlugin {
 
-	const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
-	const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
-
-	/** @var  \Sabre\DAV\Server */
-	protected $server;
-
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * 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
-	 */
-	function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-	}
-
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof File) && !($node instanceof Directory)) {
-			return;
-		}
-
-		$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
-			return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
-			return $this->getCommentsLink($node);
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
-			return $this->getUnreadCount($node);
-		});
-	}
-
-	/**
-	 * returns a reference to the comments node
-	 *
-	 * @param Node $node
-	 * @return mixed|string
-	 */
-	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
-		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
-			// in case we end up somewhere else, unexpectedly.
-			return null;
-		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
-		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
-		return $href;
-	}
-
-	/**
-	 * returns the number of unread comments for the currently logged in user
-	 * on the given file or directory node
-	 *
-	 * @param Node $node
-	 * @return Int|null
-	 */
-	public function getUnreadCount(Node $node) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return null;
-		}
-
-		$lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
-
-		return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
-	}
+    const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
+    const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
+
+    /** @var  \Sabre\DAV\Server */
+    protected $server;
+
+    /** @var ICommentsManager */
+    private $commentsManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * 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
+     */
+    function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+    }
+
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof File) && !($node instanceof Directory)) {
+            return;
+        }
+
+        $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
+            return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
+            return $this->getCommentsLink($node);
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
+            return $this->getUnreadCount($node);
+        });
+    }
+
+    /**
+     * returns a reference to the comments node
+     *
+     * @param Node $node
+     * @return mixed|string
+     */
+    public function getCommentsLink(Node $node) {
+        $href =  $this->server->getBaseUri();
+        $entryPoint = strpos($href, '/remote.php/');
+        if($entryPoint === false) {
+            // in case we end up somewhere else, unexpectedly.
+            return null;
+        }
+        $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+        $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
+        return $href;
+    }
+
+    /**
+     * returns the number of unread comments for the currently logged in user
+     * on the given file or directory node
+     *
+     * @param Node $node
+     * @return Int|null
+     */
+    public function getUnreadCount(Node $node) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return null;
+        }
+
+        $lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
+
+        return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -99,13 +99,13 @@ 
 	 * @return mixed|string
 	 */
 	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
+		$href = $this->server->getBaseUri();
 		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
+		if ($entryPoint === false) {
 			// in case we end up somewhere else, unexpectedly.
 			return null;
 		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+		$commentsPart = 'dav/comments/files/'.rawurldecode($node->getId());
 		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
 		return $href;
 	}
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUnreadCount(Node $node) {
 		$user = $this->userSession->getUser();
-		if(is_null($user)) {
+		if (is_null($user)) {
 			return null;
 		}
 

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

Indentation +8 added lines, -8 removed lines

@@ -34,12 +34,12 @@
  */
 class Server extends \Sabre\DAV\Server {
 
-	/**
-	 * @see \Sabre\DAV\Server
-	 */
-	public function __construct($treeOrNode = null) {
-		parent::__construct($treeOrNode);
-		self::$exposeVersion = false;
-		$this->enablePropfindDepthInfinity = true;
-	}
+    /**
+     * @see \Sabre\DAV\Server
+     */
+    public function __construct($treeOrNode = null) {
+        parent::__construct($treeOrNode);
+        self::$exposeVersion = false;
+        $this->enablePropfindDepthInfinity = true;
+    }
 }