nextcloud / server

apps/files/lib/Settings/PersonalSettings.php

Indentation +9 added lines, -9 removed lines

@@ -31,15 +31,15 @@
 use OCP\Settings\ISettings;
 
 class PersonalSettings implements ISettings {
-	public function getForm(): TemplateResponse {
-		return new TemplateResponse(Application::APP_ID, 'settings-personal');
-	}
+    public function getForm(): TemplateResponse {
+        return new TemplateResponse(Application::APP_ID, 'settings-personal');
+    }
 
-	public function getSection(): string {
-		return 'sharing';
-	}
+    public function getSection(): string {
+        return 'sharing';
+    }
 
-	public function getPriority(): int {
-		return 90;
-	}
+    public function getPriority(): int {
+        return 90;
+    }
 }

apps/files/lib/Collaboration/Resources/ResourceProvider.php

Indentation +96 added lines, -96 removed lines

@@ -37,100 +37,100 @@
 use OCP\IUser;
 
 class ResourceProvider implements IProvider {
-	public const RESOURCE_TYPE = 'file';
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var IPreview */
-	private $preview;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var array */
-	protected $nodes = [];
-
-	public function __construct(IRootFolder $rootFolder,
-								IPreview $preview,
-								IURLGenerator $urlGenerator) {
-		$this->rootFolder = $rootFolder;
-		$this->preview = $preview;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	private function getNode(IResource $resource): ?Node {
-		if (isset($this->nodes[(int) $resource->getId()])) {
-			return $this->nodes[(int) $resource->getId()];
-		}
-		$nodes = $this->rootFolder->getById((int) $resource->getId());
-		if (!empty($nodes)) {
-			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
-			return $this->nodes[(int) $resource->getId()];
-		}
-		return null;
-	}
-
-	/**
-	 * @param IResource $resource
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getResourceRichObject(IResource $resource): array {
-		if (isset($this->nodes[(int) $resource->getId()])) {
-			$node = $this->nodes[(int) $resource->getId()]->getPath();
-		} else {
-			$node = $this->getNode($resource);
-		}
-
-		if ($node instanceof Node) {
-			$link = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				['fileid' => $resource->getId()]
-			);
-			return [
-				'type' => 'file',
-				'id' => $resource->getId(),
-				'name' => $node->getName(),
-				'path' => $node->getInternalPath(),
-				'link' => $link,
-				'mimetype' => $node->getMimetype(),
-				'preview-available' => $this->preview->isAvailable($node),
-			];
-		}
-
-		throw new ResourceException('File not found');
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IResource $resource
-	 * @param IUser $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessResource(IResource $resource, IUser $user = null): bool {
-		if (!$user instanceof IUser) {
-			return false;
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById((int) $resource->getId());
-
-		if (!empty($nodes)) {
-			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the resource type of the provider
-	 *
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return self::RESOURCE_TYPE;
-	}
+    public const RESOURCE_TYPE = 'file';
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var IPreview */
+    private $preview;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var array */
+    protected $nodes = [];
+
+    public function __construct(IRootFolder $rootFolder,
+                                IPreview $preview,
+                                IURLGenerator $urlGenerator) {
+        $this->rootFolder = $rootFolder;
+        $this->preview = $preview;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    private function getNode(IResource $resource): ?Node {
+        if (isset($this->nodes[(int) $resource->getId()])) {
+            return $this->nodes[(int) $resource->getId()];
+        }
+        $nodes = $this->rootFolder->getById((int) $resource->getId());
+        if (!empty($nodes)) {
+            $this->nodes[(int) $resource->getId()] = array_shift($nodes);
+            return $this->nodes[(int) $resource->getId()];
+        }
+        return null;
+    }
+
+    /**
+     * @param IResource $resource
+     * @return array
+     * @since 16.0.0
+     */
+    public function getResourceRichObject(IResource $resource): array {
+        if (isset($this->nodes[(int) $resource->getId()])) {
+            $node = $this->nodes[(int) $resource->getId()]->getPath();
+        } else {
+            $node = $this->getNode($resource);
+        }
+
+        if ($node instanceof Node) {
+            $link = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                ['fileid' => $resource->getId()]
+            );
+            return [
+                'type' => 'file',
+                'id' => $resource->getId(),
+                'name' => $node->getName(),
+                'path' => $node->getInternalPath(),
+                'link' => $link,
+                'mimetype' => $node->getMimetype(),
+                'preview-available' => $this->preview->isAvailable($node),
+            ];
+        }
+
+        throw new ResourceException('File not found');
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IResource $resource
+     * @param IUser $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessResource(IResource $resource, IUser $user = null): bool {
+        if (!$user instanceof IUser) {
+            return false;
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $nodes = $userFolder->getById((int) $resource->getId());
+
+        if (!empty($nodes)) {
+            $this->nodes[(int) $resource->getId()] = array_shift($nodes);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the resource type of the provider
+     *
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return self::RESOURCE_TYPE;
+    }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -49,17 +49,17 @@
 	 * @param \DOMElement $errorNode
 	 * @return void
 	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+	public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
 
 		// set ownCloud namespace
 		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
 		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
 		$errorNode->appendChild($error);
 
 		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
 		$errorNode->appendChild($error);
 	}
 }

Indentation +40 added lines, -40 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 			return;
 		}
 
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
+		return $this->checkQuota($parent->getPath().'/'.basename($uri));
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 				// there is still enough space for the remaining chunks
 				$length -= $chunkHandler->getCurrentSize();
 				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
+				$path = rtrim($parentPath, '/').'/'.$info['name'];
 			}
 			$freeSpace = $this->getFreeSpace($path);
 			if ($freeSpace >= 0 && $length > $freeSpace) {

Indentation +203 added lines, -203 removed lines

@@ -44,207 +44,207 @@
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
-	/** @var \OC\Files\View */
-	private $view;
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @param \OC\Files\View $view
-	 */
-	public function __construct($view) {
-		$this->view = $view;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the requires event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-
-		$server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
-		$server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10);
-		$server->on('beforeMove', [$this, 'beforeMove'], 10);
-		$server->on('beforeCopy', [$this, 'beforeCopy'], 10);
-	}
-
-	/**
-	 * Check quota before creating file
-	 *
-	 * @param string $uri target file URI
-	 * @param resource $data data
-	 * @param INode $parent Sabre Node
-	 * @param bool $modified modified
-	 */
-	public function beforeCreateFile($uri, $data, INode $parent, $modified) {
-		if (!$parent instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
-	}
-
-	/**
-	 * Check quota before writing content
-	 *
-	 * @param string $uri target file URI
-	 * @param INode $node Sabre Node
-	 * @param resource $data data
-	 * @param bool $modified modified
-	 */
-	public function beforeWriteContent($uri, INode $node, $data, $modified) {
-		if (!$node instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($node->getPath());
-	}
-
-	/**
-	 * Check if we're moving a Futurefile in which case we need to check
-	 * the quota on the target destination.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 */
-	public function beforeMove($source, $destination) {
-		$sourceNode = $this->server->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof FutureFile) {
-			return;
-		}
-
-		// get target node for proper path conversion
-		if ($this->server->tree->nodeExists($destination)) {
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
-			$path = $destinationNode->getPath();
-		} else {
-			$parent = dirname($destination);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			$parentNode = $this->server->tree->getNodeForPath($parent);
-			$path = $parentNode->getPath();
-		}
-
-		return $this->checkQuota($path, $sourceNode->getSize());
-	}
-
-	/**
-	 * Check quota on the target destination before a copy.
-	 */
-	public function beforeCopy(string $sourcePath, string $destinationPath): bool {
-		$sourceNode = $this->server->tree->getNodeForPath($sourcePath);
-		if (!$sourceNode instanceof Node) {
-			return true;
-		}
-
-		// get target node for proper path conversion
-		if ($this->server->tree->nodeExists($destinationPath)) {
-			$destinationNode = $this->server->tree->getNodeForPath($destinationPath);
-			if (!$destinationNode instanceof Node) {
-				return true;
-			}
-			$path = $destinationNode->getPath();
-		} else {
-			$parent = dirname($destinationPath);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			$parentNode = $this->server->tree->getNodeForPath($parent);
-			if (!$parentNode instanceof Node) {
-				return true;
-			}
-			$path = $parentNode->getPath();
-		}
-
-		return $this->checkQuota($path, $sourceNode->getSize());
-	}
-
-
-	/**
-	 * This method is called before any HTTP method and validates there is enough free space to store the file
-	 *
-	 * @param string $path relative to the users home
-	 * @param int|float|null $length
-	 * @throws InsufficientStorage
-	 * @return bool
-	 */
-	public function checkQuota($path, $length = null) {
-		if ($length === null) {
-			$length = $this->getLength();
-		}
-
-		if ($length) {
-			[$parentPath, $newName] = \Sabre\Uri\split($path);
-			if (is_null($parentPath)) {
-				$parentPath = '';
-			}
-			$req = $this->server->httpRequest;
-			if ($req->getHeader('OC-Chunked')) {
-				$info = \OC_FileChunking::decodeName($newName);
-				$chunkHandler = $this->getFileChunking($info);
-				// subtract the already uploaded size to see whether
-				// there is still enough space for the remaining chunks
-				$length -= $chunkHandler->getCurrentSize();
-				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
-			}
-			$freeSpace = $this->getFreeSpace($path);
-			if ($freeSpace >= 0 && $length > $freeSpace) {
-				if (isset($chunkHandler)) {
-					$chunkHandler->cleanup();
-				}
-				throw new InsufficientStorage("Insufficient space in $path, $length required, $freeSpace available");
-			}
-		}
-		return true;
-	}
-
-	public function getFileChunking($info) {
-		// FIXME: need a factory for better mocking support
-		return new \OC_FileChunking($info);
-	}
-
-	public function getLength() {
-		$req = $this->server->httpRequest;
-		$length = $req->getHeader('X-Expected-Entity-Length');
-		if (!is_numeric($length)) {
-			$length = $req->getHeader('Content-Length');
-			$length = is_numeric($length) ? $length : null;
-		}
-
-		$ocLength = $req->getHeader('OC-Total-Length');
-		if (is_numeric($length) && is_numeric($ocLength)) {
-			return max($length, $ocLength);
-		}
-
-		return $length;
-	}
-
-	/**
-	 * @param string $uri
-	 * @return mixed
-	 * @throws ServiceUnavailable
-	 */
-	public function getFreeSpace($uri) {
-		try {
-			$freeSpace = $this->view->free_space(ltrim($uri, '/'));
-			return $freeSpace;
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($e->getMessage());
-		}
-	}
+    /** @var \OC\Files\View */
+    private $view;
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @param \OC\Files\View $view
+     */
+    public function __construct($view) {
+        $this->view = $view;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+
+        $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
+        $server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10);
+        $server->on('beforeMove', [$this, 'beforeMove'], 10);
+        $server->on('beforeCopy', [$this, 'beforeCopy'], 10);
+    }
+
+    /**
+     * Check quota before creating file
+     *
+     * @param string $uri target file URI
+     * @param resource $data data
+     * @param INode $parent Sabre Node
+     * @param bool $modified modified
+     */
+    public function beforeCreateFile($uri, $data, INode $parent, $modified) {
+        if (!$parent instanceof Node) {
+            return;
+        }
+
+        return $this->checkQuota($parent->getPath() . '/' . basename($uri));
+    }
+
+    /**
+     * Check quota before writing content
+     *
+     * @param string $uri target file URI
+     * @param INode $node Sabre Node
+     * @param resource $data data
+     * @param bool $modified modified
+     */
+    public function beforeWriteContent($uri, INode $node, $data, $modified) {
+        if (!$node instanceof Node) {
+            return;
+        }
+
+        return $this->checkQuota($node->getPath());
+    }
+
+    /**
+     * Check if we're moving a Futurefile in which case we need to check
+     * the quota on the target destination.
+     *
+     * @param string $source source path
+     * @param string $destination destination path
+     */
+    public function beforeMove($source, $destination) {
+        $sourceNode = $this->server->tree->getNodeForPath($source);
+        if (!$sourceNode instanceof FutureFile) {
+            return;
+        }
+
+        // get target node for proper path conversion
+        if ($this->server->tree->nodeExists($destination)) {
+            $destinationNode = $this->server->tree->getNodeForPath($destination);
+            $path = $destinationNode->getPath();
+        } else {
+            $parent = dirname($destination);
+            if ($parent === '.') {
+                $parent = '';
+            }
+            $parentNode = $this->server->tree->getNodeForPath($parent);
+            $path = $parentNode->getPath();
+        }
+
+        return $this->checkQuota($path, $sourceNode->getSize());
+    }
+
+    /**
+     * Check quota on the target destination before a copy.
+     */
+    public function beforeCopy(string $sourcePath, string $destinationPath): bool {
+        $sourceNode = $this->server->tree->getNodeForPath($sourcePath);
+        if (!$sourceNode instanceof Node) {
+            return true;
+        }
+
+        // get target node for proper path conversion
+        if ($this->server->tree->nodeExists($destinationPath)) {
+            $destinationNode = $this->server->tree->getNodeForPath($destinationPath);
+            if (!$destinationNode instanceof Node) {
+                return true;
+            }
+            $path = $destinationNode->getPath();
+        } else {
+            $parent = dirname($destinationPath);
+            if ($parent === '.') {
+                $parent = '';
+            }
+            $parentNode = $this->server->tree->getNodeForPath($parent);
+            if (!$parentNode instanceof Node) {
+                return true;
+            }
+            $path = $parentNode->getPath();
+        }
+
+        return $this->checkQuota($path, $sourceNode->getSize());
+    }
+
+
+    /**
+     * This method is called before any HTTP method and validates there is enough free space to store the file
+     *
+     * @param string $path relative to the users home
+     * @param int|float|null $length
+     * @throws InsufficientStorage
+     * @return bool
+     */
+    public function checkQuota($path, $length = null) {
+        if ($length === null) {
+            $length = $this->getLength();
+        }
+
+        if ($length) {
+            [$parentPath, $newName] = \Sabre\Uri\split($path);
+            if (is_null($parentPath)) {
+                $parentPath = '';
+            }
+            $req = $this->server->httpRequest;
+            if ($req->getHeader('OC-Chunked')) {
+                $info = \OC_FileChunking::decodeName($newName);
+                $chunkHandler = $this->getFileChunking($info);
+                // subtract the already uploaded size to see whether
+                // there is still enough space for the remaining chunks
+                $length -= $chunkHandler->getCurrentSize();
+                // use target file name for free space check in case of shared files
+                $path = rtrim($parentPath, '/') . '/' . $info['name'];
+            }
+            $freeSpace = $this->getFreeSpace($path);
+            if ($freeSpace >= 0 && $length > $freeSpace) {
+                if (isset($chunkHandler)) {
+                    $chunkHandler->cleanup();
+                }
+                throw new InsufficientStorage("Insufficient space in $path, $length required, $freeSpace available");
+            }
+        }
+        return true;
+    }
+
+    public function getFileChunking($info) {
+        // FIXME: need a factory for better mocking support
+        return new \OC_FileChunking($info);
+    }
+
+    public function getLength() {
+        $req = $this->server->httpRequest;
+        $length = $req->getHeader('X-Expected-Entity-Length');
+        if (!is_numeric($length)) {
+            $length = $req->getHeader('Content-Length');
+            $length = is_numeric($length) ? $length : null;
+        }
+
+        $ocLength = $req->getHeader('OC-Total-Length');
+        if (is_numeric($length) && is_numeric($ocLength)) {
+            return max($length, $ocLength);
+        }
+
+        return $length;
+    }
+
+    /**
+     * @param string $uri
+     * @return mixed
+     * @throws ServiceUnavailable
+     */
+    public function getFreeSpace($uri) {
+        try {
+            $freeSpace = $this->view->free_space(ltrim($uri, '/'));
+            return $freeSpace;
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($e->getMessage());
+        }
+    }
 }

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

Spacing +9 added lines, -9 removed lines

@@ -186,14 +186,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'];
 			} elseif ($name === '{DAV:}prop') {
 				// propfind properties
@@ -254,7 +254,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -266,19 +266,19 @@ 
 	 * @throws TagNotFoundException whenever a tag was not found
 	 */
 	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$resultFileIds = null;
 		$systemTagIds = [];
 		$circlesIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
+			if ($filterRule['name'] === $ns.'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
 			if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
 				$circlesIds[] = $filterRule['value'];
 			}
-			if ($filterRule['name'] === $ns . 'favorite') {
+			if ($filterRule['name'] === $ns.'favorite') {
 				$favoriteFilter = true;
 			}
 		}
@@ -326,7 +326,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -379,7 +379,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
@@ -392,7 +392,7 @@ 
 			}
 
 			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+				rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(),
 				$result,
 				200
 			);

Indentation +392 added lines, -392 removed lines

@@ -46,396 +46,396 @@
 
 class FilesReportPlugin extends ServerPlugin {
 
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const REPORT_NAME = '{http://owncloud.org/ns}filter-files';
-	public const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
-	public const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
-
-	/**
-	 * 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;
-
-	/**
-	 * @var IAppManager
-	 */
-	private $appManager;
-
-	/**
-	 * @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
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(Tree $tree,
-								View $view,
-								ISystemTagManager $tagManager,
-								ISystemTagObjectMapper $tagMapper,
-								ITagManager $fileTagger,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								Folder $userFolder,
-								IAppManager $appManager
-	) {
-		$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->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) {
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server = $server;
-		$this->server->on('report', [$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'];
-			} elseif ($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(string $uri, string $subPath): string {
-		$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 = [];
-		$circlesIds = [];
-		$favoriteFilter = null;
-		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
-				$systemTagIds[] = $filterRule['value'];
-			}
-			if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
-				$circlesIds[] = $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);
-			}
-		}
-
-		if (!empty($circlesIds)) {
-			$fileIds = $this->getCirclesFileIds($circlesIds);
-			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;
-	}
-
-	/**
-	 * @suppress PhanUndeclaredClassMethod
-	 * @param array $circlesIds
-	 * @return array
-	 */
-	private function getCirclesFileIds(array $circlesIds) {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return [];
-		}
-		return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
-	}
-
-
-	/**
-	 * 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);
-				} elseif ($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
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const REPORT_NAME = '{http://owncloud.org/ns}filter-files';
+    public const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+    public const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
+
+    /**
+     * 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;
+
+    /**
+     * @var IAppManager
+     */
+    private $appManager;
+
+    /**
+     * @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
+     * @param IAppManager $appManager
+     */
+    public function __construct(Tree $tree,
+                                View $view,
+                                ISystemTagManager $tagManager,
+                                ISystemTagObjectMapper $tagMapper,
+                                ITagManager $fileTagger,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                Folder $userFolder,
+                                IAppManager $appManager
+    ) {
+        $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->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) {
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server = $server;
+        $this->server->on('report', [$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'];
+            } elseif ($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(string $uri, string $subPath): string {
+        $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 = [];
+        $circlesIds = [];
+        $favoriteFilter = null;
+        foreach ($filterRules as $filterRule) {
+            if ($filterRule['name'] === $ns . 'systemtag') {
+                $systemTagIds[] = $filterRule['value'];
+            }
+            if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
+                $circlesIds[] = $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);
+            }
+        }
+
+        if (!empty($circlesIds)) {
+            $fileIds = $this->getCirclesFileIds($circlesIds);
+            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;
+    }
+
+    /**
+     * @suppress PhanUndeclaredClassMethod
+     * @param array $circlesIds
+     * @return array
+     */
+    private function getCirclesFileIds(array $circlesIds) {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return [];
+        }
+        return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
+    }
+
+
+    /**
+     * 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);
+                } elseif ($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;
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
+		$server->on('beforeMethod:*', function() use ($server, $objectTree, $viewCallBack) {
 			// ensure the skeleton is copied
 			$userFolder = \OC::$server->getUserFolder();
 

Indentation +148 added lines, -148 removed lines

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

apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php

Spacing +9 added lines, -9 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return boolean
 	 */
 	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+		if ($request->getPath() !== 'provisioning/'.AppleProvisioningNode::FILENAME) {
 			return true;
 		}
 
@@ -144,19 +144,19 @@ 
 		$carddavUUID = call_user_func($this->uuidClosure);
 		$profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+		$caldavIdentifier = $reverseDomain.'.'.$caldavUUID;
+		$carddavIdentifier = $reverseDomain.'.'.$carddavUUID;
+		$profileIdentifier = $reverseDomain.'.'.$profileUUID;
 
 		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
+		$caldavDisplayname = $description.' CalDAV';
 		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+		$carddavDisplayname = $description.' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+		$filename = $userId.'-'.AppleProvisioningNode::FILENAME;
 
 		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
+		$body = vsprintf($xmlSkeleton, array_map(function($v) {
 			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
 		}, [
 			$description,
@@ -182,7 +182,7 @@ 
 		));
 
 		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
 		$response->setBody($body);
 

Indentation +133 added lines, -133 removed lines

@@ -36,162 +36,162 @@ 
 use Sabre\HTTP\ResponseInterface;
 
 class AppleProvisioningPlugin extends ServerPlugin {
-	/**
-	 * @var Server
-	 */
-	protected $server;
+    /**
+     * @var Server
+     */
+    protected $server;
 
-	/**
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var \OC_Defaults
-	 */
-	protected $themingDefaults;
+    /**
+     * @var \OC_Defaults
+     */
+    protected $themingDefaults;
 
-	/**
-	 * @var IRequest
-	 */
-	protected $request;
+    /**
+     * @var IRequest
+     */
+    protected $request;
 
-	/**
-	 * @var IL10N
-	 */
-	protected $l10n;
+    /**
+     * @var IL10N
+     */
+    protected $l10n;
 
-	/**
-	 * @var \Closure
-	 */
-	protected $uuidClosure;
+    /**
+     * @var \Closure
+     */
+    protected $uuidClosure;
 
-	/**
-	 * AppleProvisioningPlugin constructor.
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IURLGenerator $urlGenerator,
-		\OC_Defaults $themingDefaults,
-		IRequest $request,
-		IL10N $l10n,
-		\Closure $uuidClosure
-	) {
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->themingDefaults = $themingDefaults;
-		$this->request = $request;
-		$this->l10n = $l10n;
-		$this->uuidClosure = $uuidClosure;
-	}
+    /**
+     * AppleProvisioningPlugin constructor.
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IURLGenerator $urlGenerator,
+        \OC_Defaults $themingDefaults,
+        IRequest $request,
+        IL10N $l10n,
+        \Closure $uuidClosure
+    ) {
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->themingDefaults = $themingDefaults;
+        $this->request = $request;
+        $this->l10n = $l10n;
+        $this->uuidClosure = $uuidClosure;
+    }
 
-	/**
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
+    /**
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return boolean
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
-			return true;
-		}
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return boolean
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
+        if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+            return true;
+        }
 
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return true;
-		}
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return true;
+        }
 
-		$serverProtocol = $this->request->getServerProtocol();
-		$useSSL = ($serverProtocol === 'https');
+        $serverProtocol = $this->request->getServerProtocol();
+        $useSSL = ($serverProtocol === 'https');
 
-		if (!$useSSL) {
-			$response->setStatus(200);
-			$response->setHeader('Content-Type', 'text/plain; charset=utf-8');
-			$response->setBody($this->l10n->t('Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS.', [$this->themingDefaults->getName()]));
+        if (!$useSSL) {
+            $response->setStatus(200);
+            $response->setHeader('Content-Type', 'text/plain; charset=utf-8');
+            $response->setBody($this->l10n->t('Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS.', [$this->themingDefaults->getName()]));
 
-			return false;
-		}
+            return false;
+        }
 
-		$absoluteURL = $this->urlGenerator->getBaseUrl();
-		$parsedUrl = parse_url($absoluteURL);
-		if (isset($parsedUrl['port'])) {
-			$serverPort = $parsedUrl['port'];
-		} else {
-			$serverPort = 443;
-		}
-		$server_url = $parsedUrl['host'];
+        $absoluteURL = $this->urlGenerator->getBaseUrl();
+        $parsedUrl = parse_url($absoluteURL);
+        if (isset($parsedUrl['port'])) {
+            $serverPort = $parsedUrl['port'];
+        } else {
+            $serverPort = 443;
+        }
+        $server_url = $parsedUrl['host'];
 
-		$description = $this->themingDefaults->getName();
-		$userId = $user->getUID();
+        $description = $this->themingDefaults->getName();
+        $userId = $user->getUID();
 
-		$reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
+        $reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
 
-		$caldavUUID = call_user_func($this->uuidClosure);
-		$carddavUUID = call_user_func($this->uuidClosure);
-		$profileUUID = call_user_func($this->uuidClosure);
+        $caldavUUID = call_user_func($this->uuidClosure);
+        $carddavUUID = call_user_func($this->uuidClosure);
+        $profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+        $caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
+        $carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
+        $profileIdentifier = $reverseDomain . '.' . $profileUUID;
 
-		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
-		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+        $caldavDescription = $this->l10n->t('Configures a CalDAV account');
+        $caldavDisplayname = $description . ' CalDAV';
+        $carddavDescription = $this->l10n->t('Configures a CardDAV account');
+        $carddavDisplayname = $description . ' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+        $filename = $userId . '-' . AppleProvisioningNode::FILENAME;
 
-		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
-			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
-		}, [
-			$description,
-			$server_url,
-			$userId,
-			$serverPort,
-			$caldavDescription,
-			$caldavDisplayname,
-			$caldavIdentifier,
-			$caldavUUID,
-			$description,
-			$server_url,
-			$userId,
-			$serverPort,
-			$carddavDescription,
-			$carddavDisplayname,
-			$carddavIdentifier,
-			$carddavUUID,
-			$description,
-			$profileIdentifier,
-			$profileUUID
-		]
-		));
+        $xmlSkeleton = $this->getTemplate();
+        $body = vsprintf($xmlSkeleton, array_map(function ($v) {
+            return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
+        }, [
+            $description,
+            $server_url,
+            $userId,
+            $serverPort,
+            $caldavDescription,
+            $caldavDisplayname,
+            $caldavIdentifier,
+            $caldavUUID,
+            $description,
+            $server_url,
+            $userId,
+            $serverPort,
+            $carddavDescription,
+            $carddavDisplayname,
+            $carddavIdentifier,
+            $carddavUUID,
+            $description,
+            $profileIdentifier,
+            $profileUUID
+        ]
+        ));
 
-		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	private function getTemplate():string {
-		return <<<EOF
+    /**
+     * @return string
+     */
+    private function getTemplate():string {
+        return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -263,5 +263,5 @@ 
 </plist>
 
 EOF;
-	}
+    }
 }

apps/dav/lib/CalDAV/Integration/ExternalCalendar.php

Indentation +84 added lines, -84 removed lines

@@ -33,99 +33,99 @@
  */
 abstract class ExternalCalendar implements CalDAV\ICalendar, DAV\IProperties {
 
-	/** @var string */
-	private const PREFIX = 'app-generated';
+    /** @var string */
+    private const PREFIX = 'app-generated';
 
-	/**
-	 * @var string
-	 *
-	 * Double dash is a valid delimiter,
-	 * because it will always split the calendarURIs correctly:
-	 * - our prefix contains only one dash and won't be split
-	 * - appIds are not allowed to contain dashes as per spec:
-	 * > must contain only lowercase ASCII characters and underscore
-	 * - explode has a limit of three, so even if the app-generated
-	 *   calendar uri has double dashes, it won't be split
-	 */
-	private const DELIMITER = '--';
+    /**
+     * @var string
+     *
+     * Double dash is a valid delimiter,
+     * because it will always split the calendarURIs correctly:
+     * - our prefix contains only one dash and won't be split
+     * - appIds are not allowed to contain dashes as per spec:
+     * > must contain only lowercase ASCII characters and underscore
+     * - explode has a limit of three, so even if the app-generated
+     *   calendar uri has double dashes, it won't be split
+     */
+    private const DELIMITER = '--';
 
-	/** @var string */
-	private $appId;
+    /** @var string */
+    private $appId;
 
-	/** @var string */
-	private $calendarUri;
+    /** @var string */
+    private $calendarUri;
 
-	/**
-	 * ExternalCalendar constructor.
-	 *
-	 * @param string $appId
-	 * @param string $calendarUri
-	 */
-	public function __construct(string $appId, string $calendarUri) {
-		$this->appId = $appId;
-		$this->calendarUri = $calendarUri;
-	}
+    /**
+     * ExternalCalendar constructor.
+     *
+     * @param string $appId
+     * @param string $calendarUri
+     */
+    public function __construct(string $appId, string $calendarUri) {
+        $this->appId = $appId;
+        $this->calendarUri = $calendarUri;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function getName() {
-		return implode(self::DELIMITER, [
-			self::PREFIX,
-			$this->appId,
-			$this->calendarUri,
-		]);
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function getName() {
+        return implode(self::DELIMITER, [
+            self::PREFIX,
+            $this->appId,
+            $this->calendarUri,
+        ]);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function setName($name) {
-		throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function setName($name) {
+        throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function createDirectory($name) {
-		throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function createDirectory($name) {
+        throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
+    }
 
-	/**
-	 * Checks whether the calendar uri is app-generated
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function isAppGeneratedCalendar(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
-	}
+    /**
+     * Checks whether the calendar uri is app-generated
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function isAppGeneratedCalendar(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
+    }
 
-	/**
-	 * Splits an app-generated calendar-uri into appId and calendarUri
-	 *
-	 * @param string $calendarUri
-	 * @return array
-	 */
-	public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
-		$array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
-		// Check the array has expected amount of elements
-		// and none of them is an empty string
-		if (\count($array) !== 2 || \in_array('', $array, true)) {
-			throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
-		}
+    /**
+     * Splits an app-generated calendar-uri into appId and calendarUri
+     *
+     * @param string $calendarUri
+     * @return array
+     */
+    public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
+        $array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
+        // Check the array has expected amount of elements
+        // and none of them is an empty string
+        if (\count($array) !== 2 || \in_array('', $array, true)) {
+            throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	/**
-	 * Checks whether a calendar-name, the user wants to create, violates
-	 * the reserved name for calendar uris
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function doesViolateReservedName(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0;
-	}
+    /**
+     * Checks whether a calendar-name, the user wants to create, violates
+     * the reserved name for calendar uris
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function doesViolateReservedName(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0;
+    }
 }

apps/dav/lib/CalDAV/CachedSubscription.php

Spacing +5 added lines, -5 removed lines

@@ -60,16 +60,16 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+				'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
 				'principal' => '{DAV:}authenticated',
 				'protected' => true,
 			],
@@ -89,12 +89,12 @@ 
 
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 

Indentation +165 added lines, -165 removed lines

@@ -42,171 +42,171 @@
  */
 class CachedSubscription extends \Sabre\CalDAV\Calendar {
 
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI():string {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getACL() {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			],
-		];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildACL() {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-
-		];
-	}
-
-	/**
-	 * @return null|string
-	 */
-	public function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
+    /**
+     * @return string
+     */
+    public function getPrincipalURI():string {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @return array
+     */
+    public function getACL() {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildACL() {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+
+        ];
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
 
 	
-	public function delete() {
-		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
-	}
-
-	/**
-	 * @param PropPatch $propPatch
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		$this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
-	}
-
-	/**
-	 * @param string $name
-	 * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-		return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-	}
-
-	/**
-	 * @return INode[]
-	 */
-	public function getChildren(): array {
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param array $paths
-	 * @return array
-	 */
-	public function getMultipleChildren(array $paths):array {
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param string $name
-	 * @param null|resource|string $calendarData
-	 * @return null|string
-	 * @throws MethodNotAllowed
-	 */
-	public function createFile($name, $calendarData = null) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
-
-	/**
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name):bool {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param array $filters
-	 * @return array
-	 */
-	public function calendarQuery(array $filters):array {
-		return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChanges($syncToken, $syncLevel, $limit = null) {
-		if (!$syncToken && $limit) {
-			throw new UnsupportedLimitOnInitialSyncException();
-		}
-
-		return parent::getChanges($syncToken, $syncLevel, $limit);
-	}
+    public function delete() {
+        $this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
+    }
+
+    /**
+     * @param PropPatch $propPatch
+     */
+    public function propPatch(PropPatch $propPatch) {
+        $this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
+    }
+
+    /**
+     * @param string $name
+     * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+        return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+    }
+
+    /**
+     * @return INode[]
+     */
+    public function getChildren(): array {
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $children = [];
+        foreach ($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param array $paths
+     * @return array
+     */
+    public function getMultipleChildren(array $paths):array {
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $children = [];
+        foreach ($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param string $name
+     * @param null|resource|string $calendarData
+     * @return null|string
+     * @throws MethodNotAllowed
+     */
+    public function createFile($name, $calendarData = null) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name):bool {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $filters
+     * @return array
+     */
+    public function calendarQuery(array $filters):array {
+        return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChanges($syncToken, $syncLevel, $limit = null) {
+        if (!$syncToken && $limit) {
+            throw new UnsupportedLimitOnInitialSyncException();
+        }
+
+        return parent::getChanges($syncToken, $syncLevel, $limit);
+    }
 }