diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2017-10-11 13:14:56 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2017-10-16 13:49:46 +0200 |
| commit | b958725f78ade3f116001ee6dd66432bffa41748 (patch) | |
| tree | cea2e5a7a322335257e4972ca0e81c4a30c507b1 /apps | |
| parent | 7828cf454e0df86a330380dc0674db780a7abd56 (diff) | |
| download | nextcloud-server-b958725f78ade3f116001ee6dd66432bffa41748.tar.gz nextcloud-server-b958725f78ade3f116001ee6dd66432bffa41748.zip | |
Make it possible to opt out of IMip Plugin for CalDAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/appinfo/v1/caldav.php | 7 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index bd9de775f44..b10143208ec 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -52,6 +52,7 @@ $dispatcher = \OC::$server->getEventDispatcher(); $calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, $random, $dispatcher, true); $debugging = \OC::$server->getConfig()->getSystemValue('debug', false); +$sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes'; // Root nodes $principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend); @@ -84,7 +85,11 @@ if ($debugging) { $server->addPlugin(new \Sabre\DAV\Sync\Plugin()); $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin()); -$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger(), new \OC\AppFramework\Utility\TimeFactory())); + +if ($sendInvitations) { + $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger(), new \OC\AppFramework\Utility\TimeFactory())); +} + $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger())); // And off we go! diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 6f3ab3971ef..bfb67e2e5fe 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -76,6 +76,7 @@ class Server { $mailer = \OC::$server->getMailer(); $dispatcher = \OC::$server->getEventDispatcher(); $timezone = new TimeFactory(); + $sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes'; $root = new RootCollection(); $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root)); @@ -137,7 +138,9 @@ class Server { $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin()); $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin()); - $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone)); + if ($sendInvitations) { + $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone)); + } $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())); |