nextcloud / server

apps/dav/lib/Files/Xml/FilterRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * the next element.
 	 *
 	 * @param Reader $reader
-	 * @return mixed
+	 * @return FilterRequest
 	 */
 	static function xmlDeserialize(Reader $reader) {
 		$elems = (array)$reader->parseInnerTree([

Indentation +87 added lines, -87 removed lines

@@ -9,102 +9,102 @@
 
 class FilterRequest implements XmlDeserializable {
 
-	/**
-	 * An array with requested properties.
-	 *
-	 * @var array
-	 */
-	public $properties;
+    /**
+     * An array with requested properties.
+     *
+     * @var array
+     */
+    public $properties;
 
-	/**
-	 * @var array
-	 */
-	public $filters;
+    /**
+     * @var array
+     */
+    public $filters;
 
-	/**
-	 * @var array
-	 */
-	public $search;
+    /**
+     * @var array
+     */
+    public $search;
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statically, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$elems = (array)$reader->parseInnerTree([
-			'{DAV:}prop' => KeyValue::class,
-			'{http://owncloud.org/ns}filter-rules' => Base::class,
-			'{http://owncloud.org/ns}search' => KeyValue::class,
-		]);
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statically, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $elems = (array)$reader->parseInnerTree([
+            '{DAV:}prop' => KeyValue::class,
+            '{http://owncloud.org/ns}filter-rules' => Base::class,
+            '{http://owncloud.org/ns}search' => KeyValue::class,
+        ]);
 
-		$newProps = [
-			'filters'    => [
-				'systemtag' => [],
-				'favorite' => null
-			],
-			'properties' => [],
-			'search' => null,
-		];
+        $newProps = [
+            'filters'    => [
+                'systemtag' => [],
+                'favorite' => null
+            ],
+            'properties' => [],
+            'search' => null,
+        ];
 
-		if (!is_array($elems)) {
-			$elems = [];
-		}
+        if (!is_array($elems)) {
+            $elems = [];
+        }
 
-		foreach ($elems as $elem) {
+        foreach ($elems as $elem) {
 
-			switch ($elem['name']) {
+            switch ($elem['name']) {
 
-				case '{DAV:}prop' :
-					$newProps['properties'] = array_keys($elem['value']);
-					break;
-				case '{http://owncloud.org/ns}filter-rules' :
+                case '{DAV:}prop' :
+                    $newProps['properties'] = array_keys($elem['value']);
+                    break;
+                case '{http://owncloud.org/ns}filter-rules' :
 
-					foreach ($elem['value'] as $tag) {
-						if ($tag['name'] === '{http://owncloud.org/ns}systemtag') {
-							$newProps['filters']['systemtag'][] = $tag['value'];
-						}
-						if ($tag['name'] === '{http://owncloud.org/ns}favorite') {
-							$newProps['filters']['favorite'] = true;
-						}
-					}
-					break;
-				case '{http://owncloud.org/ns}search' :
-					$value = $elem['value'];
-					if (isset($value['{http://owncloud.org/ns}pattern'])) {
-						$newProps['search']['pattern'] = $value['{http://owncloud.org/ns}pattern'];
-					}
-					if (isset($value['{http://owncloud.org/ns}limit'])) {
-						$newProps['search']['limit'] = (int)$value['{http://owncloud.org/ns}limit'];
-					}
-					if (isset($value['{http://owncloud.org/ns}offset'])) {
-						$newProps['search']['offset'] = (int)$value['{http://owncloud.org/ns}offset'];
-					}
-					break;
-			}
-		}
+                    foreach ($elem['value'] as $tag) {
+                        if ($tag['name'] === '{http://owncloud.org/ns}systemtag') {
+                            $newProps['filters']['systemtag'][] = $tag['value'];
+                        }
+                        if ($tag['name'] === '{http://owncloud.org/ns}favorite') {
+                            $newProps['filters']['favorite'] = true;
+                        }
+                    }
+                    break;
+                case '{http://owncloud.org/ns}search' :
+                    $value = $elem['value'];
+                    if (isset($value['{http://owncloud.org/ns}pattern'])) {
+                        $newProps['search']['pattern'] = $value['{http://owncloud.org/ns}pattern'];
+                    }
+                    if (isset($value['{http://owncloud.org/ns}limit'])) {
+                        $newProps['search']['limit'] = (int)$value['{http://owncloud.org/ns}limit'];
+                    }
+                    if (isset($value['{http://owncloud.org/ns}offset'])) {
+                        $newProps['search']['offset'] = (int)$value['{http://owncloud.org/ns}offset'];
+                    }
+                    break;
+            }
+        }
 
-		$obj = new self();
-		foreach ($newProps as $key => $value) {
-			$obj->$key = $value;
-		}
+        $obj = new self();
+        foreach ($newProps as $key => $value) {
+            $obj->$key = $value;
+        }
 
-		return $obj;
-	}
+        return $obj;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return mixed
 	 */
 	static function xmlDeserialize(Reader $reader) {
-		$elems = (array)$reader->parseInnerTree([
+		$elems = (array) $reader->parseInnerTree([
 			'{DAV:}prop' => KeyValue::class,
 			'{http://owncloud.org/ns}filter-rules' => Base::class,
 			'{http://owncloud.org/ns}search' => KeyValue::class,
@@ -91,10 +91,10 @@ 
 						$newProps['search']['pattern'] = $value['{http://owncloud.org/ns}pattern'];
 					}
 					if (isset($value['{http://owncloud.org/ns}limit'])) {
-						$newProps['search']['limit'] = (int)$value['{http://owncloud.org/ns}limit'];
+						$newProps['search']['limit'] = (int) $value['{http://owncloud.org/ns}limit'];
 					}
 					if (isset($value['{http://owncloud.org/ns}offset'])) {
-						$newProps['search']['offset'] = (int)$value['{http://owncloud.org/ns}offset'];
+						$newProps['search']['offset'] = (int) $value['{http://owncloud.org/ns}offset'];
 					}
 					break;
 			}

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

Indentation +353 added lines, -353 removed lines

@@ -42,357 +42,357 @@
 
 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';
-
-		$server->xml->elementMap[self::REPORT_NAME] = FilterRequest::class;
-
-		$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 mixed $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;
-		}
-
-		$requestedProps = $report->properties;
-		$filterRules = $report->filters;
-
-		// "systemtag" is always an array of tags, favorite a string/int/null
-		if (empty($filterRules['systemtag']) && is_null($filterRules['favorite'])) {
-			// FIXME: search currently not possible because results are missing properties!
-			throw new BadRequest('No filter criteria specified');
-		} else {
-			if (isset($report->search['pattern'])) {
-				// TODO: implement this at some point...
-				throw new BadRequest('Search pattern cannot be combined with filter');
-			}
-
-			// 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);
-			}
-
-			// pre-slice the results if needed for pagination to not waste
-			// time resolving nodes that will not be returned anyway
-			$resultFileIds = $this->slice($resultFileIds, $report);
-
-			// find sabre nodes by file id, restricted to the root node path
-			$results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
-		}
-
-		$filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
-		$results = $this->prepareResponses($filesUri, $requestedProps, $results);
-
-		$xml = $this->server->generateMultiStatus($results);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	private function slice($results, $report) {
-		if (!is_null($report->search)) {
-			$length = $report->search['limit'];
-			$offset = $report->search['offset'];
-			$results = array_slice($results, $offset, $length);
-		}
-		return $results;
-	}
-
-	/**
-	 * 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) {
-		$resultFileIds = null;
-		$systemTagIds = $filterRules['systemtag'];
-		$favoriteFilter = $filterRules['favorite'];
-
-		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) {
-		$results = [];
-		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();
-
-			$results[] = $result;
-		}
-		return $results;
-	}
-
-	/**
-	 * 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);
-				$node = $this->makeSabreNode($entry);
-				if ($node) {
-					$results[] = $node;
-				}
-			}
-		}
-
-		return $results;
-	}
-
-	private function makeSabreNode(\OCP\Files\Node $filesNode) {
-		if ($filesNode instanceof \OCP\Files\File) {
-			return new File($this->fileView, $filesNode);
-		} else if ($filesNode instanceof \OCP\Files\Folder) {
-			return new Directory($this->fileView, $filesNode);
-		}
-		throw new \Exception('Unrecognized Files API node returned, aborting');
-	}
-
-	/**
-	 * 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';
+
+        $server->xml->elementMap[self::REPORT_NAME] = FilterRequest::class;
+
+        $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 mixed $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;
+        }
+
+        $requestedProps = $report->properties;
+        $filterRules = $report->filters;
+
+        // "systemtag" is always an array of tags, favorite a string/int/null
+        if (empty($filterRules['systemtag']) && is_null($filterRules['favorite'])) {
+            // FIXME: search currently not possible because results are missing properties!
+            throw new BadRequest('No filter criteria specified');
+        } else {
+            if (isset($report->search['pattern'])) {
+                // TODO: implement this at some point...
+                throw new BadRequest('Search pattern cannot be combined with filter');
+            }
+
+            // 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);
+            }
+
+            // pre-slice the results if needed for pagination to not waste
+            // time resolving nodes that will not be returned anyway
+            $resultFileIds = $this->slice($resultFileIds, $report);
+
+            // find sabre nodes by file id, restricted to the root node path
+            $results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
+        }
+
+        $filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
+        $results = $this->prepareResponses($filesUri, $requestedProps, $results);
+
+        $xml = $this->server->generateMultiStatus($results);
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    private function slice($results, $report) {
+        if (!is_null($report->search)) {
+            $length = $report->search['limit'];
+            $offset = $report->search['offset'];
+            $results = array_slice($results, $offset, $length);
+        }
+        return $results;
+    }
+
+    /**
+     * 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) {
+        $resultFileIds = null;
+        $systemTagIds = $filterRules['systemtag'];
+        $favoriteFilter = $filterRules['favorite'];
+
+        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) {
+        $results = [];
+        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();
+
+            $results[] = $result;
+        }
+        return $results;
+    }
+
+    /**
+     * 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);
+                $node = $this->makeSabreNode($entry);
+                if ($node) {
+                    $results[] = $node;
+                }
+            }
+        }
+
+        return $results;
+    }
+
+    private function makeSabreNode(\OCP\Files\Node $filesNode) {
+        if ($filesNode instanceof \OCP\Files\File) {
+            return new File($this->fileView, $filesNode);
+        } else if ($filesNode instanceof \OCP\Files\Folder) {
+            return new Directory($this->fileView, $filesNode);
+        }
+        throw new \Exception('Unrecognized Files API node returned, aborting');
+    }
+
+    /**
+     * 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 +3 added lines, -3 removed lines

@@ -246,7 +246,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -336,7 +336,7 @@ 
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
 		$results = [];
 		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