summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-12-03 19:08:22 +0100
committerGitHub <noreply@github.com>2022-12-03 19:08:22 +0100
commit53f2519a6c6cc3fc53a90bed04109999afee1e0f (patch)
tree62e11f188ce0dc62c1cc37c0981c8b4930070204 /apps
parent06624171571e90407ebe4ca1371b5bfcf294b89c (diff)
parentb1716b0ef0c79619c7134cefe5295feed5e1f27b (diff)
downloadnextcloud-server-53f2519a6c6cc3fc53a90bed04109999afee1e0f.tar.gz
nextcloud-server-53f2519a6c6cc3fc53a90bed04109999afee1e0f.zip
Merge pull request #34920 from ibpl/master-IB#1126265
Added parameter to disallow calendar subscription via link
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Server.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index f98dba22925..437a425fcd3 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bjoern Schiessle <bjoern@schiessle.org>
@@ -177,7 +178,9 @@ class Server {
$this->server->addPlugin(\OC::$server->get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($request));
- $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+ if (\OC::$server->getConfig()->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+ $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+ }
$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));