From 7828cf454e0df86a330380dc0674db780a7abd56 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 11 Oct 2017 13:09:26 +0200 Subject: [PATCH 1/2] add admin settings panel for dav app Signed-off-by: Georg Ehrke --- apps/dav/appinfo/info.xml | 6 +- apps/dav/js/settings-admin-caldav.js | 28 ++++++++ apps/dav/lib/Settings/CalDAVSettings.php | 68 +++++++++++++++++++ apps/dav/templates/settings-admin-caldav.php | 40 +++++++++++ .../unit/Settings/CalDAVSettingsTest.php | 58 ++++++++++++++++ 5 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 apps/dav/js/settings-admin-caldav.js create mode 100644 apps/dav/lib/Settings/CalDAVSettings.php create mode 100644 apps/dav/templates/settings-admin-caldav.php create mode 100644 apps/dav/tests/unit/Settings/CalDAVSettingsTest.php diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 9b500c9f30022..0f97289ba378a 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ WebDAV endpoint AGPL owncloud.org - 1.4.4 + 1.4.5 @@ -52,4 +52,8 @@ OCA\DAV\CalDAV\Activity\Provider\Todo + + + OCA\DAV\Settings\CalDAVSettings + diff --git a/apps/dav/js/settings-admin-caldav.js b/apps/dav/js/settings-admin-caldav.js new file mode 100644 index 0000000000000..10eb89ab61db5 --- /dev/null +++ b/apps/dav/js/settings-admin-caldav.js @@ -0,0 +1,28 @@ +/** + * @copyright 2017, Georg Ehrke + * + * @author Georg Ehrke + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +"use strict"; + +$('#caldavSendInvitations').change(function() { + var val = $(this)[0].checked; + + OCP.AppConfig.setValue('dav', 'sendInvitations', val ? 'yes' : 'no'); +}); diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php new file mode 100644 index 0000000000000..1c85d19432c2c --- /dev/null +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -0,0 +1,68 @@ + + * + * @author Georg Ehrke + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\Settings; + +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IConfig; +use OCP\Settings\ISettings; + +class CalDAVSettings implements ISettings { + + /** @var IConfig */ + private $config; + + /** + * CalDAVSettings constructor. + * + * @param IConfig $config + */ + public function __construct(IConfig $config) { + $this->config = $config; + } + + /** + * @return TemplateResponse + */ + public function getForm() { + $parameters = [ + 'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'), + ]; + + return new TemplateResponse('dav', 'settings-admin-caldav', $parameters); + } + + /** + * @return string + */ + public function getSection() { + return 'additional'; + } + + /** + * @return int + */ + public function getPriority() { + return 20; + } +} diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php new file mode 100644 index 0000000000000..34d3517e8d92c --- /dev/null +++ b/apps/dav/templates/settings-admin-caldav.php @@ -0,0 +1,40 @@ + + * + * @author Georg Ehrke + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +script('dav', [ + 'settings-admin-caldav' +]); + +/** @var \OCP\IL10N $l */ +/** @var array $_ */ +?> +
+

t('CalDAV server')); ?>

+

+ /> + +
+ t('Please make sure to properly setup the email settings above.')); ?> +

+
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php new file mode 100644 index 0000000000000..8ee5810748790 --- /dev/null +++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php @@ -0,0 +1,58 @@ + + * + * @author Georg Ehrke + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\Tests\Unit\DAV\Settings; + +use OCA\DAV\Settings\CalDAVSettings; +use OCP\IConfig; +use Test\TestCase; + +class CalDAVSettingsTest extends TestCase { + + /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + private $config; + + /** @var CalDAVSettings */ + private $settings; + + public function setUp() { + parent::setUp(); + + $this->config = $this->createMock(IConfig::class); + $this->settings = new CalDAVSettings($this->config); + } + + public function testGetForm() { + $result = $this->settings->getForm(); + + $this->assertInstanceOf('OCP\AppFramework\Http\TemplateResponse', $result); + } + + public function testGetSection() { + $this->assertEquals('additional', $this->settings->getSection()); + } + + public function testGetPriority() { + $this->assertEquals(20, $this->settings->getPriority()); + } +} From b958725f78ade3f116001ee6dd66432bffa41748 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 11 Oct 2017 13:14:56 +0200 Subject: [PATCH 2/2] Make it possible to opt out of IMip Plugin for CalDAV Signed-off-by: Georg Ehrke --- apps/dav/appinfo/v1/caldav.php | 7 ++++++- 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 bd9de775f44e3..b10143208ec75 100644 --- 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()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes'; // Root nodes $principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend); @@ -84,7 +85,11 @@ $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 6f3ab3971eff0..bfb67e2e5fe33 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -76,6 +76,7 @@ public function __construct(IRequest $request, $baseUri) { $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 @@ 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 ($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()));