make it possible to opt out of our iMip Plugin

Signed-off-by: Georg Ehrke <[email protected]>
nextcloud · Jun 8, 2017 · 6d74321 · 6d74321
1 parent b8c62a7
commit 6d74321
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
@@ -52,6 +52,7 @@
 $calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, $random, $dispatcher, true);
 
 $debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
+$sendInvitations = \OC::$server->getConfig()->getSystemValue('caldav_send_invitations', true);
 
 // Root nodes
 $principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
@@ -84,7 +85,10 @@
 $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
@@ -136,7 +136,9 @@ public function __construct(IRequest $request, $baseUri) {
 		$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(\OC::$server->getConfig()->getSystemValue('caldav_send_invitations', true)) {
+			$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()));

diff --git a/config/config.sample.php b/config/config.sample.php
@@ -1551,6 +1551,10 @@
 /**
  * show group membership on the personal page
  */
-'settings.personal.showGroupMembership' => true
+'settings.personal.showGroupMembership' => true,
 
+/**
+ * send out invitations via Nextcloud's integrated CalDAV server
+ */
+'caldav_send_invitations' => true,
 );