nextcloud / server

apps/comments/lib/Search/LegacyProvider.php

Indentation +74 added lines, -74 removed lines

@@ -36,78 +36,78 @@
 
 class LegacyProvider extends Provider {
 
-	/**
-	 * Search for $query
-	 *
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 * @since 7.0.0
-	 */
-	public function search($query): array {
-		$cm = \OC::$server->getCommentsManager();
-		$us = \OC::$server->getUserSession();
-
-		$user = $us->getUser();
-		if (!$user instanceof IUser) {
-			return [];
-		}
-		$uf = \OC::$server->getUserFolder($user->getUID());
-
-		if ($uf === null) {
-			return [];
-		}
-
-		$result = [];
-		$numComments = 50;
-		$offset = 0;
-
-		while (count($result) < $numComments) {
-			/** @var IComment[] $comments */
-			$comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
-
-			foreach ($comments as $comment) {
-				if ($comment->getActorType() !== 'users') {
-					continue;
-				}
-
-				$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
-
-				try {
-					$file = $this->getFileForComment($uf, $comment);
-					$result[] = new Result($query,
-						$comment,
-						$displayName,
-						$file->getPath()
-					);
-				} catch (NotFoundException $e) {
-					continue;
-				}
-			}
-
-			if (count($comments) < $numComments) {
-				// Didn't find more comments when we tried to get, so there are no more comments.
-				return $result;
-			}
-
-			$offset += $numComments;
-			$numComments = 50 - count($result);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param Folder $userFolder
-	 * @param IComment $comment
-	 * @return Node
-	 * @throws NotFoundException
-	 */
-	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$nodes = $userFolder->getById((int) $comment->getObjectId());
-		if (empty($nodes)) {
-			throw new NotFoundException('File not found');
-		}
-
-		return array_shift($nodes);
-	}
+    /**
+     * Search for $query
+     *
+     * @param string $query
+     * @return array An array of OCP\Search\Result's
+     * @since 7.0.0
+     */
+    public function search($query): array {
+        $cm = \OC::$server->getCommentsManager();
+        $us = \OC::$server->getUserSession();
+
+        $user = $us->getUser();
+        if (!$user instanceof IUser) {
+            return [];
+        }
+        $uf = \OC::$server->getUserFolder($user->getUID());
+
+        if ($uf === null) {
+            return [];
+        }
+
+        $result = [];
+        $numComments = 50;
+        $offset = 0;
+
+        while (count($result) < $numComments) {
+            /** @var IComment[] $comments */
+            $comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
+
+            foreach ($comments as $comment) {
+                if ($comment->getActorType() !== 'users') {
+                    continue;
+                }
+
+                $displayName = $cm->resolveDisplayName('user', $comment->getActorId());
+
+                try {
+                    $file = $this->getFileForComment($uf, $comment);
+                    $result[] = new Result($query,
+                        $comment,
+                        $displayName,
+                        $file->getPath()
+                    );
+                } catch (NotFoundException $e) {
+                    continue;
+                }
+            }
+
+            if (count($comments) < $numComments) {
+                // Didn't find more comments when we tried to get, so there are no more comments.
+                return $result;
+            }
+
+            $offset += $numComments;
+            $numComments = 50 - count($result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Folder $userFolder
+     * @param IComment $comment
+     * @return Node
+     * @throws NotFoundException
+     */
+    protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
+        $nodes = $userFolder->getById((int) $comment->getObjectId());
+        if (empty($nodes)) {
+            throw new NotFoundException('File not found');
+        }
+
+        return array_shift($nodes);
+    }
 }

apps/comments/lib/Search/Result.php

Indentation +87 added lines, -87 removed lines

@@ -32,101 +32,101 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
 
-	/**
-	 * @param string $search
-	 * @param IComment $comment
-	 * @param string $authorName
-	 * @param string $path
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(string $search,
-								IComment $comment,
-								string $authorName,
-								string $path) {
-		parent::__construct(
-			(int) $comment->getId(),
-			$comment->getMessage()
-		/* @todo , [link to file] */
-		);
+    /**
+     * @param string $search
+     * @param IComment $comment
+     * @param string $authorName
+     * @param string $path
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(string $search,
+                                IComment $comment,
+                                string $authorName,
+                                string $path) {
+        parent::__construct(
+            (int) $comment->getId(),
+            $comment->getMessage()
+        /* @todo , [link to file] */
+        );
 
-		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
-		$this->authorId = $comment->getActorId();
-		$this->authorName = $authorName;
-		$this->fileName = basename($path);
-		$this->path = $this->getVisiblePath($path);
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->authorName = $authorName;
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @param string $path
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getVisiblePath(string $path): string {
+        $segments = explode('/', trim($path, '/'), 3);
 
-		if (!isset($segments[2])) {
-			throw new NotFoundException('Path not inside visible section');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        return $segments[2];
+    }
 
-	/**
-	 * @param string $message
-	 * @param string $search
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getRelevantMessagePart(string $message, string $search): string {
-		$start = mb_stripos($message, $search);
-		if ($start === false) {
-			throw new NotFoundException('Comment section not found');
-		}
+    /**
+     * @param string $message
+     * @param string $search
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getRelevantMessagePart(string $message, string $search): string {
+        $start = mb_stripos($message, $search);
+        if ($start === false) {
+            throw new NotFoundException('Comment section not found');
+        }
 
-		$end = $start + mb_strlen($search);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        if ($start <= 25) {
+            $start = 0;
+            $prefix = '';
+        } else {
+            $start -= 25;
+            $prefix = '…';
+        }
 
-		if ((mb_strlen($message) - $end) <= 25) {
-			$end = mb_strlen($message);
-			$suffix = '';
-		} else {
-			$end += 25;
-			$suffix = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/comments/lib/Search/Provider.php

Indentation +37 added lines, -37 removed lines

@@ -36,46 +36,46 @@
 
 class Provider implements IProvider {
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var LegacyProvider */
-	private $legacyProvider;
+    /** @var LegacyProvider */
+    private $legacyProvider;
 
-	public function __construct(IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								LegacyProvider $legacyProvider) {
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->legacyProvider = $legacyProvider;
-	}
+    public function __construct(IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                LegacyProvider $legacyProvider) {
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->legacyProvider = $legacyProvider;
+    }
 
-	public function getId(): string {
-		return 'comments';
-	}
+    public function getId(): string {
+        return 'comments';
+    }
 
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		return SearchResult::complete(
-			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
-				$path = $result->path;
-				$pathInfo = pathinfo($path);
-				return new CommentsSearchResultEntry(
-					$this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]),
-					$result->name,
-					$path,
-					$this->urlGenerator->linkToRoute(
-						'files.view.index',
-						[
-							'dir' => $pathInfo['dirname'],
-							'scrollto' => $pathInfo['basename'],
-						]
-					)
-				);
-			}, $this->legacyProvider->search($query->getTerm()))
-		);
-	}
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        return SearchResult::complete(
+            $this->l10n->t('Comments'),
+            array_map(function (Result $result) {
+                $path = $result->path;
+                $pathInfo = pathinfo($path);
+                return new CommentsSearchResultEntry(
+                    $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]),
+                    $result->name,
+                    $path,
+                    $this->urlGenerator->linkToRoute(
+                        'files.view.index',
+                        [
+                            'dir' => $pathInfo['dirname'],
+                            'scrollto' => $pathInfo['basename'],
+                        ]
+                    )
+                );
+            }, $this->legacyProvider->search($query->getTerm()))
+        );
+    }
 }

apps/files/lib/AppInfo/Application.php

Indentation +120 added lines, -120 removed lines

@@ -58,126 +58,126 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'files';
-
-	public function __construct(array $urlParams=[]) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		/**
-		 * Controllers
-		 */
-		$context->registerService('APIController', function (IContainer $c) {
-			/** @var IServerContainer $server */
-			$server = $c->query(IServerContainer::class);
-
-			return new ApiController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getUserSession(),
-				$c->query('TagService'),
-				$server->getPreviewManager(),
-				$server->getShareManager(),
-				$server->getConfig(),
-				$server->getUserFolder()
-			);
-		});
-
-		/**
-		 * Services
-		 */
-		$context->registerService('TagService', function (IContainer $c) {
-			/** @var IServerContainer $server */
-			$server = $c->query(IServerContainer::class);
-
-			return new TagService(
-				$server->getUserSession(),
-				$server->getActivityManager(),
-				$server->getTagManager()->load(self::APP_ID),
-				$server->getUserFolder(),
-				$server->getEventDispatcher()
-			);
-		});
-
-		/*
+    public const APP_ID = 'files';
+
+    public function __construct(array $urlParams=[]) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        /**
+         * Controllers
+         */
+        $context->registerService('APIController', function (IContainer $c) {
+            /** @var IServerContainer $server */
+            $server = $c->query(IServerContainer::class);
+
+            return new ApiController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getUserSession(),
+                $c->query('TagService'),
+                $server->getPreviewManager(),
+                $server->getShareManager(),
+                $server->getConfig(),
+                $server->getUserFolder()
+            );
+        });
+
+        /**
+         * Services
+         */
+        $context->registerService('TagService', function (IContainer $c) {
+            /** @var IServerContainer $server */
+            $server = $c->query(IServerContainer::class);
+
+            return new TagService(
+                $server->getUserSession(),
+                $server->getActivityManager(),
+                $server->getTagManager()->load(self::APP_ID),
+                $server->getUserFolder(),
+                $server->getEventDispatcher()
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
-
-		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
-		$context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
-
-		$context->registerSearchProvider(FilesSearchProvider::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		$this->registerCollaboration($context);
-		Listener::register($context->getServerContainer()->getEventDispatcher());
-		$this->registerNotification($context);
-		$this->registerSearchProvider($context);
-		$this->registerTemplates();
-		$this->registerNavigation($context);
-		$this->registerHooks();
-	}
-
-	/**
-	 * Register Collaboration ResourceProvider
-	 */
-	private function registerCollaboration(IBootContext $context): void {
-		/** @var IProviderManager $providerManager */
-		$providerManager = $context->getAppContainer()->query(IProviderManager::class);
-		$providerManager->registerResourceProvider(ResourceProvider::class);
-	}
-
-	private function registerNotification(IBootContext $context): void {
-		/** @var IManager $notifications */
-		$notifications = $context->getAppContainer()->query(IManager::class);
-		$notifications->registerNotifierService(Notifier::class);
-	}
-
-	/**
-	 * @param IBootContext $context
-	 */
-	private function registerSearchProvider(IBootContext $context): void {
-		$context->getServerContainer()->getSearch()->registerProvider(File::class, ['apps' => ['files']]);
-	}
-
-	private function registerTemplates(): void {
-		$templateManager = \OC_Helper::getFileTemplateManager();
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
-	}
-
-	private function registerNavigation(IBootContext $context): void {
-		/** @var IL10N $l10n */
-		$l10n = $context->getAppContainer()->query(IL10N::class);
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'files',
-			'appname' => 'files',
-			'script' => 'list.php',
-			'order' => 0,
-			'name' => $l10n->t('All files')
-		]);
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'recent',
-			'appname' => 'files',
-			'script' => 'recentlist.php',
-			'order' => 2,
-			'name' => $l10n->t('Recent')
-		]);
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'favorites',
-			'appname' => 'files',
-			'script' => 'simplelist.php',
-			'order' => 5,
-			'name' => $l10n->t('Favorites'),
-			'expandedState' => 'show_Quick_Access'
-		]);
-	}
-
-	private function registerHooks(): void {
-		Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
-	}
+        $context->registerCapability(Capabilities::class);
+
+        $context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
+        $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
+
+        $context->registerSearchProvider(FilesSearchProvider::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        $this->registerCollaboration($context);
+        Listener::register($context->getServerContainer()->getEventDispatcher());
+        $this->registerNotification($context);
+        $this->registerSearchProvider($context);
+        $this->registerTemplates();
+        $this->registerNavigation($context);
+        $this->registerHooks();
+    }
+
+    /**
+     * Register Collaboration ResourceProvider
+     */
+    private function registerCollaboration(IBootContext $context): void {
+        /** @var IProviderManager $providerManager */
+        $providerManager = $context->getAppContainer()->query(IProviderManager::class);
+        $providerManager->registerResourceProvider(ResourceProvider::class);
+    }
+
+    private function registerNotification(IBootContext $context): void {
+        /** @var IManager $notifications */
+        $notifications = $context->getAppContainer()->query(IManager::class);
+        $notifications->registerNotifierService(Notifier::class);
+    }
+
+    /**
+     * @param IBootContext $context
+     */
+    private function registerSearchProvider(IBootContext $context): void {
+        $context->getServerContainer()->getSearch()->registerProvider(File::class, ['apps' => ['files']]);
+    }
+
+    private function registerTemplates(): void {
+        $templateManager = \OC_Helper::getFileTemplateManager();
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
+    }
+
+    private function registerNavigation(IBootContext $context): void {
+        /** @var IL10N $l10n */
+        $l10n = $context->getAppContainer()->query(IL10N::class);
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'files',
+            'appname' => 'files',
+            'script' => 'list.php',
+            'order' => 0,
+            'name' => $l10n->t('All files')
+        ]);
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'recent',
+            'appname' => 'files',
+            'script' => 'recentlist.php',
+            'order' => 2,
+            'name' => $l10n->t('Recent')
+        ]);
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'favorites',
+            'appname' => 'files',
+            'script' => 'simplelist.php',
+            'order' => 5,
+            'name' => $l10n->t('Favorites'),
+            'expandedState' => 'show_Quick_Access'
+        ]);
+    }
+
+    private function registerHooks(): void {
+        Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
+    }
 }

apps/files/lib/Search/FilesSearchResultEntry.php

Indentation +6 added lines, -6 removed lines

@@ -28,10 +28,10 @@
 use OCP\Search\ASearchResultEntry;
 
 class FilesSearchResultEntry extends ASearchResultEntry {
-	public function __construct(string $thumbnailUrl,
-								string $filename,
-								string $path,
-								string $url) {
-		parent::__construct($thumbnailUrl, $filename, $path, $url);
-	}
+    public function __construct(string $thumbnailUrl,
+                                string $filename,
+                                string $path,
+                                string $url) {
+        parent::__construct($thumbnailUrl, $filename, $path, $url);
+    }
 }

apps/files/lib/Search/FilesSearchProvider.php

Indentation +29 added lines, -29 removed lines

@@ -36,38 +36,38 @@
 
 class FilesSearchProvider implements IProvider {
 
-	/** @var File */
-	private $fileSearch;
+    /** @var File */
+    private $fileSearch;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(File $fileSearch,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator) {
-		$this->l10n = $l10n;
-		$this->fileSearch = $fileSearch;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(File $fileSearch,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator) {
+        $this->l10n = $l10n;
+        $this->fileSearch = $fileSearch;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function getId(): string {
-		return 'files';
-	}
+    public function getId(): string {
+        return 'files';
+    }
 
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		return SearchResult::complete(
-			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
-				return new FilesSearchResultEntry(
-					$this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]),
-					$result->name,
-					$result->path,
-					$result->link
-				);
-			}, $this->fileSearch->search($query->getTerm()))
-		);
-	}
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        return SearchResult::complete(
+            $this->l10n->t('Files'),
+            array_map(function (FileResult $result) {
+                return new FilesSearchResultEntry(
+                    $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]),
+                    $result->name,
+                    $result->path,
+                    $result->link
+                );
+            }, $this->fileSearch->search($query->getTerm()))
+        );
+    }
 }

core/routes.php

Indentation +76 added lines, -76 removed lines

@@ -37,85 +37,85 @@ 
 /** @var Application $application */
 $application = \OC::$server->query(Application::class);
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
-		['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
-		['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
-		['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
-		['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
-		['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
-		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
-		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
-		['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
-		['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
-		['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
-		['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
-		['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
-		['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
-		['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
-		// Original login flow used by all clients
-		['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
-		['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
-		// NG login flow used by desktop client in case of Kerberos/fancy 2fa (smart cards for example)
-		['name' => 'ClientFlowLoginV2#poll', 'url' => '/login/v2/poll', 'verb' => 'POST'],
-		['name' => 'ClientFlowLoginV2#showAuthPickerPage', 'url' => '/login/v2/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#landing', 'url' => '/login/v2/flow/{token}', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#grantPage', 'url' => '/login/v2/grant', 'verb' => 'GET'],
-		['name' => 'ClientFlowLoginV2#generateAppPassword', 'url' => '/login/v2/grant', 'verb' => 'POST'],
-		['name' => 'ClientFlowLoginV2#init', 'url' => '/login/v2', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#setupProviders', 'url' => 'login/setupchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#setupProvider', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#confirmProviderSetup', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'POST'],
-		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
-		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
-		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
-		['name' => 'UnifiedSearch#getProviders', 'url' => '/search/providers', 'verb' => 'GET'],
-		['name' => 'UnifiedSearch#search', 'url' => '/search/providers/{providerId}/search', 'verb' => 'GET'],
-		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
-		['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
-		['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
-		['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
-		['name' => 'Wipe#checkWipe', 'url' => '/core/wipe/check', 'verb' => 'POST'],
-		['name' => 'Wipe#wipeDone', 'url' => '/core/wipe/success', 'verb' => 'POST'],
+    'routes' => [
+        ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
+        ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
+        ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
+        ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
+        ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
+        ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
+        ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
+        ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
+        ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
+        ['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
+        ['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
+        ['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
+        ['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
+        ['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
+        ['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
+        // Original login flow used by all clients
+        ['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
+        // NG login flow used by desktop client in case of Kerberos/fancy 2fa (smart cards for example)
+        ['name' => 'ClientFlowLoginV2#poll', 'url' => '/login/v2/poll', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLoginV2#showAuthPickerPage', 'url' => '/login/v2/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#landing', 'url' => '/login/v2/flow/{token}', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#grantPage', 'url' => '/login/v2/grant', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLoginV2#generateAppPassword', 'url' => '/login/v2/grant', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLoginV2#init', 'url' => '/login/v2', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#setupProviders', 'url' => 'login/setupchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#setupProvider', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#confirmProviderSetup', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'POST'],
+        ['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+        ['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'UnifiedSearch#getProviders', 'url' => '/search/providers', 'verb' => 'GET'],
+        ['name' => 'UnifiedSearch#search', 'url' => '/search/providers/{providerId}/search', 'verb' => 'GET'],
+        ['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
+        ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
+        ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+        ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
+        ['name' => 'Wipe#checkWipe', 'url' => '/core/wipe/check', 'verb' => 'POST'],
+        ['name' => 'Wipe#wipeDone', 'url' => '/core/wipe/success', 'verb' => 'POST'],
 
-		// Logins for passwordless auth
-		['name' => 'WebAuthn#startAuthentication', 'url' => 'login/webauthn/start', 'verb' => 'POST'],
-		['name' => 'WebAuthn#finishAuthentication', 'url' => 'login/webauthn/finish', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
-		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
-		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
-		['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
-		['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'AppPassword#rotateAppPassword', 'url' => '/apppassword/rotate', 'verb' => 'POST'],
-		['root' => '/core', 'name' => 'AppPassword#deleteAppPassword', 'url' => '/apppassword', 'verb' => 'DELETE'],
+        // Logins for passwordless auth
+        ['name' => 'WebAuthn#startAuthentication', 'url' => 'login/webauthn/start', 'verb' => 'POST'],
+        ['name' => 'WebAuthn#finishAuthentication', 'url' => 'login/webauthn/finish', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
+        ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
+        ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
+        ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
+        ['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'AppPassword#rotateAppPassword', 'url' => '/apppassword/rotate', 'verb' => 'POST'],
+        ['root' => '/core', 'name' => 'AppPassword#deleteAppPassword', 'url' => '/apppassword', 'verb' => 'DELETE'],
 
-		['root' => '/collaboration', 'name' => 'CollaborationResources#searchCollections', 'url' => '/resources/collections/search/{filter}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#listCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#renameCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'PUT'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#addResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'POST'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#searchCollections', 'url' => '/resources/collections/search/{filter}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#listCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#renameCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'PUT'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#addResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'POST'],
 
-		['root' => '/collaboration', 'name' => 'CollaborationResources#removeResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'DELETE'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#getCollectionsByResource', 'url' => '/resources/{resourceType}/{resourceId}', 'verb' => 'GET'],
-		['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST']
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#removeResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'DELETE'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#getCollectionsByResource', 'url' => '/resources/{resourceType}/{resourceId}', 'verb' => 'GET'],
+        ['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST']
 
-	],
+    ],
 ]);
 
 // Post installation check
@@ -124,4 +124,4 @@ 
 // Core ajax actions
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
-	->actionInclude('core/ajax/update.php');
+    ->actionInclude('core/ajax/update.php');

core/Controller/UnifiedSearchController.php

Indentation +53 added lines, -53 removed lines

@@ -36,63 +36,63 @@
 
 class UnifiedSearchController extends Controller {
 
-	/** @var SearchComposer */
-	private $composer;
+    /** @var SearchComposer */
+    private $composer;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								SearchComposer $composer) {
-		parent::__construct('core', $request);
+    public function __construct(IRequest $request,
+                                IUserSession $userSession,
+                                SearchComposer $composer) {
+        parent::__construct('core', $request);
 
-		$this->composer = $composer;
-		$this->userSession = $userSession;
-	}
+        $this->composer = $composer;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function getProviders(): JSONResponse {
-		return new JSONResponse(
-			$this->composer->getProviders()
-		);
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function getProviders(): JSONResponse {
+        return new JSONResponse(
+            $this->composer->getProviders()
+        );
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $providerId
-	 * @param string $term
-	 * @param int|null $sortOrder
-	 * @param int|null $limit
-	 * @param int|string|null $cursor
-	 *
-	 * @return JSONResponse
-	 */
-	public function search(string $providerId,
-						   string $term = '',
-						   ?int $sortOrder = null,
-						   ?int $limit = null,
-						   $cursor = null): JSONResponse {
-		if (empty($term)) {
-			return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $providerId
+     * @param string $term
+     * @param int|null $sortOrder
+     * @param int|null $limit
+     * @param int|string|null $cursor
+     *
+     * @return JSONResponse
+     */
+    public function search(string $providerId,
+                            string $term = '',
+                           ?int $sortOrder = null,
+                           ?int $limit = null,
+                            $cursor = null): JSONResponse {
+        if (empty($term)) {
+            return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
+        }
 
-		return new JSONResponse(
-			$this->composer->search(
-				$this->userSession->getUser(),
-				$providerId,
-				new SearchQuery(
-					$term,
-					$sortOrder ?? ISearchQuery::SORT_DATE_DESC,
-					$limit ?? SearchQuery::LIMIT_DEFAULT,
-					$cursor
-				)
-			)
-		);
-	}
+        return new JSONResponse(
+            $this->composer->search(
+                $this->userSession->getUser(),
+                $providerId,
+                new SearchQuery(
+                    $term,
+                    $sortOrder ?? ISearchQuery::SORT_DATE_DESC,
+                    $limit ?? SearchQuery::LIMIT_DEFAULT,
+                    $cursor
+                )
+            )
+        );
+    }
 }