nextcloud / server

apps/dav/appinfo/v1/caldav.php

Indentation +18 added lines, -18 removed lines

@@ -35,22 +35,22 @@ 
 use OCA\DAV\Connector\Sabre\Principal;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getAppManager(),
-	\OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
-	\OC::$server->getConfig(),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getAppManager(),
+    \OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
+    \OC::$server->getConfig(),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $userManager = \OC::$server->getUserManager();
@@ -70,8 +70,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -87,7 +87,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
@@ -95,7 +95,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
 
 if ($sendInvitations) {
-	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+    $server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 

apps/dav/lib/AppInfo/Application.php

Indentation +203 added lines, -203 removed lines

@@ -54,235 +54,235 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
-	public const APP_ID = 'dav';
+    public const APP_ID = 'dav';
 
-	/**
-	 * Application constructor.
-	 */
-	public function __construct() {
-		parent::__construct('dav');
+    /**
+     * Application constructor.
+     */
+    public function __construct() {
+        parent::__construct('dav');
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService(PhotoCache::class, function (SimpleContainer $s) use ($server) {
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$server->getLogger()
-			);
-		});
+        $container->registerService(PhotoCache::class, function (SimpleContainer $s) use ($server) {
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $server->getLogger()
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
-	}
+        $container->registerCapability(Capabilities::class);
+    }
 
-	/**
-	 * @param IContactsManager $contactsManager
-	 * @param string $userID
-	 */
-	public function setupContactsProvider(IContactsManager $contactsManager, $userID) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query(ContactsManager::class);
-		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
+    /**
+     * @param IContactsManager $contactsManager
+     * @param string $userID
+     */
+    public function setupContactsProvider(IContactsManager $contactsManager, $userID) {
+        /** @var ContactsManager $cm */
+        $cm = $this->getContainer()->query(ContactsManager::class);
+        $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
 
-	/**
-	 * @param IContactsManager $contactsManager
-	 */
-	public function setupSystemContactsProvider(IContactsManager $contactsManager) {
-		/** @var ContactsManager $cm */
-		$cm = $this->getContainer()->query(ContactsManager::class);
-		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
+    /**
+     * @param IContactsManager $contactsManager
+     */
+    public function setupSystemContactsProvider(IContactsManager $contactsManager) {
+        /** @var ContactsManager $cm */
+        $cm = $this->getContainer()->query(ContactsManager::class);
+        $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
 
-	/**
-	 * @param ICalendarManager $calendarManager
-	 * @param string $userId
-	 */
-	public function setupCalendarProvider(ICalendarManager $calendarManager, $userId) {
-		$cm = $this->getContainer()->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
+    /**
+     * @param ICalendarManager $calendarManager
+     * @param string $userId
+     */
+    public function setupCalendarProvider(ICalendarManager $calendarManager, $userId) {
+        $cm = $this->getContainer()->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
 
-	public function registerHooks() {
-		/** @var HookManager $hm */
-		$hm = $this->getContainer()->query(HookManager::class);
-		$hm->setup();
+    public function registerHooks() {
+        /** @var HookManager $hm */
+        $hm = $this->getContainer()->query(HookManager::class);
+        $hm->setup();
 
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+        $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
 
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
 
-		$birthdayListener = function ($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query(BirthdayService::class);
-				$b->onCardChanged(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri'),
-					$event->getArgument('cardData')
-				);
-			}
-		};
+        $birthdayListener = function ($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $this->getContainer()->query(BirthdayService::class);
+                $b->onCardChanged(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri'),
+                    $event->getArgument('cardData')
+                );
+            }
+        };
 
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $this->getContainer()->query(BirthdayService::class);
-				$b->onCardDeleted(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		});
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $this->getContainer()->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        });
 
-		$clearPhotoCache = function ($event) {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $this->getContainer()->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+        $clearPhotoCache = function ($event) {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $this->getContainer()->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
 
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) {
-			$user = $event->getSubject();
-			$syncService = $this->getContainer()->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) {
+            $user = $event->getSubject();
+            $syncService = $this->getContainer()->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarAdd(
-				$event->getArgument('calendarData')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarUpdate(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('propertyMutations')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarDelete(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares')
-			);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarAdd(
+                $event->getArgument('calendarData')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarUpdate(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('propertyMutations')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarDelete(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares')
+            );
 
-			$reminderBackend = $this->getContainer()->query(ReminderBackend::class);
-			$reminderBackend->cleanRemindersForCalendar(
-				$event->getArgument('calendarId')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
+            $reminderBackend = $this->getContainer()->query(ReminderBackend::class);
+            $reminderBackend->cleanRemindersForCalendar(
+                $event->getArgument('calendarId')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
 
-			// Here we should recalculate if reminders should be sent to new or old sharees
-		});
+            // Here we should recalculate if reminders should be sent to new or old sharees
+        });
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
 
-		$listener = function (GenericEvent $event, $eventName) {
-			/** @var Backend $backend */
-			$backend = $this->getContainer()->query(Backend::class);
+        $listener = function (GenericEvent $event, $eventName) {
+            /** @var Backend $backend */
+            $backend = $this->getContainer()->query(Backend::class);
 
-			$subject = Event::SUBJECT_OBJECT_ADD;
-			if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_UPDATE;
-			} elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_DELETE;
-			}
-			$backend->onTouchCalendarObject(
-				$subject,
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('objectData')
-			);
+            $subject = Event::SUBJECT_OBJECT_ADD;
+            if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_UPDATE;
+            } elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_DELETE;
+            }
+            $backend->onTouchCalendarObject(
+                $subject,
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('objectData')
+            );
 
-			/** @var ReminderService $reminderBackend */
-			$reminderService = $this->getContainer()->query(ReminderService::class);
+            /** @var ReminderService $reminderBackend */
+            $reminderService = $this->getContainer()->query(ReminderService::class);
 
-			$reminderService->onTouchCalendarObject(
-				$eventName,
-				$event->getArgument('objectData')
-			);
-		};
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
+            $reminderService->onTouchCalendarObject(
+                $eventName,
+                $event->getArgument('objectData')
+            );
+        };
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
 
-		/**
-		 * In case the user has set their default calendar to this one
-		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
-			/** @var IConfig $config */
-			$config = $this->getContainer()->getServer()->getConfig();
-			$principalUri = $event->getArgument('calendarData')['principaluri'];
-			if (strpos($principalUri, 'principals/users') === 0) {
-				list(, $UID) = \Sabre\Uri\split($principalUri);
-				$uri = $event->getArgument('calendarData')['uri'];
-				if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
-					$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
-				}
-			}
-		});
-	}
+        /**
+         * In case the user has set their default calendar to this one
+         */
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
+            /** @var IConfig $config */
+            $config = $this->getContainer()->getServer()->getConfig();
+            $principalUri = $event->getArgument('calendarData')['principaluri'];
+            if (strpos($principalUri, 'principals/users') === 0) {
+                list(, $UID) = \Sabre\Uri\split($principalUri);
+                $uri = $event->getArgument('calendarData')['uri'];
+                if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
+                    $config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+                }
+            }
+        });
+    }
 
-	public function getSyncService() {
-		return $this->getContainer()->query(SyncService::class);
-	}
+    public function getSyncService() {
+        return $this->getContainer()->query(SyncService::class);
+    }
 
-	public function registerNotifier():void {
-		$this->getContainer()
-			->getServer()
-			->getNotificationManager()
-			->registerNotifierService(Notifier::class);
-	}
+    public function registerNotifier():void {
+        $this->getContainer()
+            ->getServer()
+            ->getNotificationManager()
+            ->registerNotifierService(Notifier::class);
+    }
 
-	public function registerCalendarReminders():void {
-		try {
-			/** @var NotificationProviderManager $notificationProviderManager */
-			$notificationProviderManager = $this->getContainer()->query(NotificationProviderManager::class);
-			$notificationProviderManager->registerProvider(AudioProvider::class);
-			$notificationProviderManager->registerProvider(EmailProvider::class);
-			$notificationProviderManager->registerProvider(PushProvider::class);
-		} catch (\Exception $ex) {
-			$this->getContainer()->getServer()->getLogger()->logException($ex);
-		}
-	}
+    public function registerCalendarReminders():void {
+        try {
+            /** @var NotificationProviderManager $notificationProviderManager */
+            $notificationProviderManager = $this->getContainer()->query(NotificationProviderManager::class);
+            $notificationProviderManager->registerProvider(AudioProvider::class);
+            $notificationProviderManager->registerProvider(EmailProvider::class);
+            $notificationProviderManager->registerProvider(PushProvider::class);
+        } catch (\Exception $ex) {
+            $this->getContainer()->getServer()->getLogger()->logException($ex);
+        }
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -65,7 +65,7 @@ 
 		$container = $this->getContainer();
 		$server = $container->getServer();
 
-		$container->registerService(PhotoCache::class, function (SimpleContainer $s) use ($server) {
+		$container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) {
 			return new PhotoCache(
 				$server->getAppDataDir('dav-photocache'),
 				$server->getLogger()
@@ -116,13 +116,13 @@ 
 		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
 
 		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+		$dispatcher->addListener(IUser::class.'::firstLogin', function($event) use ($hm) {
 			if ($event instanceof GenericEvent) {
 				$hm->firstLogin($event->getSubject());
 			}
 		});
 
-		$birthdayListener = function ($event) {
+		$birthdayListener = function($event) {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $this->getContainer()->query(BirthdayService::class);
@@ -136,7 +136,7 @@ 
 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) {
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $this->getContainer()->query(BirthdayService::class);
@@ -147,7 +147,7 @@ 
 			}
 		});
 
-		$clearPhotoCache = function ($event) {
+		$clearPhotoCache = function($event) {
 			if ($event instanceof GenericEvent) {
 				/** @var PhotoCache $p */
 				$p = $this->getContainer()->query(PhotoCache::class);
@@ -160,20 +160,20 @@ 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
 
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) {
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) {
 			$user = $event->getSubject();
 			$syncService = $this->getContainer()->query(SyncService::class);
 			$syncService->updateUser($user);
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 			$backend->onCalendarAdd(
 				$event->getArgument('calendarData')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 			$backend->onCalendarUpdate(
@@ -182,7 +182,7 @@ 
 				$event->getArgument('propertyMutations')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 			$backend->onCalendarDelete(
@@ -195,7 +195,7 @@ 
 				$event->getArgument('calendarId')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 			$backend->onCalendarUpdateShares(
@@ -208,7 +208,7 @@ 
 			// Here we should recalculate if reminders should be sent to new or old sharees
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 			$backend->onCalendarPublication(
@@ -217,7 +217,7 @@ 
 			);
 		});
 
-		$listener = function (GenericEvent $event, $eventName) {
+		$listener = function(GenericEvent $event, $eventName) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
 
@@ -249,7 +249,7 @@ 
 		/**
 		 * In case the user has set their default calendar to this one
 		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) {
 			/** @var IConfig $config */
 			$config = $this->getContainer()->getServer()->getConfig();
 			$principalUri = $event->getArgument('calendarData')['principaluri'];

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

Indentation +486 added lines, -486 removed lines

@@ -52,165 +52,165 @@ 
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/** @var ITip\Message[] */
-	private $schedulingResponses = [];
-
-	/** @var string|null */
-	private $pathOfCalendarObjectChange = null;
-
-	public const CALENDAR_USER_TYPE = '{' . self::NS_CALDAV . '}calendar-user-type';
-	public const SCHEDULE_DEFAULT_CALENDAR_URL = '{' . Plugin::NS_CALDAV . '}schedule-default-calendar-URL';
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-		$server->on('afterWriteContent', [$this, 'dispatchSchedulingResponses']);
-		$server->on('afterCreateFile', [$this, 'dispatchSchedulingResponses']);
-	}
-
-	/**
-	 * This method handler is invoked during fetching of properties.
-	 *
-	 * We use this event to add calendar-auto-schedule-specific properties.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			// overwrite Sabre/Dav's implementation
-			$propFind->handle(self::CALENDAR_USER_TYPE, function () use ($node) {
-				if ($node instanceof IProperties) {
-					$props = $node->getProperties([self::CALENDAR_USER_TYPE]);
-
-					if (isset($props[self::CALENDAR_USER_TYPE])) {
-						return $props[self::CALENDAR_USER_TYPE];
-					}
-				}
-
-				return 'INDIVIDUAL';
-			});
-		}
-
-		parent::propFind($propFind, $node);
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
-
-		if ($result === null) {
-			$result = [];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @param VCalendar $vCal
-	 * @param mixed $calendarPath
-	 * @param mixed $modified
-	 * @param mixed $isNew
-	 */
-	public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
-		// Save the first path we get as a calendar-object-change request
-		if (!$this->pathOfCalendarObjectChange) {
-			$this->pathOfCalendarObjectChange = $request->getPath();
-		}
-
-		parent::calendarObjectChange($request, $response, $vCal, $calendarPath, $modified, $isNew);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function scheduleLocalDelivery(ITip\Message $iTipMessage):void {
-		parent::scheduleLocalDelivery($iTipMessage);
-
-		// We only care when the message was successfully delivered locally
-		if ($iTipMessage->scheduleStatus !== '1.2;Message delivered locally') {
-			return;
-		}
-
-		// We only care about request. reply and cancel are properly handled
-		// by parent::scheduleLocalDelivery already
-		if (strcasecmp($iTipMessage->method, 'REQUEST') !== 0) {
-			return;
-		}
-
-		// If parent::scheduleLocalDelivery set scheduleStatus to 1.2,
-		// it means that it was successfully delivered locally.
-		// Meaning that the ACL plugin is loaded and that a principial
-		// exists for the given recipient id, no need to double check
-		/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-		$aclPlugin = $this->server->getPlugin('acl');
-		$principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
-		$calendarUserType = $this->getCalendarUserTypeForPrincipal($principalUri);
-		if (strcasecmp($calendarUserType, 'ROOM') !== 0 && strcasecmp($calendarUserType, 'RESOURCE') !== 0) {
-			return;
-		}
-
-		$attendee = $this->getCurrentAttendee($iTipMessage);
-		if (!$attendee) {
-			return;
-		}
-
-		// We only respond when a response was actually requested
-		$rsvp = $this->getAttendeeRSVP($attendee);
-		if (!$rsvp) {
-			return;
-		}
-
-		if (!isset($iTipMessage->message)) {
-			return;
-		}
-
-		$vcalendar = $iTipMessage->message;
-		if (!isset($vcalendar->VEVENT)) {
-			return;
-		}
-
-		/** @var Component $vevent */
-		$vevent = $vcalendar->VEVENT;
-
-		// We don't support autoresponses for recurrencing events for now
-		if (isset($vevent->RRULE) || isset($vevent->RDATE)) {
-			return;
-		}
-
-		$dtstart = $vevent->DTSTART;
-		$dtend =  $this->getDTEndFromVEvent($vevent);
-		$uid = $vevent->UID->getValue();
-		$sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
-		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
-
-		$message = <<<EOF
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /** @var ITip\Message[] */
+    private $schedulingResponses = [];
+
+    /** @var string|null */
+    private $pathOfCalendarObjectChange = null;
+
+    public const CALENDAR_USER_TYPE = '{' . self::NS_CALDAV . '}calendar-user-type';
+    public const SCHEDULE_DEFAULT_CALENDAR_URL = '{' . Plugin::NS_CALDAV . '}schedule-default-calendar-URL';
+
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+        $server->on('afterWriteContent', [$this, 'dispatchSchedulingResponses']);
+        $server->on('afterCreateFile', [$this, 'dispatchSchedulingResponses']);
+    }
+
+    /**
+     * This method handler is invoked during fetching of properties.
+     *
+     * We use this event to add calendar-auto-schedule-specific properties.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            // overwrite Sabre/Dav's implementation
+            $propFind->handle(self::CALENDAR_USER_TYPE, function () use ($node) {
+                if ($node instanceof IProperties) {
+                    $props = $node->getProperties([self::CALENDAR_USER_TYPE]);
+
+                    if (isset($props[self::CALENDAR_USER_TYPE])) {
+                        return $props[self::CALENDAR_USER_TYPE];
+                    }
+                }
+
+                return 'INDIVIDUAL';
+            });
+        }
+
+        parent::propFind($propFind, $node);
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
+
+        if ($result === null) {
+            $result = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @param VCalendar $vCal
+     * @param mixed $calendarPath
+     * @param mixed $modified
+     * @param mixed $isNew
+     */
+    public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
+        // Save the first path we get as a calendar-object-change request
+        if (!$this->pathOfCalendarObjectChange) {
+            $this->pathOfCalendarObjectChange = $request->getPath();
+        }
+
+        parent::calendarObjectChange($request, $response, $vCal, $calendarPath, $modified, $isNew);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function scheduleLocalDelivery(ITip\Message $iTipMessage):void {
+        parent::scheduleLocalDelivery($iTipMessage);
+
+        // We only care when the message was successfully delivered locally
+        if ($iTipMessage->scheduleStatus !== '1.2;Message delivered locally') {
+            return;
+        }
+
+        // We only care about request. reply and cancel are properly handled
+        // by parent::scheduleLocalDelivery already
+        if (strcasecmp($iTipMessage->method, 'REQUEST') !== 0) {
+            return;
+        }
+
+        // If parent::scheduleLocalDelivery set scheduleStatus to 1.2,
+        // it means that it was successfully delivered locally.
+        // Meaning that the ACL plugin is loaded and that a principial
+        // exists for the given recipient id, no need to double check
+        /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+        $aclPlugin = $this->server->getPlugin('acl');
+        $principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
+        $calendarUserType = $this->getCalendarUserTypeForPrincipal($principalUri);
+        if (strcasecmp($calendarUserType, 'ROOM') !== 0 && strcasecmp($calendarUserType, 'RESOURCE') !== 0) {
+            return;
+        }
+
+        $attendee = $this->getCurrentAttendee($iTipMessage);
+        if (!$attendee) {
+            return;
+        }
+
+        // We only respond when a response was actually requested
+        $rsvp = $this->getAttendeeRSVP($attendee);
+        if (!$rsvp) {
+            return;
+        }
+
+        if (!isset($iTipMessage->message)) {
+            return;
+        }
+
+        $vcalendar = $iTipMessage->message;
+        if (!isset($vcalendar->VEVENT)) {
+            return;
+        }
+
+        /** @var Component $vevent */
+        $vevent = $vcalendar->VEVENT;
+
+        // We don't support autoresponses for recurrencing events for now
+        if (isset($vevent->RRULE) || isset($vevent->RDATE)) {
+            return;
+        }
+
+        $dtstart = $vevent->DTSTART;
+        $dtend =  $this->getDTEndFromVEvent($vevent);
+        $uid = $vevent->UID->getValue();
+        $sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
+        $recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
+
+        $message = <<<EOF
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
 METHOD:REPLY
@@ -225,331 +225,331 @@ 
 END:VCALENDAR
 EOF;
 
-		if ($this->isAvailableAtTime($attendee->getValue(), $dtstart->getDateTime(), $dtend->getDateTime(), $uid)) {
-			$partStat = 'ACCEPTED';
-		} else {
-			$partStat = 'DECLINED';
-		}
-
-		$vObject = Reader::read(vsprintf($message, [
-			$partStat,
-			$iTipMessage->recipient,
-			$iTipMessage->sender,
-			$uid,
-			$sequence,
-			$recurrenceId
-		]));
-
-		$responseITipMessage = new ITip\Message();
-		$responseITipMessage->uid = $uid;
-		$responseITipMessage->component = 'VEVENT';
-		$responseITipMessage->method = 'REPLY';
-		$responseITipMessage->sequence = $sequence;
-		$responseITipMessage->sender = $iTipMessage->recipient;
-		$responseITipMessage->recipient = $iTipMessage->sender;
-		$responseITipMessage->message = $vObject;
-
-		// We can't dispatch them now already, because the organizers calendar-object
-		// was not yet created. Hence Sabre/DAV won't find a calendar-object, when we
-		// send our reply.
-		$this->schedulingResponses[] = $responseITipMessage;
-	}
-
-	/**
-	 * @param string $uri
-	 */
-	public function dispatchSchedulingResponses(string $uri):void {
-		if ($uri !== $this->pathOfCalendarObjectChange) {
-			return;
-		}
-
-		foreach ($this->schedulingResponses as $schedulingResponse) {
-			$this->scheduleLocalDelivery($schedulingResponse);
-		}
-	}
-
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle(self::SCHEDULE_DEFAULT_CALENDAR_URL, function () use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
-
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-				if (!$calendarHomePath) {
-					return null;
-				}
-
-				if (strpos($principalUrl, 'principals/users') === 0) {
-					list(, $userId) = split($principalUrl);
-					$uri = $this->config->getUserValue($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
-					$displayName = CalDavBackend::PERSONAL_CALENDAR_NAME;
-				} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
-						  strpos($principalUrl, 'principals/calendar-rooms') === 0) {
-					$uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
-					$displayName = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
-				} else {
-					// How did we end up here?
-					// TODO - throw exception or just ignore?
-					return null;
-				}
-
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists($uri)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
-						'{DAV:}displayname' => $displayName,
-					]);
-				}
-
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
-				if (empty($result)) {
-					return null;
-				}
-
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return string?
-	 */
-	protected function getCalendarUserTypeForPrincipal($principal):?string {
-		$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
-		$properties = $this->server->getProperties(
-			$principal,
-			[$calendarUserType]
-		);
-
-		// If we can't find this information, we'll stop processing
-		if (!isset($properties[$calendarUserType])) {
-			return null;
-		}
-
-		return $properties[$calendarUserType];
-	}
-
-	/**
-	 * @param ITip\Message $iTipMessage
-	 * @return null|Property
-	 */
-	private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			/** @var Property $attendee */
-			if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 * @return bool
-	 */
-	private function getAttendeeRSVP(Property $attendee = null):bool {
-		if ($attendee !== null) {
-			$rsvp = $attendee->offsetGet('RSVP');
-			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
-				return true;
-			}
-		}
-		// RFC 5545 3.2.17: default RSVP is false
-		return false;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return Property\ICalendar\DateTime
-	 */
-	private function getDTEndFromVEvent(VEvent $vevent):Property\ICalendar\DateTime {
-		if (isset($vevent->DTEND)) {
-			return $vevent->DTEND;
-		}
-
-		if (isset($vevent->DURATION)) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-			return $end;
-		}
-
-		if (!$vevent->DTSTART->hasTime()) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-			return $end;
-		}
-
-		return clone $vevent->DTSTART;
-	}
-
-	/**
-	 * @param string $email
-	 * @param \DateTimeInterface $start
-	 * @param \DateTimeInterface $end
-	 * @param string $ignoreUID
-	 * @return bool
-	 */
-	private function isAvailableAtTime(string $email, \DateTimeInterface $start, \DateTimeInterface $end, string $ignoreUID):bool {
-		// This method is heavily inspired by Sabre\CalDAV\Schedule\Plugin::scheduleLocalDelivery
-		// and Sabre\CalDAV\Schedule\Plugin::getFreeBusyForEmail
-
-		$aclPlugin = $this->server->getPlugin('acl');
-		$this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
-
-		$result = $aclPlugin->principalSearch(
-			['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
-			[
-				'{DAV:}principal-URL',
-				'{' . self::NS_CALDAV . '}calendar-home-set',
-				'{' . self::NS_CALDAV . '}schedule-inbox-URL',
-				'{http://sabredav.org/ns}email-address',
-
-			]
-		);
-		$this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
-
-
-		// Grabbing the calendar list
-		$objects = [];
-		$calendarTimeZone = new DateTimeZone('UTC');
-
-		$homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
-		foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
-			if (!$node instanceof ICalendar) {
-				continue;
-			}
-
-			// Getting the list of object uris within the time-range
-			$urls = $node->calendarQuery([
-				'name' => 'VCALENDAR',
-				'comp-filters' => [
-					[
-						'name' => 'VEVENT',
-						'is-not-defined' => false,
-						'time-range' => [
-							'start' => $start,
-							'end' => $end,
-						],
-						'comp-filters'   => [],
-						'prop-filters'   => [],
-					],
-					[
-						'name' => 'VEVENT',
-						'is-not-defined' => false,
-						'time-range' => null,
-						'comp-filters'   => [],
-						'prop-filters'   => [
-							[
-								'name'           => 'UID',
-								'is-not-defined' => false,
-								'time-range'     => null,
-								'text-match'     => [
-									'value' => $ignoreUID,
-									'negate-condition' => true,
-									'collation' => 'i;octet',
-								],
-								'param-filters' => [],
-							],
-						]
-					],
-				],
-				'prop-filters' => [],
-				'is-not-defined' => false,
-				'time-range' => null,
-			]);
-
-			foreach ($urls as $url) {
-				$objects[] = $node->getChild($url)->get();
-			}
-		}
-
-		$inboxProps = $this->server->getProperties(
-			$result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
-			['{' . self::NS_CALDAV . '}calendar-availability']
-		);
-
-		$vcalendar = new VCalendar();
-		$vcalendar->METHOD = 'REPLY';
-
-		$generator = new FreeBusyGenerator();
-		$generator->setObjects($objects);
-		$generator->setTimeRange($start, $end);
-		$generator->setBaseObject($vcalendar);
-		$generator->setTimeZone($calendarTimeZone);
-
-		if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
-			$generator->setVAvailability(
-				Reader::read(
-					$inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
-				)
-			);
-		}
-
-		$result = $generator->getResult();
-		if (!isset($result->VFREEBUSY)) {
-			return false;
-		}
-
-		/** @var Component $freeBusyComponent */
-		$freeBusyComponent = $result->VFREEBUSY;
-		$freeBusyProperties = $freeBusyComponent->select('FREEBUSY');
-		// If there is no Free-busy property at all, the time-range is empty and available
-		if (count($freeBusyProperties) === 0) {
-			return true;
-		}
-
-		// If more than one Free-Busy property was returned, it means that an event
-		// starts or ends inside this time-range, so it's not availabe and we return false
-		if (count($freeBusyProperties) > 1) {
-			return false;
-		}
-
-		/** @var Property $freeBusyProperty */
-		$freeBusyProperty = $freeBusyProperties[0];
-		if (!$freeBusyProperty->offsetExists('FBTYPE')) {
-			// If there is no FBTYPE, it means it's busy
-			return false;
-		}
-
-		$fbTypeParameter = $freeBusyProperty->offsetGet('FBTYPE');
-		if (!($fbTypeParameter instanceof Parameter)) {
-			return false;
-		}
-
-		return (strcasecmp($fbTypeParameter->getValue(), 'FREE') === 0);
-	}
-
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	private function stripOffMailTo(string $email): string {
-		if (stripos($email, 'mailto:')  === 0) {
-			return substr($email, 7);
-		}
-
-		return $email;
-	}
+        if ($this->isAvailableAtTime($attendee->getValue(), $dtstart->getDateTime(), $dtend->getDateTime(), $uid)) {
+            $partStat = 'ACCEPTED';
+        } else {
+            $partStat = 'DECLINED';
+        }
+
+        $vObject = Reader::read(vsprintf($message, [
+            $partStat,
+            $iTipMessage->recipient,
+            $iTipMessage->sender,
+            $uid,
+            $sequence,
+            $recurrenceId
+        ]));
+
+        $responseITipMessage = new ITip\Message();
+        $responseITipMessage->uid = $uid;
+        $responseITipMessage->component = 'VEVENT';
+        $responseITipMessage->method = 'REPLY';
+        $responseITipMessage->sequence = $sequence;
+        $responseITipMessage->sender = $iTipMessage->recipient;
+        $responseITipMessage->recipient = $iTipMessage->sender;
+        $responseITipMessage->message = $vObject;
+
+        // We can't dispatch them now already, because the organizers calendar-object
+        // was not yet created. Hence Sabre/DAV won't find a calendar-object, when we
+        // send our reply.
+        $this->schedulingResponses[] = $responseITipMessage;
+    }
+
+    /**
+     * @param string $uri
+     */
+    public function dispatchSchedulingResponses(string $uri):void {
+        if ($uri !== $this->pathOfCalendarObjectChange) {
+            return;
+        }
+
+        foreach ($this->schedulingResponses as $schedulingResponse) {
+            $this->scheduleLocalDelivery($schedulingResponse);
+        }
+    }
+
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle(self::SCHEDULE_DEFAULT_CALENDAR_URL, function () use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
+
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
+                if (strpos($principalUrl, 'principals/users') === 0) {
+                    list(, $userId) = split($principalUrl);
+                    $uri = $this->config->getUserValue($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
+                    $displayName = CalDavBackend::PERSONAL_CALENDAR_NAME;
+                } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
+                          strpos($principalUrl, 'principals/calendar-rooms') === 0) {
+                    $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
+                    $displayName = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
+                } else {
+                    // How did we end up here?
+                    // TODO - throw exception or just ignore?
+                    return null;
+                }
+
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists($uri)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+                        '{DAV:}displayname' => $displayName,
+                    ]);
+                }
+
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
+
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return string?
+     */
+    protected function getCalendarUserTypeForPrincipal($principal):?string {
+        $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+        $properties = $this->server->getProperties(
+            $principal,
+            [$calendarUserType]
+        );
+
+        // If we can't find this information, we'll stop processing
+        if (!isset($properties[$calendarUserType])) {
+            return null;
+        }
+
+        return $properties[$calendarUserType];
+    }
+
+    /**
+     * @param ITip\Message $iTipMessage
+     * @return null|Property
+     */
+    private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            /** @var Property $attendee */
+            if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param Property|null $attendee
+     * @return bool
+     */
+    private function getAttendeeRSVP(Property $attendee = null):bool {
+        if ($attendee !== null) {
+            $rsvp = $attendee->offsetGet('RSVP');
+            if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+                return true;
+            }
+        }
+        // RFC 5545 3.2.17: default RSVP is false
+        return false;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return Property\ICalendar\DateTime
+     */
+    private function getDTEndFromVEvent(VEvent $vevent):Property\ICalendar\DateTime {
+        if (isset($vevent->DTEND)) {
+            return $vevent->DTEND;
+        }
+
+        if (isset($vevent->DURATION)) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+            return $end;
+        }
+
+        if (!$vevent->DTSTART->hasTime()) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+            return $end;
+        }
+
+        return clone $vevent->DTSTART;
+    }
+
+    /**
+     * @param string $email
+     * @param \DateTimeInterface $start
+     * @param \DateTimeInterface $end
+     * @param string $ignoreUID
+     * @return bool
+     */
+    private function isAvailableAtTime(string $email, \DateTimeInterface $start, \DateTimeInterface $end, string $ignoreUID):bool {
+        // This method is heavily inspired by Sabre\CalDAV\Schedule\Plugin::scheduleLocalDelivery
+        // and Sabre\CalDAV\Schedule\Plugin::getFreeBusyForEmail
+
+        $aclPlugin = $this->server->getPlugin('acl');
+        $this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
+
+        $result = $aclPlugin->principalSearch(
+            ['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
+            [
+                '{DAV:}principal-URL',
+                '{' . self::NS_CALDAV . '}calendar-home-set',
+                '{' . self::NS_CALDAV . '}schedule-inbox-URL',
+                '{http://sabredav.org/ns}email-address',
+
+            ]
+        );
+        $this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
+
+
+        // Grabbing the calendar list
+        $objects = [];
+        $calendarTimeZone = new DateTimeZone('UTC');
+
+        $homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
+        foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
+            if (!$node instanceof ICalendar) {
+                continue;
+            }
+
+            // Getting the list of object uris within the time-range
+            $urls = $node->calendarQuery([
+                'name' => 'VCALENDAR',
+                'comp-filters' => [
+                    [
+                        'name' => 'VEVENT',
+                        'is-not-defined' => false,
+                        'time-range' => [
+                            'start' => $start,
+                            'end' => $end,
+                        ],
+                        'comp-filters'   => [],
+                        'prop-filters'   => [],
+                    ],
+                    [
+                        'name' => 'VEVENT',
+                        'is-not-defined' => false,
+                        'time-range' => null,
+                        'comp-filters'   => [],
+                        'prop-filters'   => [
+                            [
+                                'name'           => 'UID',
+                                'is-not-defined' => false,
+                                'time-range'     => null,
+                                'text-match'     => [
+                                    'value' => $ignoreUID,
+                                    'negate-condition' => true,
+                                    'collation' => 'i;octet',
+                                ],
+                                'param-filters' => [],
+                            ],
+                        ]
+                    ],
+                ],
+                'prop-filters' => [],
+                'is-not-defined' => false,
+                'time-range' => null,
+            ]);
+
+            foreach ($urls as $url) {
+                $objects[] = $node->getChild($url)->get();
+            }
+        }
+
+        $inboxProps = $this->server->getProperties(
+            $result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
+            ['{' . self::NS_CALDAV . '}calendar-availability']
+        );
+
+        $vcalendar = new VCalendar();
+        $vcalendar->METHOD = 'REPLY';
+
+        $generator = new FreeBusyGenerator();
+        $generator->setObjects($objects);
+        $generator->setTimeRange($start, $end);
+        $generator->setBaseObject($vcalendar);
+        $generator->setTimeZone($calendarTimeZone);
+
+        if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
+            $generator->setVAvailability(
+                Reader::read(
+                    $inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
+                )
+            );
+        }
+
+        $result = $generator->getResult();
+        if (!isset($result->VFREEBUSY)) {
+            return false;
+        }
+
+        /** @var Component $freeBusyComponent */
+        $freeBusyComponent = $result->VFREEBUSY;
+        $freeBusyProperties = $freeBusyComponent->select('FREEBUSY');
+        // If there is no Free-busy property at all, the time-range is empty and available
+        if (count($freeBusyProperties) === 0) {
+            return true;
+        }
+
+        // If more than one Free-Busy property was returned, it means that an event
+        // starts or ends inside this time-range, so it's not availabe and we return false
+        if (count($freeBusyProperties) > 1) {
+            return false;
+        }
+
+        /** @var Property $freeBusyProperty */
+        $freeBusyProperty = $freeBusyProperties[0];
+        if (!$freeBusyProperty->offsetExists('FBTYPE')) {
+            // If there is no FBTYPE, it means it's busy
+            return false;
+        }
+
+        $fbTypeParameter = $freeBusyProperty->offsetGet('FBTYPE');
+        if (!($fbTypeParameter instanceof Parameter)) {
+            return false;
+        }
+
+        return (strcasecmp($fbTypeParameter->getValue(), 'FREE') === 0);
+    }
+
+    /**
+     * @param string $email
+     * @return string
+     */
+    private function stripOffMailTo(string $email): string {
+        if (stripos($email, 'mailto:')  === 0) {
+            return substr($email, 7);
+        }
+
+        return $email;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -63,8 +63,8 @@ 
 	/** @var string|null */
 	private $pathOfCalendarObjectChange = null;
 
-	public const CALENDAR_USER_TYPE = '{' . self::NS_CALDAV . '}calendar-user-type';
-	public const SCHEDULE_DEFAULT_CALENDAR_URL = '{' . Plugin::NS_CALDAV . '}schedule-default-calendar-URL';
+	public const CALENDAR_USER_TYPE = '{'.self::NS_CALDAV.'}calendar-user-type';
+	public const SCHEDULE_DEFAULT_CALENDAR_URL = '{'.Plugin::NS_CALDAV.'}schedule-default-calendar-URL';
 
 	/**
 	 * @param IConfig $config
@@ -98,7 +98,7 @@ 
 	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
 			// overwrite Sabre/Dav's implementation
-			$propFind->handle(self::CALENDAR_USER_TYPE, function () use ($node) {
+			$propFind->handle(self::CALENDAR_USER_TYPE, function() use ($node) {
 				if ($node instanceof IProperties) {
 					$props = $node->getProperties([self::CALENDAR_USER_TYPE]);
 
@@ -205,7 +205,7 @@ 
 		}
 
 		$dtstart = $vevent->DTSTART;
-		$dtend =  $this->getDTEndFromVEvent($vevent);
+		$dtend = $this->getDTEndFromVEvent($vevent);
 		$uid = $vevent->UID->getValue();
 		$sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
 		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
@@ -277,7 +277,7 @@ 
 	 */
 	public function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
-			$propFind->handle(self::SCHEDULE_DEFAULT_CALENDAR_URL, function () use ($node) {
+			$propFind->handle(self::SCHEDULE_DEFAULT_CALENDAR_URL, function() use ($node) {
 				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
 				$caldavPlugin = $this->server->getPlugin('caldav');
 				$principalUrl = $node->getPrincipalUrl();
@@ -309,7 +309,7 @@ 
 					]);
 				}
 
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+				$result = $this->server->getPropertiesForPath($calendarHomePath.'/'.$uri, [], 1);
 				if (empty($result)) {
 					return null;
 				}
@@ -325,8 +325,8 @@ 
 	 * @param string $principal
 	 * @return string?
 	 */
-	protected function getCalendarUserTypeForPrincipal($principal):?string {
-		$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+	protected function getCalendarUserTypeForPrincipal($principal): ?string {
+		$calendarUserType = '{'.self::NS_CALDAV.'}calendar-user-type';
 		$properties = $this->server->getProperties(
 			$principal,
 			[$calendarUserType]
@@ -344,7 +344,7 @@ 
 	 * @param ITip\Message $iTipMessage
 	 * @return null|Property
 	 */
-	private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
+	private function getCurrentAttendee(ITip\Message $iTipMessage): ?Property {
 		/** @var VEvent $vevent */
 		$vevent = $iTipMessage->message->VEVENT;
 		$attendees = $vevent->select('ATTENDEE');
@@ -422,8 +422,8 @@ 
 			['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
 			[
 				'{DAV:}principal-URL',
-				'{' . self::NS_CALDAV . '}calendar-home-set',
-				'{' . self::NS_CALDAV . '}schedule-inbox-URL',
+				'{'.self::NS_CALDAV.'}calendar-home-set',
+				'{'.self::NS_CALDAV.'}schedule-inbox-URL',
 				'{http://sabredav.org/ns}email-address',
 
 			]
@@ -435,7 +435,7 @@ 
 		$objects = [];
 		$calendarTimeZone = new DateTimeZone('UTC');
 
-		$homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
+		$homePath = $result[0][200]['{'.self::NS_CALDAV.'}calendar-home-set']->getHref();
 		foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
 			if (!$node instanceof ICalendar) {
 				continue;
@@ -486,8 +486,8 @@ 
 		}
 
 		$inboxProps = $this->server->getProperties(
-			$result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
-			['{' . self::NS_CALDAV . '}calendar-availability']
+			$result[0][200]['{'.self::NS_CALDAV.'}schedule-inbox-URL']->getHref(),
+			['{'.self::NS_CALDAV.'}calendar-availability']
 		);
 
 		$vcalendar = new VCalendar();
@@ -499,10 +499,10 @@ 
 		$generator->setBaseObject($vcalendar);
 		$generator->setTimeZone($calendarTimeZone);
 
-		if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
+		if (isset($inboxProps['{'.self::NS_CALDAV.'}calendar-availability'])) {
 			$generator->setVAvailability(
 				Reader::read(
-					$inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
+					$inboxProps['{'.self::NS_CALDAV.'}calendar-availability']
 				)
 			);
 		}
@@ -546,7 +546,7 @@ 
 	 * @return string
 	 */
 	private function stripOffMailTo(string $email): string {
-		if (stripos($email, 'mailto:')  === 0) {
+		if (stripos($email, 'mailto:') === 0) {
 			return substr($email, 7);
 		}
 

apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php

Indentation +71 added lines, -71 removed lines

@@ -36,86 +36,86 @@
 
 class InvitationResponseServer {
 
-	/** @var \OCA\DAV\Connector\Sabre\Server */
-	public $server;
+    /** @var \OCA\DAV\Connector\Sabre\Server */
+    public $server;
 
-	/**
-	 * InvitationResponseServer constructor.
-	 */
-	public function __construct() {
-		$baseUri = \OC::$WEBROOT . '/remote.php/dav/';
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    /**
+     * InvitationResponseServer constructor.
+     */
+    public function __construct() {
+        $baseUri = \OC::$WEBROOT . '/remote.php/dav/';
+        $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()));
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($baseUri);
-		$this->server->setBaseUri($baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($baseUri);
+        $this->server->setBaseUri($baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$this->server->addPlugin(new class() extends Plugin {
-			public function getCurrentPrincipal() {
-				return 'principals/system/public';
-			}
-		});
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $this->server->addPlugin(new class() extends Plugin {
+            public function getCurrentPrincipal() {
+                return 'principals/system/public';
+            }
+        });
 
-		// 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);
 
-		$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'
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups'
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-		//$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-			\OC::$server->getConfig(),
-			\OC::$server->getURLGenerator()
-		));
+        // calendar plugins
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+        //$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+            \OC::$server->getConfig(),
+            \OC::$server->getURLGenerator()
+        ));
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root) {
-			// 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);
-			}
-		});
-	}
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root) {
+            // 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);
+            }
+        });
+    }
 
-	/**
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	public function handleITipMessage(Message $iTipMessage) {
-		/** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
-		$schedulingPlugin = $this->server->getPlugin('caldav-schedule');
-		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
-	}
+    /**
+     * @param Message $iTipMessage
+     * @return void
+     */
+    public function handleITipMessage(Message $iTipMessage) {
+        /** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
+        $schedulingPlugin = $this->server->getPlugin('caldav-schedule');
+        $schedulingPlugin->scheduleLocalDelivery($iTipMessage);
+    }
 }

apps/dav/lib/Server.php

Indentation +256 added lines, -256 removed lines

@@ -72,260 +72,260 @@
 
 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();
-
-		$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()));
-
-		// 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);
-
-		$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(new 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()));
-			$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 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);
-			}
-		});
-	}
-
-	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();
+
+        $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()));
+
+        // 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);
+
+        $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(new 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()));
+            $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 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);
+            }
+        });
+    }
+
+    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;
+    }
 }