nextcloud / server

apps/dav/lib/CalDAV/Plugin.php

Indentation +19 added lines, -19 removed lines

@@ -25,27 +25,27 @@
 
 class Plugin extends \Sabre\CalDAV\Plugin {
 
-	const SYSTEM_CALENDAR_ROOT = 'system-calendars';
+    const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
-	/**
-	 * @inheritdoc
-	 */
-	function getCalendarHomeForPrincipal($principalUrl):string {
+    /**
+     * @inheritdoc
+     */
+    function getCalendarHomeForPrincipal($principalUrl):string {
 
-		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
-		}
+        if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::CALENDAR_ROOT . '/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+        }
 
-		throw new \LogicException('This is not supposed to happen');
-	}
+        throw new \LogicException('This is not supposed to happen');
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -34,15 +34,15 @@
 
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
+			return self::CALENDAR_ROOT.'/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-resources/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-rooms/'.$principalId;
 		}
 
 		throw new \LogicException('This is not supposed to happen');

apps/dav/lib/Migration/Version1005Date20180530124431.php

Indentation +48 added lines, -48 removed lines

@@ -32,56 +32,56 @@
  */
 class Version1005Date20180530124431 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$types = ['resources', 'rooms'];
-		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type . '_cache')) {
-				$table = $schema->createTable('calendar_' . $type . '_cache');
+        $types = ['resources', 'rooms'];
+        foreach($types as $type) {
+            if (!$schema->hasTable('calendar_' . $type . '_cache')) {
+                $table = $schema->createTable('calendar_' . $type . '_cache');
 
-				$table->addColumn('id', Type::BIGINT, [
-					'autoincrement' => true,
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn('backend_id', Type::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('resource_id', Type::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('email', Type::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('displayname', Type::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('group_restrictions', Type::STRING, [
-					'notnull' => false,
-					'length' => 4000,
-				]);
+                $table->addColumn('id', Type::BIGINT, [
+                    'autoincrement' => true,
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn('backend_id', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('resource_id', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('email', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('displayname', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('group_restrictions', Type::STRING, [
+                    'notnull' => false,
+                    'length' => 4000,
+                ]);
 
-				$table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
-				$table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
-			}
-		}
+                $table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
+                $table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
+                $table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
+                $table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -44,9 +44,9 @@ 
 		$schema = $schemaClosure();
 
 		$types = ['resources', 'rooms'];
-		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type . '_cache')) {
-				$table = $schema->createTable('calendar_' . $type . '_cache');
+		foreach ($types as $type) {
+			if (!$schema->hasTable('calendar_'.$type.'_cache')) {
+				$table = $schema->createTable('calendar_'.$type.'_cache');
 
 				$table->addColumn('id', Type::BIGINT, [
 					'autoincrement' => true,
@@ -75,10 +75,10 @@ 
 					'length' => 4000,
 				]);
 
-				$table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
-				$table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
+				$table->setPrimaryKey(['id'], 'calendar_'.$type.'_cache_id_idx');
+				$table->addIndex(['backend_id', 'resource_id'], 'calendar_'.$type.'_cache_backendresource_idx');
+				$table->addIndex(['email'], 'calendar_'.$type.'_cache_email_idx');
+				$table->addIndex(['displayname'], 'calendar_'.$type.'_cache_displayname_idx');
 			}
 		}
 

apps/dav/lib/Server.php

Indentation +207 added lines, -207 removed lines

@@ -65,237 +65,237 @@
 
 class Server {
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var  string */
-	private $baseUri;
+    /** @var  string */
+    private $baseUri;
 
-	/** @var Connector\Sabre\Server  */
-	public $server;
+    /** @var Connector\Sabre\Server  */
+    public $server;
 
-	public function __construct(IRequest $request, $baseUri) {
-		$this->request = $request;
-		$this->baseUri = $baseUri;
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    public function __construct(IRequest $request, $baseUri) {
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->getEventDispatcher();
 
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
 
-		// Backends
-		$authBackend = new Auth(
-			\OC::$server->getSession(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getRequest(),
-			\OC::$server->getTwoFactorAuthManager(),
-			\OC::$server->getBruteForceThrottler()
-		);
+        // Backends
+        $authBackend = new Auth(
+            \OC::$server->getSession(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getRequest(),
+            \OC::$server->getTwoFactorAuthManager(),
+            \OC::$server->getBruteForceThrottler()
+        );
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
 
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
-		$bearerAuthBackend = new BearerAuth(
-			\OC::$server->getUserSession(),
-			\OC::$server->getSession(),
-			\OC::$server->getRequest()
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
+        $bearerAuthBackend = new BearerAuth(
+            \OC::$server->getUserSession(),
+            \OC::$server->getSession(),
+            \OC::$server->getRequest()
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
 
-		// debugging
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
+        // debugging
+        if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
 
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users', 'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-			if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-				$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
-			}
-			$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-				\OC::$server->getConfig(),
-				\OC::$server->getURLGenerator()
-			));
-		}
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
+            if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+            }
+            $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+                \OC::$server->getConfig(),
+                \OC::$server->getURLGenerator()
+            ));
+        }
 
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
-		}
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
+        }
 
-		// system tags plugins
-		$this->server->addPlugin(new SystemTagPlugin(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserSession()
-		));
+        // system tags plugins
+        $this->server->addPlugin(new SystemTagPlugin(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserSession()
-		));
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new ChunkingPlugin());
 
-		// allow setup of additional plugins
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        // allow setup of additional plugins
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
 
-		// 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($request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new 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($request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () use ($root) {
-			// custom properties plugin must be the last one
-			$userSession = \OC::$server->getUserSession();
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = \OC\Files\Filesystem::getView();
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						\OC::$server->getConfig(),
-						$this->request,
-						\OC::$server->getPreviewManager(),
-						false,
-						!\OC::$server->getConfig()->getSystemValue('debug', false)
-					)
-				);
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod', function () use ($root) {
+            // custom properties plugin must be the last one
+            $userSession = \OC::$server->getUserSession();
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = \OC\Files\Filesystem::getView();
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        \OC::$server->getConfig(),
+                        $this->request,
+                        \OC::$server->getPreviewManager(),
+                        false,
+                        !\OC::$server->getConfig()->getSystemValue('debug', false)
+                    )
+                );
 
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server->tree,
-							\OC::$server->getDatabaseConnection(),
-							\OC::$server->getUserSession()->getUser()
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view, false));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OC::$server->getTagManager()
-					)
-				);
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OC::$server->getCommentsManager(),
-					$userSession
-				));
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OC::$server->getSystemTagManager(),
-						\OC::$server->getSystemTagObjectMapper(),
-						\OC::$server->getTagManager(),
-						$userSession,
-						\OC::$server->getGroupManager(),
-						$userFolder
-					));
-					$this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OC::$server->getRootFolder(),
-						\OC::$server->getShareManager(),
-						$view
-					)));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
-					\OC::$server->getConfig(),
-					\OC::$server->query(BirthdayService::class)
-				));
-			}
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server->tree,
+                            \OC::$server->getDatabaseConnection(),
+                            \OC::$server->getUserSession()->getUser()
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view, false));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OC::$server->getTagManager()
+                    )
+                );
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OC::$server->getCommentsManager(),
+                    $userSession
+                ));
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OC::$server->getSystemTagManager(),
+                        \OC::$server->getSystemTagObjectMapper(),
+                        \OC::$server->getTagManager(),
+                        $userSession,
+                        \OC::$server->getGroupManager(),
+                        $userFolder
+                    ));
+                    $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OC::$server->getRootFolder(),
+                        \OC::$server->getShareManager(),
+                        $view
+                    )));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
+                    \OC::$server->getConfig(),
+                    \OC::$server->query(BirthdayService::class)
+                ));
+            }
 
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-	}
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+    }
 
-	public function exec() {
-		$this->server->exec();
-	}
+    public function exec() {
+        $this->server->exec();
+    }
 
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (strpos($this->server->getRequestUri(), $subTree.'/') === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

lib/public/Calendar/Room/IBackend.php

Indentation +19 added lines, -19 removed lines

@@ -31,25 +31,25 @@
  */
 interface IBackend {
 
-	/**
-	 * get a list of all rooms in this backend
-	 *
-	 * @return IRoom[]
-	 */
-	public function getAllRooms();
+    /**
+     * get a list of all rooms in this backend
+     *
+     * @return IRoom[]
+     */
+    public function getAllRooms();
 
-	/**
-	 * get a list of all room identifiers in this backend
-	 *
-	 * @return string[]
-	 */
-	public function listAllRooms();
+    /**
+     * get a list of all room identifiers in this backend
+     *
+     * @return string[]
+     */
+    public function listAllRooms();
 
-	/**
-	 * get a room by it's id
-	 *
-	 * @param string $id
-	 * @return IRoom|null
-	 */
-	public function getRoom($id);
+    /**
+     * get a room by it's id
+     *
+     * @param string $id
+     * @return IRoom|null
+     */
+    public function getRoom($id);
 }

lib/public/Calendar/Room/IRoom.php

Indentation +33 added lines, -33 removed lines

@@ -31,40 +31,40 @@
  */
 interface IRoom {
 
-	/**
-	 * get the room id
-	 *
-	 * This id has to be unique within the backend
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId();
+    /**
+     * get the room id
+     *
+     * This id has to be unique within the backend
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId();
 
-	/**
-	 * get the display name for a room
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * get the display name for a room
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * Get a list of groupIds that are allowed to access this room
-	 *
-	 * If an empty array is returned, no group restrictions are
-	 * applied.
-	 *
-	 * @return string[]
-	 * @since 14.0.0
-	 */
-	public function getGroupRestrictions();
+    /**
+     * Get a list of groupIds that are allowed to access this room
+     *
+     * If an empty array is returned, no group restrictions are
+     * applied.
+     *
+     * @return string[]
+     * @since 14.0.0
+     */
+    public function getGroupRestrictions();
 
-	/**
-	 * Get the name of the backend class the room is connected with
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getBackendClassName();
+    /**
+     * Get the name of the backend class the room is connected with
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getBackendClassName();
 }

lib/public/Calendar/Resource/IBackend.php

Indentation +19 added lines, -19 removed lines

@@ -31,25 +31,25 @@
  */
 interface IBackend {
 
-	/**
-	 * get a list of all resources in this backend
-	 *
-	 * @return IResource[]
-	 */
-	public function getAllResources();
+    /**
+     * get a list of all resources in this backend
+     *
+     * @return IResource[]
+     */
+    public function getAllResources();
 
-	/**
-	 * get a list of all resource identifiers in this backend
-	 *
-	 * @return string[]
-	 */
-	public function listAllResources();
+    /**
+     * get a list of all resource identifiers in this backend
+     *
+     * @return string[]
+     */
+    public function listAllResources();
 
-	/**
-	 * get a resource by it's id
-	 *
-	 * @param string $id
-	 * @return IResource|null
-	 */
-	public function getResource($id);
+    /**
+     * get a resource by it's id
+     *
+     * @param string $id
+     * @return IResource|null
+     */
+    public function getResource($id);
 }

lib/public/Calendar/Resource/IResource.php

Indentation +33 added lines, -33 removed lines

@@ -31,40 +31,40 @@
  */
 interface IResource {
 
-	/**
-	 * get the resource id
-	 *
-	 * This id has to be unique within the backend
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId();
+    /**
+     * get the resource id
+     *
+     * This id has to be unique within the backend
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId();
 
-	/**
-	 * get the display name for a resource
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * get the display name for a resource
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * Get a list of groupIds that are allowed to access this resource
-	 *
-	 * If an empty array is returned, no group restrictions are
-	 * applied.
-	 *
-	 * @return string[]
-	 * @since 14.0.0
-	 */
-	public function getGroupRestrictions();
+    /**
+     * Get a list of groupIds that are allowed to access this resource
+     *
+     * If an empty array is returned, no group restrictions are
+     * applied.
+     *
+     * @return string[]
+     * @since 14.0.0
+     */
+    public function getGroupRestrictions();
 
-	/**
-	 * Get the name of the backend class the room is connected with
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getBackendClassName();
+    /**
+     * Get the name of the backend class the room is connected with
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getBackendClassName();
 }