diff options
author | Georg Ehrke <developer@georgehrke.com> | 2019-11-26 12:56:42 +0300 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2019-11-27 16:51:17 +0300 |
commit | fb89bc3931fed4fdddb29eb891e09763a837e13c (patch) | |
tree | 6ec0323f6efacca220eecfc5469324a1bf866fa5 /apps/dav/lib | |
parent | dfe85ae0c2c542178657a0a610ecea9f7cd1cea6 (diff) |
Add refresh-interval to exported calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/dav/lib')
-rw-r--r-- | apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php | 97 | ||||
-rw-r--r-- | apps/dav/lib/Server.php | 2 |
2 files changed, 98 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php b/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php new file mode 100644 index 00000000000..3fe8477a0aa --- /dev/null +++ b/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php @@ -0,0 +1,97 @@ +<?php +/** + * @copyright 2019, Georg Ehrke <oc.list@georgehrke.com> + * + * @author Georg Ehrke <oc.list@georgehrke.com> + * + * @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 <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\CalDAV\ICSExportPlugin; + +use OCP\IConfig; +use OCP\ILogger; +use Sabre\HTTP\ResponseInterface; +use Sabre\VObject\DateTimeParser; +use Sabre\VObject\InvalidDataException; +use Sabre\VObject\Property\ICalendar\Duration; + +/** + * Class ICSExportPlugin + * + * @package OCA\DAV\CalDAV\ICSExportPlugin + */ +class ICSExportPlugin extends \Sabre\CalDAV\ICSExportPlugin { + + /** @var IConfig */ + private $config; + + /** @var ILogger */ + private $logger; + + /** @var string */ + private const DEFAULT_REFRESH_INTERVAL = 'PT4H'; + + /** + * ICSExportPlugin constructor. + * + * @param IConfig $config + */ + public function __construct(IConfig $config, ILogger $logger) { + $this->config = $config; + $this->logger = $logger; + } + + /** + * @inheritDoc + */ + protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) { + if (!isset($properties['{http://nextcloud.com/ns}refresh-interval'])) { + $value = $this->config->getAppValue('dav', 'defaultRefreshIntervalExportedCalendars', self::DEFAULT_REFRESH_INTERVAL); + $properties['{http://nextcloud.com/ns}refresh-interval'] = $value; + } + + return parent::generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response); + } + + /** + * @inheritDoc + */ + public function mergeObjects(array $properties, array $inputObjects) { + $vcalendar = parent::mergeObjects($properties, $inputObjects); + + if (isset($properties['{http://nextcloud.com/ns}refresh-interval'])) { + $refreshIntervalValue = $properties['{http://nextcloud.com/ns}refresh-interval']; + try { + DateTimeParser::parseDuration($refreshIntervalValue); + } catch (InvalidDataException $ex) { + $this->logger->debug('Invalid refresh interval for exported calendar, falling back to default value ...'); + $refreshIntervalValue = self::DEFAULT_REFRESH_INTERVAL; + } + + // https://tools.ietf.org/html/rfc7986#section-5.7 + $refreshInterval = new Duration($vcalendar, 'REFRESH-INTERVAL', $refreshIntervalValue); + $refreshInterval->add('VALUE', 'DURATION'); + $vcalendar->add($refreshInterval); + + // Legacy property for compatibility + $vcalendar->{'X-PUBLISHED-TTL'} = $refreshIntervalValue; + } + + return $vcalendar; + } + +} diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 7dd1cf3a8fa..2e2615283d1 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -149,7 +149,7 @@ class Server { // calendar plugins if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) { $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin()); - $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); + $this->server->addPlugin(new \OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin(\OC::$server->getConfig(), \OC::$server->getLogger())); $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin()); if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') { $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class)); |