nextcloud / server

apps/dav/lib/Server.php

Indentation +266 added lines, -266 removed lines

@@ -76,270 +76,270 @@
 
 class Server {
 
-	/** @var IRequest */
-	private $request;
-
-	/** @var  string */
-	private $baseUri;
-
-	/** @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();
-		/** @var IEventDispatcher $newDispatcher */
-		$newDispatcher = \OC::$server->query(IEventDispatcher::class);
-
-		$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(), \OC::$server->getL10N('dav')));
-
-		// 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);
-
-		$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);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$newDispatcher->dispatchTyped($newAuthEvent);
-
-		$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());
-		}
-
-		$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);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), \OC::$server->getLogger()));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
-			if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-				$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
-			}
-
-			$this->server->addPlugin(\OC::$server->get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($request));
-			$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(), \OC::$server->getConfig()));
-			$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(), \OC::$server->getConfig()));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(
-				\OC::$server->getAppDataDir('dav-photocache'),
-				\OC::$server->getLogger())
-			));
-		}
-
-		// 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()
-		));
-
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new ChunkingPlugin());
-
-		// 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());
-		}
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend) {
-			// 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,
-						\OC::$server->getAppManager()
-					));
-					$lazySearchBackend->setBackend(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 AppleProvisioningPlugin(
-					\OC::$server->getUserSession(),
-					\OC::$server->getURLGenerator(),
-					\OC::$server->getThemingDefaults(),
-					\OC::$server->getRequest(),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// 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);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	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;
-	}
+    /** @var IRequest */
+    private $request;
+
+    /** @var  string */
+    private $baseUri;
+
+    /** @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();
+        /** @var IEventDispatcher $newDispatcher */
+        $newDispatcher = \OC::$server->query(IEventDispatcher::class);
+
+        $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(), \OC::$server->getL10N('dav')));
+
+        // 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);
+
+        $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);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $newDispatcher->dispatchTyped($newAuthEvent);
+
+        $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());
+        }
+
+        $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);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), \OC::$server->getLogger()));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
+            if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+            }
+
+            $this->server->addPlugin(\OC::$server->get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($request));
+            $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(), \OC::$server->getConfig()));
+            $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(), \OC::$server->getConfig()));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(
+                \OC::$server->getAppDataDir('dav-photocache'),
+                \OC::$server->getLogger())
+            ));
+        }
+
+        // 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()
+        ));
+
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new ChunkingPlugin());
+
+        // 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());
+        }
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend) {
+            // 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,
+                        \OC::$server->getAppManager()
+                    ));
+                    $lazySearchBackend->setBackend(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 AppleProvisioningPlugin(
+                    \OC::$server->getUserSession(),
+                    \OC::$server->getURLGenerator(),
+                    \OC::$server->getThemingDefaults(),
+                    \OC::$server->getRequest(),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // 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);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    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;
+    }
 }

apps/dav/lib/CalDAV/RetentionService.php

Indentation +42 added lines, -42 removed lines

@@ -31,54 +31,54 @@
 use function max;
 
 class RetentionService {
-	public const RETENTION_CONFIG_KEY = 'calendarRetentionObligation';
-	private const DEFAULT_RETENTION_SECONDS = 30 * 24 * 60 * 60;
+    public const RETENTION_CONFIG_KEY = 'calendarRetentionObligation';
+    private const DEFAULT_RETENTION_SECONDS = 30 * 24 * 60 * 60;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var ITimeFactory */
-	private $time;
+    /** @var ITimeFactory */
+    private $time;
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
+    /** @var CalDavBackend */
+    private $calDavBackend;
 
-	public function __construct(IConfig $config,
-								ITimeFactory $time,
-								CalDavBackend $calDavBackend) {
-		$this->config = $config;
-		$this->time = $time;
-		$this->calDavBackend = $calDavBackend;
-	}
+    public function __construct(IConfig $config,
+                                ITimeFactory $time,
+                                CalDavBackend $calDavBackend) {
+        $this->config = $config;
+        $this->time = $time;
+        $this->calDavBackend = $calDavBackend;
+    }
 
-	public function getDuration(): int {
-		return max(
-			(int) $this->config->getAppValue(
-				Application::APP_ID,
-				self::RETENTION_CONFIG_KEY,
-				(string) self::DEFAULT_RETENTION_SECONDS
-			),
-			0 // Just making sure we don't delete things in the future when a negative number is passed
-		);
-	}
+    public function getDuration(): int {
+        return max(
+            (int) $this->config->getAppValue(
+                Application::APP_ID,
+                self::RETENTION_CONFIG_KEY,
+                (string) self::DEFAULT_RETENTION_SECONDS
+            ),
+            0 // Just making sure we don't delete things in the future when a negative number is passed
+        );
+    }
 
-	public function cleanUp(): void {
-		$retentionTime = $this->getDuration();
-		$now = $this->time->getTime();
+    public function cleanUp(): void {
+        $retentionTime = $this->getDuration();
+        $now = $this->time->getTime();
 
-		$calendars = $this->calDavBackend->getDeletedCalendars($now - $retentionTime);
-		foreach ($calendars as $calendar) {
-			$this->calDavBackend->deleteCalendar($calendar['id'], true);
-		}
+        $calendars = $this->calDavBackend->getDeletedCalendars($now - $retentionTime);
+        foreach ($calendars as $calendar) {
+            $this->calDavBackend->deleteCalendar($calendar['id'], true);
+        }
 
-		$objects = $this->calDavBackend->getDeletedCalendarObjects($now - $retentionTime);
-		foreach ($objects as $object) {
-			$this->calDavBackend->deleteCalendarObject(
-				$object['calendarid'],
-				$object['uri'],
-				$object['calendartype'],
-				true
-			);
-		}
-	}
+        $objects = $this->calDavBackend->getDeletedCalendarObjects($now - $retentionTime);
+        foreach ($objects as $object) {
+            $this->calDavBackend->deleteCalendarObject(
+                $object['calendarid'],
+                $object['uri'],
+                $object['calendartype'],
+                true
+            );
+        }
+    }
 }

apps/dav/lib/CalDAV/Trashbin/Plugin.php

Indentation +81 added lines, -81 removed lines

@@ -40,85 +40,85 @@
 use function implode;
 
 class Plugin extends ServerPlugin {
-	public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
-	public const PROPERTY_CALENDAR_URI = '{http://nextcloud.com/ns}calendar-uri';
-	public const PROPERTY_RETENTION_DURATION = '{http://nextcloud.com/ns}trash-bin-retention-duration';
-
-	/** @var bool */
-	private $disableTrashbin;
-
-	/** @var RetentionService */
-	private $retentionService;
-
-	/** @var Server */
-	private $server;
-
-	public function __construct(IRequest $request,
-								RetentionService $retentionService) {
-		$this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
-		$this->retentionService = $retentionService;
-	}
-
-	public function initialize(Server $server): void {
-		$this->server = $server;
-		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
-		$server->on('propFind', Closure::fromCallable([$this, 'propFind']));
-	}
-
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
-		if (!$this->disableTrashbin) {
-			return;
-		}
-
-		$path = $request->getPath();
-		$pathParts = explode('/', ltrim($path, '/'));
-		if (\count($pathParts) < 3) {
-			// We are looking for a path like calendars/username/calendarname
-			return;
-		}
-
-		// $calendarPath will look like calendars/username/calendarname
-		$calendarPath = implode(
-			'/',
-			array_slice($pathParts, 0, 3)
-		);
-		try {
-			$calendar = $this->server->tree->getNodeForPath($calendarPath);
-			if (!($calendar instanceof Calendar)) {
-				// This is odd
-				return;
-			}
-
-			/** @var Calendar $calendar */
-			$calendar->disableTrashbin();
-		} catch (NotFound $ex) {
-			return;
-		}
-	}
-
-	private function propFind(
-		PropFind $propFind,
-		INode $node): void {
-		if ($node instanceof DeletedCalendarObject) {
-			$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
-				return $node->getDeletedAt();
-			});
-			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
-				return $node->getCalendarUri();
-			});
-		}
-		if ($node instanceof TrashbinHome) {
-			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
-				return $this->retentionService->getDuration();
-			});
-		}
-	}
-
-	public function getFeatures(): array {
-		return ['nc-calendar-trashbin'];
-	}
-
-	public function getPluginName(): string {
-		return 'nc-calendar-trashbin';
-	}
+    public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
+    public const PROPERTY_CALENDAR_URI = '{http://nextcloud.com/ns}calendar-uri';
+    public const PROPERTY_RETENTION_DURATION = '{http://nextcloud.com/ns}trash-bin-retention-duration';
+
+    /** @var bool */
+    private $disableTrashbin;
+
+    /** @var RetentionService */
+    private $retentionService;
+
+    /** @var Server */
+    private $server;
+
+    public function __construct(IRequest $request,
+                                RetentionService $retentionService) {
+        $this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
+        $this->retentionService = $retentionService;
+    }
+
+    public function initialize(Server $server): void {
+        $this->server = $server;
+        $server->on('beforeMethod:*', [$this, 'beforeMethod']);
+        $server->on('propFind', Closure::fromCallable([$this, 'propFind']));
+    }
+
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
+        if (!$this->disableTrashbin) {
+            return;
+        }
+
+        $path = $request->getPath();
+        $pathParts = explode('/', ltrim($path, '/'));
+        if (\count($pathParts) < 3) {
+            // We are looking for a path like calendars/username/calendarname
+            return;
+        }
+
+        // $calendarPath will look like calendars/username/calendarname
+        $calendarPath = implode(
+            '/',
+            array_slice($pathParts, 0, 3)
+        );
+        try {
+            $calendar = $this->server->tree->getNodeForPath($calendarPath);
+            if (!($calendar instanceof Calendar)) {
+                // This is odd
+                return;
+            }
+
+            /** @var Calendar $calendar */
+            $calendar->disableTrashbin();
+        } catch (NotFound $ex) {
+            return;
+        }
+    }
+
+    private function propFind(
+        PropFind $propFind,
+        INode $node): void {
+        if ($node instanceof DeletedCalendarObject) {
+            $propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
+                return $node->getDeletedAt();
+            });
+            $propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
+                return $node->getCalendarUri();
+            });
+        }
+        if ($node instanceof TrashbinHome) {
+            $propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
+                return $this->retentionService->getDuration();
+            });
+        }
+    }
+
+    public function getFeatures(): array {
+        return ['nc-calendar-trashbin'];
+    }
+
+    public function getPluginName(): string {
+        return 'nc-calendar-trashbin';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -100,15 +100,15 @@
 		PropFind $propFind,
 		INode $node): void {
 		if ($node instanceof DeletedCalendarObject) {
-			$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
+			$propFind->handle(self::PROPERTY_DELETED_AT, function() use ($node) {
 				return $node->getDeletedAt();
 			});
-			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
+			$propFind->handle(self::PROPERTY_CALENDAR_URI, function() use ($node) {
 				return $node->getCalendarUri();
 			});
 		}
 		if ($node instanceof TrashbinHome) {
-			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
+			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function() use ($node) {
 				return $this->retentionService->getDuration();
 			});
 		}