nextcloud / server

apps/dav/lib/RootCollection.php

Indentation +153 added lines, -153 removed lines

@@ -46,157 +46,157 @@
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends SimpleCollection {
-	public function __construct() {
-		$l10n = \OC::$server->getL10N('dav');
-		$random = Server::get(ISecureRandom::class);
-		$logger = Server::get(LoggerInterface::class);
-		$userManager = Server::get(IUserManager::class);
-		$userSession = Server::get(IUserSession::class);
-		$groupManager = Server::get(IGroupManager::class);
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$db = Server::get(IDBConnection::class);
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$config = Server::get(IConfig::class);
-		$proxyMapper = Server::get(ProxyMapper::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			Server::get(IAccountManager::class),
-			$shareManager,
-			Server::get(IUserSession::class),
-			Server::get(IAppManager::class),
-			$proxyMapper,
-			Server::get(KnownUserService::class),
-			Server::get(IConfig::class),
-			\OC::$server->getL10NFactory()
-		);
-
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarSharingBackend = Server::get(Backend::class);
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$random,
-			$logger,
-			$dispatcher,
-			$config,
-			$calendarSharingBackend,
-			false,
-		);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
-
-		$systemTagCollection = Server::get(SystemTagsByIdCollection::class);
-		$systemTagRelationsCollection = new SystemTagsRelationsCollection(
-			Server::get(ISystemTagManager::class),
-			Server::get(ISystemTagObjectMapper::class),
-			Server::get(IUserSession::class),
-			$groupManager,
-			$dispatcher,
-			$rootFolder,
-		);
-		$systemTagInUseCollection = Server::get(SystemTagsInUseCollection::class);
-		$commentsCollection = new Comments\RootCollection(
-			Server::get(ICommentsManager::class),
-			$userManager,
-			Server::get(IUserSession::class),
-			$dispatcher,
-			$logger
-		);
-
-		$contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
-
-		$pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
-		$usersCardDavBackend = new CardDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$dispatcher,
-			$contactsSharingBackend,
-		);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$dispatcher,
-			$contactsSharingBackend,
-		);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			Server::get(CleanupService::class),
-			$rootFolder,
-			$userSession,
-		);
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$appleProvisioning = new AppleProvisioningNode(
-			Server::get(ITimeFactory::class));
-
-		$children = [
-			new SimpleCollection('principals', [
-				$userPrincipals,
-				$groupPrincipals,
-				$systemPrincipals,
-				$calendarResourcePrincipals,
-				$calendarRoomPrincipals]),
-			$filesCollection,
-			$userCalendarRoot,
-			new SimpleCollection('system-calendars', [
-				$resourceCalendarRoot,
-				$roomCalendarRoot,
-			]),
-			$publicCalendarRoot,
-			new SimpleCollection('addressbooks', [
-				$usersAddressBookRoot,
-				$systemAddressBookRoot]),
-			$systemTagCollection,
-			$systemTagRelationsCollection,
-			$systemTagInUseCollection,
-			$commentsCollection,
-			$uploadCollection,
-			$avatarCollection,
-			new SimpleCollection('provisioning', [
-				$appleProvisioning
-			])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $l10n = \OC::$server->getL10N('dav');
+        $random = Server::get(ISecureRandom::class);
+        $logger = Server::get(LoggerInterface::class);
+        $userManager = Server::get(IUserManager::class);
+        $userSession = Server::get(IUserSession::class);
+        $groupManager = Server::get(IGroupManager::class);
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $db = Server::get(IDBConnection::class);
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $config = Server::get(IConfig::class);
+        $proxyMapper = Server::get(ProxyMapper::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            Server::get(IAccountManager::class),
+            $shareManager,
+            Server::get(IUserSession::class),
+            Server::get(IAppManager::class),
+            $proxyMapper,
+            Server::get(KnownUserService::class),
+            Server::get(IConfig::class),
+            \OC::$server->getL10NFactory()
+        );
+
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarSharingBackend = Server::get(Backend::class);
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $random,
+            $logger,
+            $dispatcher,
+            $config,
+            $calendarSharingBackend,
+            false,
+        );
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
+
+        $systemTagCollection = Server::get(SystemTagsByIdCollection::class);
+        $systemTagRelationsCollection = new SystemTagsRelationsCollection(
+            Server::get(ISystemTagManager::class),
+            Server::get(ISystemTagObjectMapper::class),
+            Server::get(IUserSession::class),
+            $groupManager,
+            $dispatcher,
+            $rootFolder,
+        );
+        $systemTagInUseCollection = Server::get(SystemTagsInUseCollection::class);
+        $commentsCollection = new Comments\RootCollection(
+            Server::get(ICommentsManager::class),
+            $userManager,
+            Server::get(IUserSession::class),
+            $dispatcher,
+            $logger
+        );
+
+        $contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
+
+        $pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
+        $usersCardDavBackend = new CardDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $dispatcher,
+            $contactsSharingBackend,
+        );
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $dispatcher,
+            $contactsSharingBackend,
+        );
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            Server::get(CleanupService::class),
+            $rootFolder,
+            $userSession,
+        );
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $appleProvisioning = new AppleProvisioningNode(
+            Server::get(ITimeFactory::class));
+
+        $children = [
+            new SimpleCollection('principals', [
+                $userPrincipals,
+                $groupPrincipals,
+                $systemPrincipals,
+                $calendarResourcePrincipals,
+                $calendarRoomPrincipals]),
+            $filesCollection,
+            $userCalendarRoot,
+            new SimpleCollection('system-calendars', [
+                $resourceCalendarRoot,
+                $roomCalendarRoot,
+            ]),
+            $publicCalendarRoot,
+            new SimpleCollection('addressbooks', [
+                $usersAddressBookRoot,
+                $systemAddressBookRoot]),
+            $systemTagCollection,
+            $systemTagRelationsCollection,
+            $systemTagInUseCollection,
+            $commentsCollection,
+            $uploadCollection,
+            $avatarCollection,
+            new SimpleCollection('provisioning', [
+                $appleProvisioning
+            ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 }

apps/dav/lib/Upload/RootCollection.php

Indentation +21 added lines, -21 removed lines

@@ -16,27 +16,27 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	public function __construct(
-		PrincipalBackend\BackendInterface $principalBackend,
-		string $principalPrefix,
-		private CleanupService $cleanupService,
-		private IRootFolder $rootFolder,
-		private IUserSession $userSession,
-	) {
-		parent::__construct($principalBackend, $principalPrefix);
-	}
+    public function __construct(
+        PrincipalBackend\BackendInterface $principalBackend,
+        string $principalPrefix,
+        private CleanupService $cleanupService,
+        private IRootFolder $rootFolder,
+        private IUserSession $userSession,
+    ) {
+        parent::__construct($principalBackend, $principalPrefix);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getChildForPrincipal(array $principalInfo): UploadHome {
-		return new UploadHome($principalInfo, $this->cleanupService, $this->rootFolder, $this->userSession);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getChildForPrincipal(array $principalInfo): UploadHome {
+        return new UploadHome($principalInfo, $this->cleanupService, $this->rootFolder, $this->userSession);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName(): string {
-		return 'uploads';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string {
+        return 'uploads';
+    }
 }

apps/dav/lib/Upload/UploadHome.php

Indentation +81 added lines, -81 removed lines

@@ -17,85 +17,85 @@
 use Sabre\DAV\ICollection;
 
 class UploadHome implements ICollection {
-	private ?Folder $uploadFolder = null;
-
-	public function __construct(
-		private readonly array $principalInfo,
-		private readonly CleanupService $cleanupService,
-		private readonly IRootFolder $rootFolder,
-		private readonly IUserSession $userSession,
-	) {
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
-
-	public function createDirectory($name) {
-		$this->impl()->createDirectory($name);
-
-		// Add a cleanup job
-		$this->cleanupService->addJob($name);
-	}
-
-	public function getChild($name): UploadFolder {
-		return new UploadFolder($this->impl()->getChild($name), $this->cleanupService, $this->getStorage());
-	}
-
-	public function getChildren(): array {
-		return array_map(function ($node) {
-			return new UploadFolder($node, $this->cleanupService, $this->getStorage());
-		}, $this->impl()->getChildren());
-	}
-
-	public function childExists($name): bool {
-		return !is_null($this->getChild($name));
-	}
-
-	public function delete() {
-		$this->impl()->delete();
-	}
-
-	public function getName() {
-		[,$name] = \Sabre\Uri\split($this->principalInfo['uri']);
-		return $name;
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
-
-	public function getLastModified() {
-		return $this->impl()->getLastModified();
-	}
-
-	private function getUploadFolder(): Folder {
-		if ($this->uploadFolder === null) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				throw new Forbidden('Not logged in');
-			}
-			$path = '/' . $user->getUID() . '/uploads';
-			try {
-				$folder = $this->rootFolder->get($path);
-				if (!$folder instanceof Folder) {
-					throw new \Exception('Upload folder is a file');
-				}
-				$this->uploadFolder = $folder;
-			} catch (NotFoundException $e) {
-				$this->uploadFolder = $this->rootFolder->newFolder($path);
-			}
-		}
-		return $this->uploadFolder;
-	}
-
-	private function impl(): Directory {
-		$folder = $this->getUploadFolder();
-		$view = new View($folder->getPath());
-		return new Directory($view, $folder);
-	}
-
-	private function getStorage() {
-		return $this->getUploadFolder()->getStorage();
-	}
+    private ?Folder $uploadFolder = null;
+
+    public function __construct(
+        private readonly array $principalInfo,
+        private readonly CleanupService $cleanupService,
+        private readonly IRootFolder $rootFolder,
+        private readonly IUserSession $userSession,
+    ) {
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
+
+    public function createDirectory($name) {
+        $this->impl()->createDirectory($name);
+
+        // Add a cleanup job
+        $this->cleanupService->addJob($name);
+    }
+
+    public function getChild($name): UploadFolder {
+        return new UploadFolder($this->impl()->getChild($name), $this->cleanupService, $this->getStorage());
+    }
+
+    public function getChildren(): array {
+        return array_map(function ($node) {
+            return new UploadFolder($node, $this->cleanupService, $this->getStorage());
+        }, $this->impl()->getChildren());
+    }
+
+    public function childExists($name): bool {
+        return !is_null($this->getChild($name));
+    }
+
+    public function delete() {
+        $this->impl()->delete();
+    }
+
+    public function getName() {
+        [,$name] = \Sabre\Uri\split($this->principalInfo['uri']);
+        return $name;
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
+
+    public function getLastModified() {
+        return $this->impl()->getLastModified();
+    }
+
+    private function getUploadFolder(): Folder {
+        if ($this->uploadFolder === null) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                throw new Forbidden('Not logged in');
+            }
+            $path = '/' . $user->getUID() . '/uploads';
+            try {
+                $folder = $this->rootFolder->get($path);
+                if (!$folder instanceof Folder) {
+                    throw new \Exception('Upload folder is a file');
+                }
+                $this->uploadFolder = $folder;
+            } catch (NotFoundException $e) {
+                $this->uploadFolder = $this->rootFolder->newFolder($path);
+            }
+        }
+        return $this->uploadFolder;
+    }
+
+    private function impl(): Directory {
+        $folder = $this->getUploadFolder();
+        $view = new View($folder->getPath());
+        return new Directory($view, $folder);
+    }
+
+    private function getStorage() {
+        return $this->getUploadFolder()->getStorage();
+    }
 }