nextcloud / server

apps/dav/lib/CalDAV/CalDavBackend.php

Indentation +2558 added lines, -2558 removed lines

@@ -75,2563 +75,2563 @@
  */
 class CalDavBackend extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
 
-	const CALENDAR_TYPE_CALENDAR = 0;
-	const CALENDAR_TYPE_SUBSCRIPTION = 1;
-
-	const PERSONAL_CALENDAR_URI = 'personal';
-	const PERSONAL_CALENDAR_NAME = 'Personal';
-
-	const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
-	const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
-
-	/**
-	 * We need to specify a max date, because we need to stop *somewhere*
-	 *
-	 * On 32 bit system the maximum for a signed integer is 2147483647, so
-	 * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
-	 * in 2038-01-19 to avoid problems when the date is converted
-	 * to a unix timestamp.
-	 */
-	const MAX_DATE = '2038-01-01';
-
-	const ACCESS_PUBLIC = 4;
-	const CLASSIFICATION_PUBLIC = 0;
-	const CLASSIFICATION_PRIVATE = 1;
-	const CLASSIFICATION_CONFIDENTIAL = 2;
-
-	/**
-	 * List of CalDAV properties, and how they map to database field names
-	 * Add your own properties by simply adding on to this array.
-	 *
-	 * Note that only string-based properties are supported here.
-	 *
-	 * @var array
-	 */
-	public $propertyMap = [
-		'{DAV:}displayname'                          => 'displayname',
-		'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-		'{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-		'{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-	];
-
-	/**
-	 * List of subscription properties, and how they map to database field names.
-	 *
-	 * @var array
-	 */
-	public $subscriptionPropertyMap = [
-		'{DAV:}displayname'                                           => 'displayname',
-		'{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
-		'{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
-		'{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
-		'{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
-		'{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
-	];
-
-	/** @var array properties to index */
-	public static $indexProperties = ['CATEGORIES', 'COMMENT', 'DESCRIPTION',
-		'LOCATION', 'RESOURCES', 'STATUS', 'SUMMARY', 'ATTENDEE', 'CONTACT',
-		'ORGANIZER'];
-
-	/** @var array parameters to index */
-	public static $indexParameters = [
-		'ATTENDEE' => ['CN'],
-		'ORGANIZER' => ['CN'],
-	];
-
-	/**
-	 * @var string[] Map of uid => display name
-	 */
-	protected $userDisplayNames;
-
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var Backend */
-	private $calendarSharingBackend;
-
-	/** @var Principal */
-	private $principalBackend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var bool */
-	private $legacyEndpoint;
-
-	/** @var string */
-	private $dbObjectPropertiesTable = 'calendarobjects_props';
-
-	/**
-	 * CalDavBackend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param Principal $principalBackend
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param ISecureRandom $random
-	 * @param ILogger $logger
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param bool $legacyEndpoint
-	 */
-	public function __construct(IDBConnection $db,
-								Principal $principalBackend,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								ISecureRandom $random,
-								ILogger $logger,
-								EventDispatcherInterface $dispatcher,
-								bool $legacyEndpoint = false) {
-		$this->db = $db;
-		$this->principalBackend = $principalBackend;
-		$this->userManager = $userManager;
-		$this->calendarSharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'calendar');
-		$this->random = $random;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-		$this->legacyEndpoint = $legacyEndpoint;
-	}
-
-	/**
-	 * Return the number of calendars for a principal
-	 *
-	 * By default this excludes the automatically generated birthday calendar
-	 *
-	 * @param $principalUri
-	 * @param bool $excludeBirthday
-	 * @return int
-	 */
-	public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*'))
-			->from('calendars')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		if ($excludeBirthday) {
-			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
-		}
-
-		return (int)$query->execute()->fetchColumn();
-	}
-
-	/**
-	 * Returns a list of calendars for a principal.
-	 *
-	 * Every project is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    calendar. This can be the same as the uri or a database key.
-	 *  * uri, which the basename of the uri with which the calendar is
-	 *    accessed.
-	 *  * principaluri. The owner of the calendar. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore it can contain webdav properties in clark notation. A very
-	 * common one is '{DAV:}displayname'.
-	 *
-	 * Many clients also require:
-	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 * For this property, you can just return an instance of
-	 * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-	 *
-	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-	 * ACL will automatically be put in read-only mode.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getCalendarsForUser($principalUri) {
-		$principalUriOriginal = $principalUri;
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->orderBy('calendarorder', 'ASC');
-		$stmt = $query->execute();
-
-		$calendars = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-			];
-
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-
-		$stmt->closeCursor();
-
-		// query for shared calendars
-		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
-		$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
-
-		$principals = array_map(function($principal) {
-			return urldecode($principal);
-		}, $principals);
-		$principals[]= $principalUri;
-
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
-			->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
-			->setParameter('type', 'calendar')
-			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
-			->execute();
-
-		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-		while($row = $result->fetch()) {
-			if ($row['principaluri'] === $principalUri) {
-				continue;
-			}
-
-			$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
-			if (isset($calendars[$row['id']])) {
-				if ($readOnly) {
-					// New share can not have more permissions then the old one.
-					continue;
-				}
-				if (isset($calendars[$row['id']][$readOnlyPropertyName]) &&
-					$calendars[$row['id']][$readOnlyPropertyName] === 0) {
-					// Old share is already read-write, no more permissions can be gained
-					continue;
-				}
-			}
-
-			list(, $name) = Uri\split($row['principaluri']);
-			$uri = $row['uri'] . '_shared_by_' . $name;
-			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $uri,
-				'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				$readOnlyPropertyName => $readOnly,
-			];
-
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			$calendars[$calendar['id']] = $calendar;
-		}
-		$result->closeCursor();
-
-		return array_values($calendars);
-	}
-
-	/**
-	 * @param $principalUri
-	 * @return array
-	 */
-	public function getUsersOwnCalendars($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->orderBy('calendarorder', 'ASC');
-		$stmt = $query->execute();
-		$calendars = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			];
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$stmt->closeCursor();
-		return array_values($calendars);
-	}
-
-
-	/**
-	 * @param $uid
-	 * @return string
-	 */
-	private function getUserDisplayName($uid) {
-		if (!isset($this->userDisplayNames[$uid])) {
-			$user = $this->userManager->get($uid);
-
-			if ($user instanceof IUser) {
-				$this->userDisplayNames[$uid] = $user->getDisplayName();
-			} else {
-				$this->userDisplayNames[$uid] = $uid;
-			}
-		}
-
-		return $this->userDisplayNames[$uid];
-	}
+    const CALENDAR_TYPE_CALENDAR = 0;
+    const CALENDAR_TYPE_SUBSCRIPTION = 1;
+
+    const PERSONAL_CALENDAR_URI = 'personal';
+    const PERSONAL_CALENDAR_NAME = 'Personal';
+
+    const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
+    const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
+
+    /**
+     * We need to specify a max date, because we need to stop *somewhere*
+     *
+     * On 32 bit system the maximum for a signed integer is 2147483647, so
+     * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
+     * in 2038-01-19 to avoid problems when the date is converted
+     * to a unix timestamp.
+     */
+    const MAX_DATE = '2038-01-01';
+
+    const ACCESS_PUBLIC = 4;
+    const CLASSIFICATION_PUBLIC = 0;
+    const CLASSIFICATION_PRIVATE = 1;
+    const CLASSIFICATION_CONFIDENTIAL = 2;
+
+    /**
+     * List of CalDAV properties, and how they map to database field names
+     * Add your own properties by simply adding on to this array.
+     *
+     * Note that only string-based properties are supported here.
+     *
+     * @var array
+     */
+    public $propertyMap = [
+        '{DAV:}displayname'                          => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
+    ];
+
+    /**
+     * List of subscription properties, and how they map to database field names.
+     *
+     * @var array
+     */
+    public $subscriptionPropertyMap = [
+        '{DAV:}displayname'                                           => 'displayname',
+        '{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
+        '{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
+        '{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
+        '{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
+        '{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
+    ];
+
+    /** @var array properties to index */
+    public static $indexProperties = ['CATEGORIES', 'COMMENT', 'DESCRIPTION',
+        'LOCATION', 'RESOURCES', 'STATUS', 'SUMMARY', 'ATTENDEE', 'CONTACT',
+        'ORGANIZER'];
+
+    /** @var array parameters to index */
+    public static $indexParameters = [
+        'ATTENDEE' => ['CN'],
+        'ORGANIZER' => ['CN'],
+    ];
+
+    /**
+     * @var string[] Map of uid => display name
+     */
+    protected $userDisplayNames;
+
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var Backend */
+    private $calendarSharingBackend;
+
+    /** @var Principal */
+    private $principalBackend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var bool */
+    private $legacyEndpoint;
+
+    /** @var string */
+    private $dbObjectPropertiesTable = 'calendarobjects_props';
+
+    /**
+     * CalDavBackend constructor.
+     *
+     * @param IDBConnection $db
+     * @param Principal $principalBackend
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param ISecureRandom $random
+     * @param ILogger $logger
+     * @param EventDispatcherInterface $dispatcher
+     * @param bool $legacyEndpoint
+     */
+    public function __construct(IDBConnection $db,
+                                Principal $principalBackend,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                ISecureRandom $random,
+                                ILogger $logger,
+                                EventDispatcherInterface $dispatcher,
+                                bool $legacyEndpoint = false) {
+        $this->db = $db;
+        $this->principalBackend = $principalBackend;
+        $this->userManager = $userManager;
+        $this->calendarSharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'calendar');
+        $this->random = $random;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+        $this->legacyEndpoint = $legacyEndpoint;
+    }
+
+    /**
+     * Return the number of calendars for a principal
+     *
+     * By default this excludes the automatically generated birthday calendar
+     *
+     * @param $principalUri
+     * @param bool $excludeBirthday
+     * @return int
+     */
+    public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->count('*'))
+            ->from('calendars')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        if ($excludeBirthday) {
+            $query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
+        }
+
+        return (int)$query->execute()->fetchColumn();
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * Many clients also require:
+     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     * For this property, you can just return an instance of
+     * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+     *
+     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+     * ACL will automatically be put in read-only mode.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getCalendarsForUser($principalUri) {
+        $principalUriOriginal = $principalUri;
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->orderBy('calendarorder', 'ASC');
+        $stmt = $query->execute();
+
+        $calendars = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+            ];
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+
+        $stmt->closeCursor();
+
+        // query for shared calendars
+        $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+        $principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
+        $principals = array_map(function($principal) {
+            return urldecode($principal);
+        }, $principals);
+        $principals[]= $principalUri;
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
+            ->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
+            ->setParameter('type', 'calendar')
+            ->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
+            ->execute();
+
+        $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+        while($row = $result->fetch()) {
+            if ($row['principaluri'] === $principalUri) {
+                continue;
+            }
+
+            $readOnly = (int) $row['access'] === Backend::ACCESS_READ;
+            if (isset($calendars[$row['id']])) {
+                if ($readOnly) {
+                    // New share can not have more permissions then the old one.
+                    continue;
+                }
+                if (isset($calendars[$row['id']][$readOnlyPropertyName]) &&
+                    $calendars[$row['id']][$readOnlyPropertyName] === 0) {
+                    // Old share is already read-write, no more permissions can be gained
+                    continue;
+                }
+            }
+
+            list(, $name) = Uri\split($row['principaluri']);
+            $uri = $row['uri'] . '_shared_by_' . $name;
+            $row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $uri,
+                'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                $readOnlyPropertyName => $readOnly,
+            ];
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            $calendars[$calendar['id']] = $calendar;
+        }
+        $result->closeCursor();
+
+        return array_values($calendars);
+    }
+
+    /**
+     * @param $principalUri
+     * @return array
+     */
+    public function getUsersOwnCalendars($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->orderBy('calendarorder', 'ASC');
+        $stmt = $query->execute();
+        $calendars = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+            ];
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $stmt->closeCursor();
+        return array_values($calendars);
+    }
+
+
+    /**
+     * @param $uid
+     * @return string
+     */
+    private function getUserDisplayName($uid) {
+        if (!isset($this->userDisplayNames[$uid])) {
+            $user = $this->userManager->get($uid);
+
+            if ($user instanceof IUser) {
+                $this->userDisplayNames[$uid] = $user->getDisplayName();
+            } else {
+                $this->userDisplayNames[$uid] = $uid;
+            }
+        }
+
+        return $this->userDisplayNames[$uid];
+    }
 	
-	/**
-	 * @return array
-	 */
-	public function getPublicCalendars() {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$fields[] = 's.publicuri';
-		$calendars = [];
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
-			->execute();
-
-		while($row = $result->fetch()) {
-			list(, $name) = Uri\split($row['principaluri']);
-			$row['displayname'] = $row['displayname'] . "($name)";
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['publicuri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
-			];
-
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$result->closeCursor();
-
-		return array_values($calendars);
-	}
-
-	/**
-	 * @param string $uri
-	 * @return array
-	 * @throws NotFound
-	 */
-	public function getPublicCalendar($uri) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$fields[] = 's.publicuri';
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
-			->andWhere($query->expr()->eq('s.publicuri', $query->createNamedParameter($uri)))
-			->execute();
-
-		$row = $result->fetch(\PDO::FETCH_ASSOC);
-
-		$result->closeCursor();
-
-		if ($row === false) {
-			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
-		}
-
-		list(, $name) = Uri\split($row['principaluri']);
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['publicuri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
-		];
-
-		foreach($this->propertyMap as $xmlName=>$dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $uri
-	 * @return array|null
-	 */
-	public function getCalendarByUri($principal, $uri) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
-			->setMaxResults(1);
-		$stmt = $query->execute();
-
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-		];
-
-		foreach($this->propertyMap as $xmlName=>$dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-	}
-
-	/**
-	 * @param $calendarId
-	 * @return array|null
-	 */
-	public function getCalendarById($calendarId) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)))
-			->setMaxResults(1);
-		$stmt = $query->execute();
-
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-		];
-
-		foreach($this->propertyMap as $xmlName=>$dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-	}
-
-	/**
-	 * @param $subscriptionId
-	 */
-	public function getSubscriptionById($subscriptionId) {
-		$fields = array_values($this->subscriptionPropertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'source';
-		$fields[] = 'synctoken';
-		$fields[] = 'principaluri';
-		$fields[] = 'lastmodified';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendarsubscriptions')
-			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-			->orderBy('calendarorder', 'asc');
-		$stmt =$query->execute();
-
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$subscription = [
-			'id'           => $row['id'],
-			'uri'          => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'source'       => $row['source'],
-			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-		];
-
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (!is_null($row[$dbName])) {
-				$subscription[$xmlName] = $row[$dbName];
-			}
-		}
-
-		return $subscription;
-	}
-
-	/**
-	 * Creates a new calendar for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this calendar in other methods, such as updateCalendar.
-	 *
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param array $properties
-	 * @return int
-	 * @suppress SqlInjectionChecker
-	 */
-	function createCalendar($principalUri, $calendarUri, array $properties) {
-		$values = [
-			'principaluri' => $this->convertPrincipal($principalUri, true),
-			'uri'          => $calendarUri,
-			'synctoken'    => 1,
-			'transparent'  => 0,
-			'components'   => 'VEVENT,VTODO',
-			'displayname'  => $calendarUri
-		];
-
-		// Default value
-		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-		if (isset($properties[$sccs])) {
-			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
-			}
-			$values['components'] = implode(',',$properties[$sccs]->getValue());
-		} else if (isset($properties['components'])) {
-			// Allow to provide components internally without having
-			// to create a SupportedCalendarComponentSet object
-			$values['components'] = $properties['components'];
-		}
-
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-		if (isset($properties[$transp])) {
-			$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
-		}
-
-		foreach($this->propertyMap as $xmlName=>$dbName) {
-			if (isset($properties[$xmlName])) {
-				$values[$dbName] = $properties[$xmlName];
-			}
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendars');
-		foreach($values as $column => $value) {
-			$query->setValue($column, $query->createNamedParameter($value));
-		}
-		$query->execute();
-		$calendarId = $query->getLastInsertId();
-
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::createCalendar',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-		]));
-
-		return $calendarId;
-	}
-
-	/**
-	 * Updates properties for a calendar.
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param mixed $calendarId
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	function updateCalendar($calendarId, PropPatch $propPatch) {
-		$supportedProperties = array_keys($this->propertyMap);
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-
-		/**
-		 * @suppress SqlInjectionChecker
-		 */
-		$propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
-			$newValues = [];
-			foreach ($mutations as $propertyName => $propertyValue) {
-
-				switch ($propertyName) {
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
-						$fieldName = 'transparent';
-						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
-						break;
-					default :
-						$fieldName = $this->propertyMap[$propertyName];
-						$newValues[$fieldName] = $propertyValue;
-						break;
-				}
-
-			}
-			$query = $this->db->getQueryBuilder();
-			$query->update('calendars');
-			foreach ($newValues as $fieldName => $value) {
-				$query->set($fieldName, $query->createNamedParameter($value));
-			}
-			$query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-			$query->execute();
-
-			$this->addChange($calendarId, "", 2);
-
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'propertyMutations' => $mutations,
-			]));
-
-			return true;
-		});
-	}
-
-	/**
-	 * Delete a calendar and all it's objects
-	 *
-	 * @param mixed $calendarId
-	 * @return void
-	 */
-	function deleteCalendar($calendarId) {
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'shares' => $this->getShares($calendarId),
-		]));
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
-
-		$this->calendarSharingBackend->deleteAllShares($calendarId);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)))
-			->execute();
-	}
-
-	/**
-	 * Delete all of an user's shares
-	 *
-	 * @param string $principaluri
-	 * @return void
-	 */
-	function deleteAllSharesByUser($principaluri) {
-		$this->calendarSharingBackend->deleteAllSharesByUser($principaluri);
-	}
-
-	/**
-	 * Returns all calendar objects within a calendar.
-	 *
-	 * Every item contains an array with the following keys:
-	 *   * calendardata - The iCalendar-compatible calendar data
-	 *   * uri - a unique key which will be used to construct the uri. This can
-	 *     be any arbitrary string, but making sure it ends with '.ics' is a
-	 *     good idea. This is only the basename, or filename, not the full
-	 *     path.
-	 *   * lastmodified - a timestamp of the last modification time
-	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-	 *   '"abcdef"')
-	 *   * size - The size of the calendar objects, in bytes.
-	 *   * component - optional, a string containing the type of object, such
-	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-	 *     the Content-Type header.
-	 *
-	 * Note that the etag is optional, but it's highly encouraged to return for
-	 * speed reasons.
-	 *
-	 * The calendardata is also optional. If it's not returned
-	 * 'getCalendarObject' will be called later, which *is* expected to return
-	 * calendardata.
-	 *
-	 * If neither etag or size are specified, the calendardata will be
-	 * used/fetched to determine these numbers. If both are specified the
-	 * amount of times this is needed is reduced by a great degree.
-	 *
-	 * @param mixed $id
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getCalendarObjects($id, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-		$stmt = $query->execute();
-
-		$result = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-			$result[] = [
-				'id'           => $row['id'],
-				'uri'          => $row['uri'],
-				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
-				'calendarid'   => $row['calendarid'],
-				'size'         => (int)$row['size'],
-				'component'    => strtolower($row['componenttype']),
-				'classification'=> (int)$row['classification']
-			];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns information from a single calendar object, based on it's object
-	 * uri.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * The returned array must have the same keys as getCalendarObjects. The
-	 * 'calendardata' object is required here though, while it's not required
-	 * for getCalendarObjects.
-	 *
-	 * This method must return null if the object did not exist.
-	 *
-	 * @param mixed $id
-	 * @param string $objectUri
-	 * @param int $calendarType
-	 * @return array|null
-	 */
-	public function getCalendarObject($id, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		return [
-			'id'            => $row['id'],
-			'uri'           => $row['uri'],
-			'lastmodified'  => $row['lastmodified'],
-			'etag'          => '"' . $row['etag'] . '"',
-			'calendarid'    => $row['calendarid'],
-			'size'          => (int)$row['size'],
-			'calendardata'  => $this->readBlob($row['calendardata']),
-			'component'     => strtolower($row['componenttype']),
-			'classification'=> (int)$row['classification']
-		];
-	}
-
-	/**
-	 * Returns a list of calendar objects.
-	 *
-	 * This method should work identical to getCalendarObject, but instead
-	 * return all the calendar objects in the list as an array.
-	 *
-	 * If the backend supports this, it may allow for some speed-ups.
-	 *
-	 * @param mixed $calendarId
-	 * @param string[] $uris
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getMultipleCalendarObjects($id, array $uris, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
-		if (empty($uris)) {
-			return [];
-		}
-
-		$chunks = array_chunk($uris, 100);
-		$objects = [];
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		foreach ($chunks as $uris) {
-			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->execute();
-
-			while ($row = $result->fetch()) {
-				$objects[] = [
-					'id'           => $row['id'],
-					'uri'          => $row['uri'],
-					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
-					'calendarid'   => $row['calendarid'],
-					'size'         => (int)$row['size'],
-					'calendardata' => $this->readBlob($row['calendardata']),
-					'component'    => strtolower($row['componenttype']),
-					'classification' => (int)$row['classification']
-				];
-			}
-			$result->closeCursor();
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * Creates a new calendar object.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * It is possible return an etag from this function, which will be used in
-	 * the response to this PUT request. Note that the ETag must be surrounded
-	 * by double-quotes.
-	 *
-	 * However, you should only really return this ETag if you don't mangle the
-	 * calendar-data. If the result of a subsequent GET to this object is not
-	 * the exact same as this request body, you should omit the ETag.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 * @return string
-	 */
-	function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$q = $this->db->getQueryBuilder();
-		$q->select($q->func()->count('*'))
-			->from('calendarobjects')
-			->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
-			->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])))
-			->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
-
-		$result = $q->execute();
-		$count = (int) $result->fetchColumn();
-		$result->closeCursor();
-
-		if ($count !== 0) {
-			throw new \Sabre\DAV\Exception\BadRequest('Calendar object with uid already exists in this calendar collection.');
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'calendarid' => $query->createNamedParameter($calendarId),
-				'uri' => $query->createNamedParameter($objectUri),
-				'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter($extraData['etag']),
-				'size' => $query->createNamedParameter($extraData['size']),
-				'componenttype' => $query->createNamedParameter($extraData['componentType']),
-				'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
-				'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
-				'classification' => $query->createNamedParameter($extraData['classification']),
-				'uid' => $query->createNamedParameter($extraData['uid']),
-				'calendartype' => $query->createNamedParameter($calendarType),
-			])
-			->execute();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
-
-		if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'objectData' => $this->getCalendarObject($calendarId, $objectUri),
-				]
-			));
-		} else {
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject',
-				[
-					'subscriptionId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'objectData' => $this->getCalendarObject($calendarId, $objectUri),
-				]
-			));
-		}
-		$this->addChange($calendarId, $objectUri, 1, $calendarType);
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * Updates an existing calendarobject, based on it's uri.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * It is possible return an etag from this function, which will be used in
-	 * the response to this PUT request. Note that the ETag must be surrounded
-	 * by double-quotes.
-	 *
-	 * However, you should only really return this ETag if you don't mangle the
-	 * calendar-data. If the result of a subsequent GET to this object is not
-	 * the exact same as this request body, you should omit the ETag.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 * @return string
-	 */
-	function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$extraData = $this->getDenormalizedData($calendarData);
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-				->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
-				->set('etag', $query->createNamedParameter($extraData['etag']))
-				->set('size', $query->createNamedParameter($extraData['size']))
-				->set('componenttype', $query->createNamedParameter($extraData['componentType']))
-				->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
-				->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
-				->set('classification', $query->createNamedParameter($extraData['classification']))
-				->set('uid', $query->createNamedParameter($extraData['uid']))
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
-			->execute();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
-
-		$data = $this->getCalendarObject($calendarId, $objectUri);
-		if (is_array($data)) {
-			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-				$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
-					[
-						'calendarId' => $calendarId,
-						'calendarData' => $this->getCalendarById($calendarId),
-						'shares' => $this->getShares($calendarId),
-						'objectData' => $data,
-					]
-				));
-			} else {
-				$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject',
-					[
-						'subscriptionId' => $calendarId,
-						'calendarData' => $this->getCalendarById($calendarId),
-						'shares' => $this->getShares($calendarId),
-						'objectData' => $data,
-					]
-				));
-			}
-		}
-		$this->addChange($calendarId, $objectUri, 2, $calendarType);
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * @param int $calendarObjectId
-	 * @param int $classification
-	 */
-	public function setClassification($calendarObjectId, $classification) {
-		if (!in_array($classification, [
-			self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
-		])) {
-			throw new \InvalidArgumentException();
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-			->set('classification', $query->createNamedParameter($classification))
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
-			->execute();
-	}
-
-	/**
-	 * Deletes an existing calendar object.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $calendarType
-	 * @return void
-	 */
-	function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
-		if (is_array($data)) {
-			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-				$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
-					[
-						'calendarId' => $calendarId,
-						'calendarData' => $this->getCalendarById($calendarId),
-						'shares' => $this->getShares($calendarId),
-						'objectData' => $data,
-					]
-				));
-			} else {
-				$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject',
-					[
-						'subscriptionId' => $calendarId,
-						'calendarData' => $this->getCalendarById($calendarId),
-						'shares' => $this->getShares($calendarId),
-						'objectData' => $data,
-					]
-				));
-			}
-		}
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, $objectUri, $calendarType]);
-
-		$this->purgeProperties($calendarId, $data['id'], $calendarType);
-
-		$this->addChange($calendarId, $objectUri, 3, $calendarType);
-	}
-
-	/**
-	 * Performs a calendar-query on the contents of this calendar.
-	 *
-	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
-	 * calendar-query it is possible for a client to request a specific set of
-	 * object, based on contents of iCalendar properties, date-ranges and
-	 * iCalendar component types (VTODO, VEVENT).
-	 *
-	 * This method should just return a list of (relative) urls that match this
-	 * query.
-	 *
-	 * The list of filters are specified as an array. The exact array is
-	 * documented by Sabre\CalDAV\CalendarQueryParser.
-	 *
-	 * Note that it is extremely likely that getCalendarObject for every path
-	 * returned from this method will be called almost immediately after. You
-	 * may want to anticipate this to speed up these requests.
-	 *
-	 * This method provides a default implementation, which parses *all* the
-	 * iCalendar objects in the specified calendar.
-	 *
-	 * This default may well be good enough for personal use, and calendars
-	 * that aren't very large. But if you anticipate high usage, big calendars
-	 * or high loads, you are strongly advised to optimize certain paths.
-	 *
-	 * The best way to do so is override this method and to optimize
-	 * specifically for 'common filters'.
-	 *
-	 * Requests that are extremely common are:
-	 *   * requests for just VEVENTS
-	 *   * requests for just VTODO
-	 *   * requests with a time-range-filter on either VEVENT or VTODO.
-	 *
-	 * ..and combinations of these requests. It may not be worth it to try to
-	 * handle every possible situation and just rely on the (relatively
-	 * easy to use) CalendarQueryValidator to handle the rest.
-	 *
-	 * Note that especially time-range-filters may be difficult to parse. A
-	 * time-range filter specified on a VEVENT must for instance also handle
-	 * recurrence rules correctly.
-	 * A good example of how to interprete all these filters can also simply
-	 * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-	 * as possible, so it gives you a good idea on what type of stuff you need
-	 * to think of.
-	 *
-	 * @param mixed $id
-	 * @param array $filters
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function calendarQuery($id, array $filters, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
-		$componentType = null;
-		$requirePostFilter = true;
-		$timeRange = null;
-
-		// if no filters were specified, we don't need to filter after a query
-		if (!$filters['prop-filters'] && !$filters['comp-filters']) {
-			$requirePostFilter = false;
-		}
-
-		// Figuring out if there's a component filter
-		if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
-			$componentType = $filters['comp-filters'][0]['name'];
-
-			// Checking if we need post-filters
-			if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
-				$requirePostFilter = false;
-			}
-			// There was a time-range filter
-			if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
-				$timeRange = $filters['comp-filters'][0]['time-range'];
-
-				// If start time OR the end time is not specified, we can do a
-				// 100% accurate mysql query.
-				if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
-					$requirePostFilter = false;
-				}
-			}
-
-		}
-		$columns = ['uri'];
-		if ($requirePostFilter) {
-			$columns = ['uri', 'calendardata'];
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->select($columns)
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		if ($componentType) {
-			$query->andWhere($query->expr()->eq('componenttype', $query->createNamedParameter($componentType)));
-		}
-
-		if ($timeRange && $timeRange['start']) {
-			$query->andWhere($query->expr()->gt('lastoccurence', $query->createNamedParameter($timeRange['start']->getTimeStamp())));
-		}
-		if ($timeRange && $timeRange['end']) {
-			$query->andWhere($query->expr()->lt('firstoccurence', $query->createNamedParameter($timeRange['end']->getTimeStamp())));
-		}
-
-		$stmt = $query->execute();
-
-		$result = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			if ($requirePostFilter) {
-				// validateFilterForObject will parse the calendar data
-				// catch parsing errors
-				try {
-					$matches = $this->validateFilterForObject($row, $filters);
-				} catch(ParseException $ex) {
-					$this->logger->logException($ex, [
-						'app' => 'dav',
-						'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$id.' uri:'.$row['uri']
-					]);
-					continue;
-				} catch (InvalidDataException $ex) {
-					$this->logger->logException($ex, [
-						'app' => 'dav',
-						'message' => 'Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$id.' uri:'.$row['uri']
-					]);
-					continue;
-				}
-
-				if (!$matches) {
-					continue;
-				}
-			}
-			$result[] = $row['uri'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * custom Nextcloud search extension for CalDAV
-	 *
-	 * TODO - this should optionally cover cached calendar objects as well
-	 *
-	 * @param string $principalUri
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 * @return array
-	 */
-	public function calendarSearch($principalUri, array $filters, $limit=null, $offset=null) {
-		$calendars = $this->getCalendarsForUser($principalUri);
-		$ownCalendars = [];
-		$sharedCalendars = [];
-
-		$uriMapper = [];
-
-		foreach($calendars as $calendar) {
-			if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
-				$ownCalendars[] = $calendar['id'];
-			} else {
-				$sharedCalendars[] = $calendar['id'];
-			}
-			$uriMapper[$calendar['id']] = $calendar['uri'];
-		}
-		if (count($ownCalendars) === 0 && count($sharedCalendars) === 0) {
-			return [];
-		}
-
-		$query = $this->db->getQueryBuilder();
-		// Calendar id expressions
-		$calendarExpressions = [];
-		foreach($ownCalendars as $id) {
-			$calendarExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('c.calendarid',
-					$query->createNamedParameter($id)),
-				$query->expr()->eq('c.calendartype',
-						$query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-		}
-		foreach($sharedCalendars as $id) {
-			$calendarExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('c.calendarid',
-					$query->createNamedParameter($id)),
-				$query->expr()->eq('c.classification',
-					$query->createNamedParameter(self::CLASSIFICATION_PUBLIC)),
-				$query->expr()->eq('c.calendartype',
-					$query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-		}
-
-		if (count($calendarExpressions) === 1) {
-			$calExpr = $calendarExpressions[0];
-		} else {
-			$calExpr = call_user_func_array([$query->expr(), 'orX'], $calendarExpressions);
-		}
-
-		// Component expressions
-		$compExpressions = [];
-		foreach($filters['comps'] as $comp) {
-			$compExpressions[] = $query->expr()
-				->eq('c.componenttype', $query->createNamedParameter($comp));
-		}
-
-		if (count($compExpressions) === 1) {
-			$compExpr = $compExpressions[0];
-		} else {
-			$compExpr = call_user_func_array([$query->expr(), 'orX'], $compExpressions);
-		}
-
-		if (!isset($filters['props'])) {
-			$filters['props'] = [];
-		}
-		if (!isset($filters['params'])) {
-			$filters['params'] = [];
-		}
-
-		$propParamExpressions = [];
-		foreach($filters['props'] as $prop) {
-			$propParamExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('i.name', $query->createNamedParameter($prop)),
-				$query->expr()->isNull('i.parameter')
-			);
-		}
-		foreach($filters['params'] as $param) {
-			$propParamExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
-				$query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
-			);
-		}
-
-		if (count($propParamExpressions) === 1) {
-			$propParamExpr = $propParamExpressions[0];
-		} else {
-			$propParamExpr = call_user_func_array([$query->expr(), 'orX'], $propParamExpressions);
-		}
-
-		$query->select(['c.calendarid', 'c.uri'])
-			->from($this->dbObjectPropertiesTable, 'i')
-			->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
-			->where($calExpr)
-			->andWhere($compExpr)
-			->andWhere($propParamExpr)
-			->andWhere($query->expr()->iLike('i.value',
-				$query->createNamedParameter('%'.$this->db->escapeLikeParameter($filters['search-term']).'%')));
-
-		if ($offset) {
-			$query->setFirstResult($offset);
-		}
-		if ($limit) {
-			$query->setMaxResults($limit);
-		}
-
-		$stmt = $query->execute();
-
-		$result = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
-			if (!in_array($path, $result)) {
-				$result[] = $path;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * used for Nextcloud's calendar API
-	 *
-	 * @param array $calendarInfo
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 *
-	 * @return array
-	 */
-	public function search(array $calendarInfo, $pattern, array $searchProperties,
-						   array $options, $limit, $offset) {
-		$outerQuery = $this->db->getQueryBuilder();
-		$innerQuery = $this->db->getQueryBuilder();
-
-		$innerQuery->selectDistinct('op.objectid')
-			->from($this->dbObjectPropertiesTable, 'op')
-			->andWhere($innerQuery->expr()->eq('op.calendarid',
-				$outerQuery->createNamedParameter($calendarInfo['id'])))
-			->andWhere($innerQuery->expr()->eq('op.calendartype',
-				$outerQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-
-		// only return public items for shared calendars for now
-		if ($calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) {
-			$innerQuery->andWhere($innerQuery->expr()->eq('c.classification',
-				$outerQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
-		}
-
-		$or = $innerQuery->expr()->orX();
-		foreach($searchProperties as $searchProperty) {
-			$or->add($innerQuery->expr()->eq('op.name',
-				$outerQuery->createNamedParameter($searchProperty)));
-		}
-		$innerQuery->andWhere($or);
-
-		if ($pattern !== '') {
-			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
-				$outerQuery->createNamedParameter('%' .
-					$this->db->escapeLikeParameter($pattern) . '%')));
-		}
-
-		$outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
-			->from('calendarobjects', 'c');
-
-		if (isset($options['timerange'])) {
-			if (isset($options['timerange']['start'])) {
-				$outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp)));
-
-			}
-			if (isset($options['timerange']['end'])) {
-				$outerQuery->andWhere($outerQuery->expr()->lt('firstoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp)));
-			}
-		}
-
-		if (isset($options['types'])) {
-			$or = $outerQuery->expr()->orX();
-			foreach($options['types'] as $type) {
-				$or->add($outerQuery->expr()->eq('componenttype',
-					$outerQuery->createNamedParameter($type)));
-			}
-			$outerQuery->andWhere($or);
-		}
-
-		$outerQuery->andWhere($outerQuery->expr()->in('c.id',
-			$outerQuery->createFunction($innerQuery->getSQL())));
-
-		if ($offset) {
-			$outerQuery->setFirstResult($offset);
-		}
-		if ($limit) {
-			$outerQuery->setMaxResults($limit);
-		}
-
-		$result = $outerQuery->execute();
-		$calendarObjects = $result->fetchAll();
-
-		return array_map(function($o) {
-			$calendarData = Reader::read($o['calendardata']);
-			$comps = $calendarData->getComponents();
-			$objects = [];
-			$timezones = [];
-			foreach($comps as $comp) {
-				if ($comp instanceof VTimeZone) {
-					$timezones[] = $comp;
-				} else {
-					$objects[] = $comp;
-				}
-			}
-
-			return [
-				'id' => $o['id'],
-				'type' => $o['componenttype'],
-				'uid' => $o['uid'],
-				'uri' => $o['uri'],
-				'objects' => array_map(function($c) {
-					return $this->transformSearchData($c);
-				}, $objects),
-				'timezones' => array_map(function($c) {
-					return $this->transformSearchData($c);
-				}, $timezones),
-			];
-		}, $calendarObjects);
-	}
-
-	/**
-	 * @param Component $comp
-	 * @return array
-	 */
-	private function transformSearchData(Component $comp) {
-		$data = [];
-		/** @var Component[] $subComponents */
-		$subComponents = $comp->getComponents();
-		/** @var Property[] $properties */
-		$properties = array_filter($comp->children(), function($c) {
-			return $c instanceof Property;
-		});
-		$validationRules = $comp->getValidationRules();
-
-		foreach($subComponents as $subComponent) {
-			$name = $subComponent->name;
-			if (!isset($data[$name])) {
-				$data[$name] = [];
-			}
-			$data[$name][] = $this->transformSearchData($subComponent);
-		}
-
-		foreach($properties as $property) {
-			$name = $property->name;
-			if (!isset($validationRules[$name])) {
-				$validationRules[$name] = '*';
-			}
-
-			$rule = $validationRules[$property->name];
-			if ($rule === '+' || $rule === '*') { // multiple
-				if (!isset($data[$name])) {
-					$data[$name] = [];
-				}
-
-				$data[$name][] = $this->transformSearchProperty($property);
-			} else { // once
-				$data[$name] = $this->transformSearchProperty($property);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @param Property $prop
-	 * @return array
-	 */
-	private function transformSearchProperty(Property $prop) {
-		// No need to check Date, as it extends DateTime
-		if ($prop instanceof Property\ICalendar\DateTime) {
-			$value = $prop->getDateTime();
-		} else {
-			$value = $prop->getValue();
-		}
-
-		return [
-			$value,
-			$prop->parameters()
-		];
-	}
-
-	/**
-	 * Searches through all of a users calendars and calendar objects to find
-	 * an object with a specific UID.
-	 *
-	 * This method should return the path to this object, relative to the
-	 * calendar home, so this path usually only contains two parts:
-	 *
-	 * calendarpath/objectpath.ics
-	 *
-	 * If the uid is not found, return null.
-	 *
-	 * This method should only consider * objects that the principal owns, so
-	 * any calendars owned by other principals that also appear in this
-	 * collection should be ignored.
-	 *
-	 * @param string $principalUri
-	 * @param string $uid
-	 * @return string|null
-	 */
-	function getCalendarObjectByUID($principalUri, $uid) {
-
-		$query = $this->db->getQueryBuilder();
-		$query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
-			->from('calendarobjects', 'co')
-			->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
-			->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
-			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
-
-		$stmt = $query->execute();
-
-		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * The getChanges method returns all the changes that have happened, since
-	 * the specified syncToken in the specified calendar.
-	 *
-	 * This function should return an array, such as the following:
-	 *
-	 * [
-	 *   'syncToken' => 'The current synctoken',
-	 *   'added'   => [
-	 *      'new.txt',
-	 *   ],
-	 *   'modified'   => [
-	 *      'modified.txt',
-	 *   ],
-	 *   'deleted' => [
-	 *      'foo.php.bak',
-	 *      'old.txt'
-	 *   ]
-	 * );
-	 *
-	 * The returned syncToken property should reflect the *current* syncToken
-	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-	 * property This is * needed here too, to ensure the operation is atomic.
-	 *
-	 * If the $syncToken argument is specified as null, this is an initial
-	 * sync, and all members should be reported.
-	 *
-	 * The modified property is an array of nodenames that have changed since
-	 * the last token.
-	 *
-	 * The deleted property is an array with nodenames, that have been deleted
-	 * from collection.
-	 *
-	 * The $syncLevel argument is basically the 'depth' of the report. If it's
-	 * 1, you only have to report changes that happened only directly in
-	 * immediate descendants. If it's 2, it should also include changes from
-	 * the nodes below the child collections. (grandchildren)
-	 *
-	 * The $limit argument allows a client to specify how many results should
-	 * be returned at most. If the limit is not specified, it should be treated
-	 * as infinite.
-	 *
-	 * If the limit (infinite or not) is higher than you're willing to return,
-	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-	 *
-	 * If the syncToken is expired (due to data cleanup) or unknown, you must
-	 * return null.
-	 *
-	 * The limit is 'suggestive'. You are free to ignore it.
-	 *
-	 * @param string $calendarId
-	 * @param string $syncToken
-	 * @param int $syncLevel
-	 * @param int $limit
-	 * @param int $calendarType
-	 * @return array
-	 */
-	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		// Current synctoken
-		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([ $calendarId ]);
-		$currentToken = $stmt->fetchColumn(0);
-
-		if (is_null($currentToken)) {
-			return null;
-		}
-
-		$result = [
-			'syncToken' => $currentToken,
-			'added'     => [],
-			'modified'  => [],
-			'deleted'   => [],
-		];
-
-		if ($syncToken) {
-
-			$query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? AND `calendartype` = ? ORDER BY `synctoken`";
-			if ($limit>0) {
-				$query.= " LIMIT " . (int)$limit;
-			}
-
-			// Fetching all changes
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$syncToken, $currentToken, $calendarId, $calendarType]);
-
-			$changes = [];
-
-			// This loop ensures that any duplicates are overwritten, only the
-			// last change on a node is relevant.
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-				$changes[$row['uri']] = $row['operation'];
-
-			}
-
-			foreach($changes as $uri => $operation) {
-
-				switch($operation) {
-					case 1 :
-						$result['added'][] = $uri;
-						break;
-					case 2 :
-						$result['modified'][] = $uri;
-						break;
-					case 3 :
-						$result['deleted'][] = $uri;
-						break;
-				}
-
-			}
-		} else {
-			// No synctoken supplied, this is the initial sync.
-			$query = "SELECT `uri` FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?";
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$calendarId, $calendarType]);
-
-			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-		}
-		return $result;
-
-	}
-
-	/**
-	 * Returns a list of subscriptions for a principal.
-	 *
-	 * Every subscription is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    subscription. This can be the same as the uri or a database key.
-	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-	 *  * principaluri. The owner of the subscription. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore, all the subscription info must be returned too:
-	 *
-	 * 1. {DAV:}displayname
-	 * 2. {http://apple.com/ns/ical/}refreshrate
-	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-	 *    should not be stripped).
-	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-	 *    should not be stripped).
-	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-	 *    attachments should not be stripped).
-	 * 6. {http://calendarserver.org/ns/}source (Must be a
-	 *     Sabre\DAV\Property\Href).
-	 * 7. {http://apple.com/ns/ical/}calendar-color
-	 * 8. {http://apple.com/ns/ical/}calendar-order
-	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 *    (should just be an instance of
-	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-	 *    default components).
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getSubscriptionsForUser($principalUri) {
-		$fields = array_values($this->subscriptionPropertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'source';
-		$fields[] = 'principaluri';
-		$fields[] = 'lastmodified';
-		$fields[] = 'synctoken';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendarsubscriptions')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->orderBy('calendarorder', 'asc');
-		$stmt =$query->execute();
-
-		$subscriptions = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-			$subscription = [
-				'id'           => $row['id'],
-				'uri'          => $row['uri'],
-				'principaluri' => $row['principaluri'],
-				'source'       => $row['source'],
-				'lastmodified' => $row['lastmodified'],
-
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			];
-
-			foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-				if (!is_null($row[$dbName])) {
-					$subscription[$xmlName] = $row[$dbName];
-				}
-			}
-
-			$subscriptions[] = $subscription;
-
-		}
-
-		return $subscriptions;
-	}
-
-	/**
-	 * Creates a new subscription for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this subscription in other methods, such as updateSubscription.
-	 *
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @param array $properties
-	 * @return mixed
-	 */
-	function createSubscription($principalUri, $uri, array $properties) {
-
-		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
-			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
-		}
-
-		$values = [
-			'principaluri' => $principalUri,
-			'uri'          => $uri,
-			'source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
-			'lastmodified' => time(),
-		];
-
-		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
-
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (array_key_exists($xmlName, $properties)) {
-					$values[$dbName] = $properties[$xmlName];
-					if (in_array($dbName, $propertiesBoolean)) {
-						$values[$dbName] = true;
-				}
-			}
-		}
-
-		$valuesToInsert = array();
-
-		$query = $this->db->getQueryBuilder();
-
-		foreach (array_keys($values) as $name) {
-			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
-		}
-
-		$query->insert('calendarsubscriptions')
-			->values($valuesToInsert)
-			->execute();
-
-		$subscriptionId = $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
-
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			[
-				'subscriptionId' => $subscriptionId,
-				'subscriptionData' => $this->getSubscriptionById($subscriptionId),
-			]));
-
-		return $subscriptionId;
-	}
-
-	/**
-	 * Updates a subscription
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param mixed $subscriptionId
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	function updateSubscription($subscriptionId, PropPatch $propPatch) {
-		$supportedProperties = array_keys($this->subscriptionPropertyMap);
-		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
-
-		/**
-		 * @suppress SqlInjectionChecker
-		 */
-		$propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
-
-			$newValues = [];
-
-			foreach($mutations as $propertyName=>$propertyValue) {
-				if ($propertyName === '{http://calendarserver.org/ns/}source') {
-					$newValues['source'] = $propertyValue->getHref();
-				} else {
-					$fieldName = $this->subscriptionPropertyMap[$propertyName];
-					$newValues[$fieldName] = $propertyValue;
-				}
-			}
-
-			$query = $this->db->getQueryBuilder();
-			$query->update('calendarsubscriptions')
-				->set('lastmodified', $query->createNamedParameter(time()));
-			foreach($newValues as $fieldName=>$value) {
-				$query->set($fieldName, $query->createNamedParameter($value));
-			}
-			$query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-				->execute();
-
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateSubscription', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateSubscription',
-				[
-					'subscriptionId' => $subscriptionId,
-					'subscriptionData' => $this->getSubscriptionById($subscriptionId),
-					'propertyMutations' => $mutations,
-				]));
-
-			return true;
-
-		});
-	}
-
-	/**
-	 * Deletes a subscription.
-	 *
-	 * @param mixed $subscriptionId
-	 * @return void
-	 */
-	function deleteSubscription($subscriptionId) {
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			[
-				'subscriptionId' => $subscriptionId,
-				'subscriptionData' => $this->getSubscriptionById($subscriptionId),
-			]));
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarsubscriptions')
-			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-			->execute();
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-
-		$query->delete('calendarchanges')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-	}
-
-	/**
-	 * Returns a single scheduling object for the inbox collection.
-	 *
-	 * The returned array should contain the following elements:
-	 *   * uri - A unique basename for the object. This will be used to
-	 *           construct a full uri.
-	 *   * calendardata - The iCalendar object
-	 *   * lastmodified - The last modification date. Can be an int for a unix
-	 *                    timestamp, or a PHP DateTime object.
-	 *   * etag - A unique token that must change if the object changed.
-	 *   * size - The size of the object, in bytes.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return array
-	 */
-	function getSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-			->from('schedulingobjects')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->execute();
-
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		return [
-				'uri'          => $row['uri'],
-				'calendardata' => $row['calendardata'],
-				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
-				'size'         => (int)$row['size'],
-		];
-	}
-
-	/**
-	 * Returns all scheduling objects for the inbox collection.
-	 *
-	 * These objects should be returned as an array. Every item in the array
-	 * should follow the same structure as returned from getSchedulingObject.
-	 *
-	 * The main difference is that 'calendardata' is optional.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getSchedulingObjects($principalUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-				->from('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->execute();
-
-		$result = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-			$result[] = [
-					'calendardata' => $row['calendardata'],
-					'uri'          => $row['uri'],
-					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
-					'size'         => (int)$row['size'],
-			];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Deletes a scheduling object from the inbox collection.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return void
-	 */
-	function deleteSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-				->execute();
-	}
-
-	/**
-	 * Creates a new scheduling object. This should land in a users' inbox.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @param string $objectData
-	 * @return void
-	 */
-	function createSchedulingObject($principalUri, $objectUri, $objectData) {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('schedulingobjects')
-			->values([
-				'principaluri' => $query->createNamedParameter($principalUri),
-				'calendardata' => $query->createNamedParameter($objectData, IQueryBuilder::PARAM_LOB),
-				'uri' => $query->createNamedParameter($objectUri),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter(md5($objectData)),
-				'size' => $query->createNamedParameter(strlen($objectData))
-			])
-			->execute();
-	}
-
-	/**
-	 * Adds a change record to the calendarchanges table.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $operation 1 = add, 2 = modify, 3 = delete.
-	 * @param int $calendarType
-	 * @return void
-	 */
-	protected function addChange($calendarId, $objectUri, $operation, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select('synctoken')
-			->from($table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-		$syncToken = (int)$query->execute()->fetchColumn();
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarchanges')
-			->values([
-				'uri' => $query->createNamedParameter($objectUri),
-				'synctoken' => $query->createNamedParameter($syncToken),
-				'calendarid' => $query->createNamedParameter($calendarId),
-				'operation' => $query->createNamedParameter($operation),
-				'calendartype' => $query->createNamedParameter($calendarType),
-			])
-			->execute();
-
-		$stmt = $this->db->prepare("UPDATE `*PREFIX*$table` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?");
-		$stmt->execute([
-			$calendarId
-		]);
-
-	}
-
-	/**
-	 * Parses some information from calendar objects, used for optimized
-	 * calendar-queries.
-	 *
-	 * Returns an array with the following keys:
-	 *   * etag - An md5 checksum of the object without the quotes.
-	 *   * size - Size of the object in bytes
-	 *   * componentType - VEVENT, VTODO or VJOURNAL
-	 *   * firstOccurence
-	 *   * lastOccurence
-	 *   * uid - value of the UID property
-	 *
-	 * @param string $calendarData
-	 * @return array
-	 */
-	public function getDenormalizedData($calendarData) {
-
-		$vObject = Reader::read($calendarData);
-		$componentType = null;
-		$component = null;
-		$firstOccurrence = null;
-		$lastOccurrence = null;
-		$uid = null;
-		$classification = self::CLASSIFICATION_PUBLIC;
-		foreach($vObject->getComponents() as $component) {
-			if ($component->name!=='VTIMEZONE') {
-				$componentType = $component->name;
-				$uid = (string)$component->UID;
-				break;
-			}
-		}
-		if (!$componentType) {
-			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-		}
-		if ($componentType === 'VEVENT' && $component->DTSTART) {
-			$firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
-			// Finding the last occurrence is a bit harder
-			if (!isset($component->RRULE)) {
-				if (isset($component->DTEND)) {
-					$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
-				} elseif (isset($component->DURATION)) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-					$lastOccurrence = $endDate->getTimeStamp();
-				} elseif (!$component->DTSTART->hasTime()) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->modify('+1 day');
-					$lastOccurrence = $endDate->getTimeStamp();
-				} else {
-					$lastOccurrence = $firstOccurrence;
-				}
-			} else {
-				$it = new EventIterator($vObject, (string)$component->UID);
-				$maxDate = new \DateTime(self::MAX_DATE);
-				if ($it->isInfinite()) {
-					$lastOccurrence = $maxDate->getTimestamp();
-				} else {
-					$end = $it->getDtEnd();
-					while($it->valid() && $end < $maxDate) {
-						$end = $it->getDtEnd();
-						$it->next();
-
-					}
-					$lastOccurrence = $end->getTimestamp();
-				}
-
-			}
-		}
-
-		if ($component->CLASS) {
-			$classification = CalDavBackend::CLASSIFICATION_PRIVATE;
-			switch ($component->CLASS->getValue()) {
-				case 'PUBLIC':
-					$classification = CalDavBackend::CLASSIFICATION_PUBLIC;
-					break;
-				case 'CONFIDENTIAL':
-					$classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
-					break;
-			}
-		}
-		return [
-			'etag' => md5($calendarData),
-			'size' => strlen($calendarData),
-			'componentType' => $componentType,
-			'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
-			'lastOccurence'  => $lastOccurrence,
-			'uid' => $uid,
-			'classification' => $classification
-		];
-
-	}
-
-	/**
-	 * @param $cardData
-	 * @return bool|string
-	 */
-	private function readBlob($cardData) {
-		if (is_resource($cardData)) {
-			return stream_get_contents($cardData);
-		}
-
-		return $cardData;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function updateShares($shareable, $add, $remove) {
-		$calendarId = $shareable->getResourceId();
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::updateShares',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'shares' => $this->getShares($calendarId),
-				'add' => $add,
-				'remove' => $remove,
-			]));
-		$this->calendarSharingBackend->updateShares($shareable, $add, $remove);
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getShares($resourceId, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		return $this->calendarSharingBackend->getShares($resourceId);
-	}
-
-	/**
-	 * @param boolean $value
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return string|null
-	 */
-	public function setPublishStatus($value, $calendar) {
-
-		$calendarId = $calendar->getResourceId();
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::updateShares',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'public' => $value,
-			]));
-
-		$query = $this->db->getQueryBuilder();
-		if ($value) {
-			$publicUri = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
-			$query->insert('dav_shares')
-				->values([
-					'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
-					'type' => $query->createNamedParameter('calendar'),
-					'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
-					'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
-					'publicuri' => $query->createNamedParameter($publicUri)
-				]);
-			$query->execute();
-			return $publicUri;
-		}
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
-		$query->execute();
-		return null;
-	}
-
-	/**
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return mixed
-	 */
-	public function getPublishStatus($calendar) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select('publicuri')
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->execute();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		return $row ? reset($row) : false;
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		return $this->calendarSharingBackend->applyShareAcl($resourceId, $acl);
-	}
-
-
-
-	/**
-	 * update properties table
-	 *
-	 * @param int $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 */
-	public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
-
-		try {
-			$vCalendar = $this->readCalendarData($calendarData);
-		} catch (\Exception $ex) {
-			return;
-		}
-
-		$this->purgeProperties($calendarId, $objectId);
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert($this->dbObjectPropertiesTable)
-			->values(
-				[
-					'calendarid' => $query->createNamedParameter($calendarId),
-					'calendartype' => $query->createNamedParameter($calendarType),
-					'objectid' => $query->createNamedParameter($objectId),
-					'name' => $query->createParameter('name'),
-					'parameter' => $query->createParameter('parameter'),
-					'value' => $query->createParameter('value'),
-				]
-			);
-
-		$indexComponents = ['VEVENT', 'VJOURNAL', 'VTODO'];
-		foreach ($vCalendar->getComponents() as $component) {
-			if (!in_array($component->name, $indexComponents)) {
-				continue;
-			}
-
-			foreach ($component->children() as $property) {
-				if (in_array($property->name, self::$indexProperties)) {
-					$value = $property->getValue();
-					// is this a shitty db?
-					if (!$this->db->supports4ByteText()) {
-						$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
-					}
-					$value = mb_substr($value, 0, 254);
-
-					$query->setParameter('name', $property->name);
-					$query->setParameter('parameter', null);
-					$query->setParameter('value', $value);
-					$query->execute();
-				}
-
-				if (array_key_exists($property->name, self::$indexParameters)) {
-					$parameters = $property->parameters();
-					$indexedParametersForProperty = self::$indexParameters[$property->name];
-
-					foreach ($parameters as $key => $value) {
-						if (in_array($key, $indexedParametersForProperty)) {
-							// is this a shitty db?
-							if ($this->db->supports4ByteText()) {
-								$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
-							}
-							$value = mb_substr($value, 0, 254);
-
-							$query->setParameter('name', $property->name);
-							$query->setParameter('parameter', substr($key, 0, 254));
-							$query->setParameter('value', substr($value, 0, 254));
-							$query->execute();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * deletes all birthday calendars
-	 */
-	public function deleteAllBirthdayCalendars() {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id'])->from('calendars')
-			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
-			->execute();
-
-		$ids = $result->fetchAll();
-		foreach($ids as $id) {
-			$this->deleteCalendar($id['id']);
-		}
-	}
-
-	/**
-	 * @param $subscriptionId
-	 */
-	public function purgeAllCachedEventsForSubscription($subscriptionId) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('uri')
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
-		$stmt = $query->execute();
-
-		$uris = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-			$uris[] = $row['uri'];
-		}
-		$stmt->closeCursor();
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-
-		$query->delete('calendarchanges')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->execute();
-
-		foreach($uris as $uri) {
-			$this->addChange($subscriptionId, $uri, 3, self::CALENDAR_TYPE_SUBSCRIPTION);
-		}
-	}
-
-	/**
-	 * Move a calendar from one user to another
-	 *
-	 * @param string $uriName
-	 * @param string $uriOrigin
-	 * @param string $uriDestination
-	 */
-	public function moveCalendar($uriName, $uriOrigin, $uriDestination)
-	{
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendars')
-			->set('principaluri', $query->createNamedParameter($uriDestination))
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($uriOrigin)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($uriName)))
-			->execute();
-	}
-
-	/**
-	 * read VCalendar data into a VCalendar object
-	 *
-	 * @param string $objectData
-	 * @return VCalendar
-	 */
-	protected function readCalendarData($objectData) {
-		return Reader::read($objectData);
-	}
-
-	/**
-	 * delete all properties from a given calendar object
-	 *
-	 * @param int $calendarId
-	 * @param int $objectId
-	 */
-	protected function purgeProperties($calendarId, $objectId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('objectid', $query->createNamedParameter($objectId)))
-			->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
-		$query->execute();
-	}
-
-	/**
-	 * get ID from a given calendar object
-	 *
-	 * @param int $calendarId
-	 * @param string $uri
-	 * @param int $calendarType
-	 * @return int
-	 */
-	protected function getCalendarObjectId($calendarId, $uri, $calendarType):int {
-		$query = $this->db->getQueryBuilder();
-		$query->select('id')
-			->from('calendarobjects')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		$result = $query->execute();
-		$objectIds = $result->fetch();
-		$result->closeCursor();
-
-		if (!isset($objectIds['id'])) {
-			throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
-		}
-
-		return (int)$objectIds['id'];
-	}
-
-	/**
-	 * return legacy endpoint principal name to new principal name
-	 *
-	 * @param $principalUri
-	 * @param $toV2
-	 * @return string
-	 */
-	private function convertPrincipal($principalUri, $toV2) {
-		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			list(, $name) = Uri\split($principalUri);
-			if ($toV2 === true) {
-				return "principals/users/$name";
-			}
-			return "principals/$name";
-		}
-		return $principalUri;
-	}
-
-	/**
-	 * adds information about an owner to the calendar data
-	 *
-	 * @param $calendarInfo
-	 */
-	private function addOwnerPrincipal(&$calendarInfo) {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
-		if (isset($calendarInfo[$ownerPrincipalKey])) {
-			$uri = $calendarInfo[$ownerPrincipalKey];
-		} else {
-			$uri = $calendarInfo['principaluri'];
-		}
-
-		$principalInformation = $this->principalBackend->getPrincipalByPath($uri);
-		if (isset($principalInformation['{DAV:}displayname'])) {
-			$calendarInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
-		}
-	}
+    /**
+     * @return array
+     */
+    public function getPublicCalendars() {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $fields[] = 's.publicuri';
+        $calendars = [];
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
+            ->execute();
+
+        while($row = $result->fetch()) {
+            list(, $name) = Uri\split($row['principaluri']);
+            $row['displayname'] = $row['displayname'] . "($name)";
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['publicuri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+            ];
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $result->closeCursor();
+
+        return array_values($calendars);
+    }
+
+    /**
+     * @param string $uri
+     * @return array
+     * @throws NotFound
+     */
+    public function getPublicCalendar($uri) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $fields[] = 's.publicuri';
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
+            ->andWhere($query->expr()->eq('s.publicuri', $query->createNamedParameter($uri)))
+            ->execute();
+
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+
+        $result->closeCursor();
+
+        if ($row === false) {
+            throw new NotFound('Node with name \'' . $uri . '\' could not be found');
+        }
+
+        list(, $name) = Uri\split($row['principaluri']);
+        $row['displayname'] = $row['displayname'] . ' ' . "($name)";
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['publicuri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+        ];
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+
+    }
+
+    /**
+     * @param string $principal
+     * @param string $uri
+     * @return array|null
+     */
+    public function getCalendarByUri($principal, $uri) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
+            ->setMaxResults(1);
+        $stmt = $query->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+        ];
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+    }
+
+    /**
+     * @param $calendarId
+     * @return array|null
+     */
+    public function getCalendarById($calendarId) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)))
+            ->setMaxResults(1);
+        $stmt = $query->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+        ];
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+    }
+
+    /**
+     * @param $subscriptionId
+     */
+    public function getSubscriptionById($subscriptionId) {
+        $fields = array_values($this->subscriptionPropertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'source';
+        $fields[] = 'synctoken';
+        $fields[] = 'principaluri';
+        $fields[] = 'lastmodified';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendarsubscriptions')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+            ->orderBy('calendarorder', 'asc');
+        $stmt =$query->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $subscription = [
+            'id'           => $row['id'],
+            'uri'          => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            'source'       => $row['source'],
+            'lastmodified' => $row['lastmodified'],
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+        ];
+
+        foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+            if (!is_null($row[$dbName])) {
+                $subscription[$xmlName] = $row[$dbName];
+            }
+        }
+
+        return $subscription;
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return int
+     * @suppress SqlInjectionChecker
+     */
+    function createCalendar($principalUri, $calendarUri, array $properties) {
+        $values = [
+            'principaluri' => $this->convertPrincipal($principalUri, true),
+            'uri'          => $calendarUri,
+            'synctoken'    => 1,
+            'transparent'  => 0,
+            'components'   => 'VEVENT,VTODO',
+            'displayname'  => $calendarUri
+        ];
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        if (isset($properties[$sccs])) {
+            if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
+                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+            }
+            $values['components'] = implode(',',$properties[$sccs]->getValue());
+        } else if (isset($properties['components'])) {
+            // Allow to provide components internally without having
+            // to create a SupportedCalendarComponentSet object
+            $values['components'] = $properties['components'];
+        }
+
+        $transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+        if (isset($properties[$transp])) {
+            $values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
+        }
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            if (isset($properties[$xmlName])) {
+                $values[$dbName] = $properties[$xmlName];
+            }
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendars');
+        foreach($values as $column => $value) {
+            $query->setValue($column, $query->createNamedParameter($value));
+        }
+        $query->execute();
+        $calendarId = $query->getLastInsertId();
+
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::createCalendar',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+        ]));
+
+        return $calendarId;
+    }
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param mixed $calendarId
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    function updateCalendar($calendarId, PropPatch $propPatch) {
+        $supportedProperties = array_keys($this->propertyMap);
+        $supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+
+        /**
+         * @suppress SqlInjectionChecker
+         */
+        $propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
+            $newValues = [];
+            foreach ($mutations as $propertyName => $propertyValue) {
+
+                switch ($propertyName) {
+                    case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
+                        $fieldName = 'transparent';
+                        $newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
+                        break;
+                    default :
+                        $fieldName = $this->propertyMap[$propertyName];
+                        $newValues[$fieldName] = $propertyValue;
+                        break;
+                }
+
+            }
+            $query = $this->db->getQueryBuilder();
+            $query->update('calendars');
+            foreach ($newValues as $fieldName => $value) {
+                $query->set($fieldName, $query->createNamedParameter($value));
+            }
+            $query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
+            $query->execute();
+
+            $this->addChange($calendarId, "", 2);
+
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'propertyMutations' => $mutations,
+            ]));
+
+            return true;
+        });
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param mixed $calendarId
+     * @return void
+     */
+    function deleteCalendar($calendarId) {
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'shares' => $this->getShares($calendarId),
+        ]));
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
+
+        $this->calendarSharingBackend->deleteAllShares($calendarId);
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)))
+            ->execute();
+    }
+
+    /**
+     * Delete all of an user's shares
+     *
+     * @param string $principaluri
+     * @return void
+     */
+    function deleteAllSharesByUser($principaluri) {
+        $this->calendarSharingBackend->deleteAllSharesByUser($principaluri);
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can
+     *     be any arbitrary string, but making sure it ends with '.ics' is a
+     *     good idea. This is only the basename, or filename, not the full
+     *     path.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '"abcdef"')
+     *   * size - The size of the calendar objects, in bytes.
+     *   * component - optional, a string containing the type of object, such
+     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+     *     the Content-Type header.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param mixed $id
+     * @param int $calendarType
+     * @return array
+     */
+    public function getCalendarObjects($id, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+        $stmt = $query->execute();
+
+        $result = [];
+        foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $result[] = [
+                'id'           => $row['id'],
+                'uri'          => $row['uri'],
+                'lastmodified' => $row['lastmodified'],
+                'etag'         => '"' . $row['etag'] . '"',
+                'calendarid'   => $row['calendarid'],
+                'size'         => (int)$row['size'],
+                'component'    => strtolower($row['componenttype']),
+                'classification'=> (int)$row['classification']
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * This method must return null if the object did not exist.
+     *
+     * @param mixed $id
+     * @param string $objectUri
+     * @param int $calendarType
+     * @return array|null
+     */
+    public function getCalendarObject($id, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        return [
+            'id'            => $row['id'],
+            'uri'           => $row['uri'],
+            'lastmodified'  => $row['lastmodified'],
+            'etag'          => '"' . $row['etag'] . '"',
+            'calendarid'    => $row['calendarid'],
+            'size'          => (int)$row['size'],
+            'calendardata'  => $this->readBlob($row['calendardata']),
+            'component'     => strtolower($row['componenttype']),
+            'classification'=> (int)$row['classification']
+        ];
+    }
+
+    /**
+     * Returns a list of calendar objects.
+     *
+     * This method should work identical to getCalendarObject, but instead
+     * return all the calendar objects in the list as an array.
+     *
+     * If the backend supports this, it may allow for some speed-ups.
+     *
+     * @param mixed $calendarId
+     * @param string[] $uris
+     * @param int $calendarType
+     * @return array
+     */
+    public function getMultipleCalendarObjects($id, array $uris, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+        if (empty($uris)) {
+            return [];
+        }
+
+        $chunks = array_chunk($uris, 100);
+        $objects = [];
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        foreach ($chunks as $uris) {
+            $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->execute();
+
+            while ($row = $result->fetch()) {
+                $objects[] = [
+                    'id'           => $row['id'],
+                    'uri'          => $row['uri'],
+                    'lastmodified' => $row['lastmodified'],
+                    'etag'         => '"' . $row['etag'] . '"',
+                    'calendarid'   => $row['calendarid'],
+                    'size'         => (int)$row['size'],
+                    'calendardata' => $this->readBlob($row['calendardata']),
+                    'component'    => strtolower($row['componenttype']),
+                    'classification' => (int)$row['classification']
+                ];
+            }
+            $result->closeCursor();
+        }
+
+        return $objects;
+    }
+
+    /**
+     * Creates a new calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     * @return string
+     */
+    function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $q = $this->db->getQueryBuilder();
+        $q->select($q->func()->count('*'))
+            ->from('calendarobjects')
+            ->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
+            ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])))
+            ->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
+
+        $result = $q->execute();
+        $count = (int) $result->fetchColumn();
+        $result->closeCursor();
+
+        if ($count !== 0) {
+            throw new \Sabre\DAV\Exception\BadRequest('Calendar object with uid already exists in this calendar collection.');
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'calendarid' => $query->createNamedParameter($calendarId),
+                'uri' => $query->createNamedParameter($objectUri),
+                'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter($extraData['etag']),
+                'size' => $query->createNamedParameter($extraData['size']),
+                'componenttype' => $query->createNamedParameter($extraData['componentType']),
+                'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
+                'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
+                'classification' => $query->createNamedParameter($extraData['classification']),
+                'uid' => $query->createNamedParameter($extraData['uid']),
+                'calendartype' => $query->createNamedParameter($calendarType),
+            ])
+            ->execute();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
+
+        if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'objectData' => $this->getCalendarObject($calendarId, $objectUri),
+                ]
+            ));
+        } else {
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject',
+                [
+                    'subscriptionId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'objectData' => $this->getCalendarObject($calendarId, $objectUri),
+                ]
+            ));
+        }
+        $this->addChange($calendarId, $objectUri, 1, $calendarType);
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     * @return string
+     */
+    function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $extraData = $this->getDenormalizedData($calendarData);
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+                ->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
+                ->set('lastmodified', $query->createNamedParameter(time()))
+                ->set('etag', $query->createNamedParameter($extraData['etag']))
+                ->set('size', $query->createNamedParameter($extraData['size']))
+                ->set('componenttype', $query->createNamedParameter($extraData['componentType']))
+                ->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
+                ->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
+                ->set('classification', $query->createNamedParameter($extraData['classification']))
+                ->set('uid', $query->createNamedParameter($extraData['uid']))
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
+            ->execute();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
+
+        $data = $this->getCalendarObject($calendarId, $objectUri);
+        if (is_array($data)) {
+            if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+                $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
+                    [
+                        'calendarId' => $calendarId,
+                        'calendarData' => $this->getCalendarById($calendarId),
+                        'shares' => $this->getShares($calendarId),
+                        'objectData' => $data,
+                    ]
+                ));
+            } else {
+                $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject',
+                    [
+                        'subscriptionId' => $calendarId,
+                        'calendarData' => $this->getCalendarById($calendarId),
+                        'shares' => $this->getShares($calendarId),
+                        'objectData' => $data,
+                    ]
+                ));
+            }
+        }
+        $this->addChange($calendarId, $objectUri, 2, $calendarType);
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * @param int $calendarObjectId
+     * @param int $classification
+     */
+    public function setClassification($calendarObjectId, $classification) {
+        if (!in_array($classification, [
+            self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
+        ])) {
+            throw new \InvalidArgumentException();
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+            ->set('classification', $query->createNamedParameter($classification))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
+            ->execute();
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $calendarType
+     * @return void
+     */
+    function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
+        if (is_array($data)) {
+            if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+                $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
+                    [
+                        'calendarId' => $calendarId,
+                        'calendarData' => $this->getCalendarById($calendarId),
+                        'shares' => $this->getShares($calendarId),
+                        'objectData' => $data,
+                    ]
+                ));
+            } else {
+                $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject',
+                    [
+                        'subscriptionId' => $calendarId,
+                        'calendarData' => $this->getCalendarById($calendarId),
+                        'shares' => $this->getShares($calendarId),
+                        'objectData' => $data,
+                    ]
+                ));
+            }
+        }
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, $objectUri, $calendarType]);
+
+        $this->purgeProperties($calendarId, $data['id'], $calendarType);
+
+        $this->addChange($calendarId, $objectUri, 3, $calendarType);
+    }
+
+    /**
+     * Performs a calendar-query on the contents of this calendar.
+     *
+     * The calendar-query is defined in RFC4791 : CalDAV. Using the
+     * calendar-query it is possible for a client to request a specific set of
+     * object, based on contents of iCalendar properties, date-ranges and
+     * iCalendar component types (VTODO, VEVENT).
+     *
+     * This method should just return a list of (relative) urls that match this
+     * query.
+     *
+     * The list of filters are specified as an array. The exact array is
+     * documented by Sabre\CalDAV\CalendarQueryParser.
+     *
+     * Note that it is extremely likely that getCalendarObject for every path
+     * returned from this method will be called almost immediately after. You
+     * may want to anticipate this to speed up these requests.
+     *
+     * This method provides a default implementation, which parses *all* the
+     * iCalendar objects in the specified calendar.
+     *
+     * This default may well be good enough for personal use, and calendars
+     * that aren't very large. But if you anticipate high usage, big calendars
+     * or high loads, you are strongly advised to optimize certain paths.
+     *
+     * The best way to do so is override this method and to optimize
+     * specifically for 'common filters'.
+     *
+     * Requests that are extremely common are:
+     *   * requests for just VEVENTS
+     *   * requests for just VTODO
+     *   * requests with a time-range-filter on either VEVENT or VTODO.
+     *
+     * ..and combinations of these requests. It may not be worth it to try to
+     * handle every possible situation and just rely on the (relatively
+     * easy to use) CalendarQueryValidator to handle the rest.
+     *
+     * Note that especially time-range-filters may be difficult to parse. A
+     * time-range filter specified on a VEVENT must for instance also handle
+     * recurrence rules correctly.
+     * A good example of how to interprete all these filters can also simply
+     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * as possible, so it gives you a good idea on what type of stuff you need
+     * to think of.
+     *
+     * @param mixed $id
+     * @param array $filters
+     * @param int $calendarType
+     * @return array
+     */
+    public function calendarQuery($id, array $filters, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+        $componentType = null;
+        $requirePostFilter = true;
+        $timeRange = null;
+
+        // if no filters were specified, we don't need to filter after a query
+        if (!$filters['prop-filters'] && !$filters['comp-filters']) {
+            $requirePostFilter = false;
+        }
+
+        // Figuring out if there's a component filter
+        if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
+            $componentType = $filters['comp-filters'][0]['name'];
+
+            // Checking if we need post-filters
+            if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
+                $requirePostFilter = false;
+            }
+            // There was a time-range filter
+            if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
+                $timeRange = $filters['comp-filters'][0]['time-range'];
+
+                // If start time OR the end time is not specified, we can do a
+                // 100% accurate mysql query.
+                if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
+                    $requirePostFilter = false;
+                }
+            }
+
+        }
+        $columns = ['uri'];
+        if ($requirePostFilter) {
+            $columns = ['uri', 'calendardata'];
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->select($columns)
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        if ($componentType) {
+            $query->andWhere($query->expr()->eq('componenttype', $query->createNamedParameter($componentType)));
+        }
+
+        if ($timeRange && $timeRange['start']) {
+            $query->andWhere($query->expr()->gt('lastoccurence', $query->createNamedParameter($timeRange['start']->getTimeStamp())));
+        }
+        if ($timeRange && $timeRange['end']) {
+            $query->andWhere($query->expr()->lt('firstoccurence', $query->createNamedParameter($timeRange['end']->getTimeStamp())));
+        }
+
+        $stmt = $query->execute();
+
+        $result = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            if ($requirePostFilter) {
+                // validateFilterForObject will parse the calendar data
+                // catch parsing errors
+                try {
+                    $matches = $this->validateFilterForObject($row, $filters);
+                } catch(ParseException $ex) {
+                    $this->logger->logException($ex, [
+                        'app' => 'dav',
+                        'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$id.' uri:'.$row['uri']
+                    ]);
+                    continue;
+                } catch (InvalidDataException $ex) {
+                    $this->logger->logException($ex, [
+                        'app' => 'dav',
+                        'message' => 'Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$id.' uri:'.$row['uri']
+                    ]);
+                    continue;
+                }
+
+                if (!$matches) {
+                    continue;
+                }
+            }
+            $result[] = $row['uri'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * custom Nextcloud search extension for CalDAV
+     *
+     * TODO - this should optionally cover cached calendar objects as well
+     *
+     * @param string $principalUri
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     * @return array
+     */
+    public function calendarSearch($principalUri, array $filters, $limit=null, $offset=null) {
+        $calendars = $this->getCalendarsForUser($principalUri);
+        $ownCalendars = [];
+        $sharedCalendars = [];
+
+        $uriMapper = [];
+
+        foreach($calendars as $calendar) {
+            if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
+                $ownCalendars[] = $calendar['id'];
+            } else {
+                $sharedCalendars[] = $calendar['id'];
+            }
+            $uriMapper[$calendar['id']] = $calendar['uri'];
+        }
+        if (count($ownCalendars) === 0 && count($sharedCalendars) === 0) {
+            return [];
+        }
+
+        $query = $this->db->getQueryBuilder();
+        // Calendar id expressions
+        $calendarExpressions = [];
+        foreach($ownCalendars as $id) {
+            $calendarExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('c.calendarid',
+                    $query->createNamedParameter($id)),
+                $query->expr()->eq('c.calendartype',
+                        $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+        }
+        foreach($sharedCalendars as $id) {
+            $calendarExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('c.calendarid',
+                    $query->createNamedParameter($id)),
+                $query->expr()->eq('c.classification',
+                    $query->createNamedParameter(self::CLASSIFICATION_PUBLIC)),
+                $query->expr()->eq('c.calendartype',
+                    $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+        }
+
+        if (count($calendarExpressions) === 1) {
+            $calExpr = $calendarExpressions[0];
+        } else {
+            $calExpr = call_user_func_array([$query->expr(), 'orX'], $calendarExpressions);
+        }
+
+        // Component expressions
+        $compExpressions = [];
+        foreach($filters['comps'] as $comp) {
+            $compExpressions[] = $query->expr()
+                ->eq('c.componenttype', $query->createNamedParameter($comp));
+        }
+
+        if (count($compExpressions) === 1) {
+            $compExpr = $compExpressions[0];
+        } else {
+            $compExpr = call_user_func_array([$query->expr(), 'orX'], $compExpressions);
+        }
+
+        if (!isset($filters['props'])) {
+            $filters['props'] = [];
+        }
+        if (!isset($filters['params'])) {
+            $filters['params'] = [];
+        }
+
+        $propParamExpressions = [];
+        foreach($filters['props'] as $prop) {
+            $propParamExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('i.name', $query->createNamedParameter($prop)),
+                $query->expr()->isNull('i.parameter')
+            );
+        }
+        foreach($filters['params'] as $param) {
+            $propParamExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
+                $query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
+            );
+        }
+
+        if (count($propParamExpressions) === 1) {
+            $propParamExpr = $propParamExpressions[0];
+        } else {
+            $propParamExpr = call_user_func_array([$query->expr(), 'orX'], $propParamExpressions);
+        }
+
+        $query->select(['c.calendarid', 'c.uri'])
+            ->from($this->dbObjectPropertiesTable, 'i')
+            ->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
+            ->where($calExpr)
+            ->andWhere($compExpr)
+            ->andWhere($propParamExpr)
+            ->andWhere($query->expr()->iLike('i.value',
+                $query->createNamedParameter('%'.$this->db->escapeLikeParameter($filters['search-term']).'%')));
+
+        if ($offset) {
+            $query->setFirstResult($offset);
+        }
+        if ($limit) {
+            $query->setMaxResults($limit);
+        }
+
+        $stmt = $query->execute();
+
+        $result = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
+            if (!in_array($path, $result)) {
+                $result[] = $path;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * used for Nextcloud's calendar API
+     *
+     * @param array $calendarInfo
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @param integer|null $limit
+     * @param integer|null $offset
+     *
+     * @return array
+     */
+    public function search(array $calendarInfo, $pattern, array $searchProperties,
+                            array $options, $limit, $offset) {
+        $outerQuery = $this->db->getQueryBuilder();
+        $innerQuery = $this->db->getQueryBuilder();
+
+        $innerQuery->selectDistinct('op.objectid')
+            ->from($this->dbObjectPropertiesTable, 'op')
+            ->andWhere($innerQuery->expr()->eq('op.calendarid',
+                $outerQuery->createNamedParameter($calendarInfo['id'])))
+            ->andWhere($innerQuery->expr()->eq('op.calendartype',
+                $outerQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+
+        // only return public items for shared calendars for now
+        if ($calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) {
+            $innerQuery->andWhere($innerQuery->expr()->eq('c.classification',
+                $outerQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
+        }
+
+        $or = $innerQuery->expr()->orX();
+        foreach($searchProperties as $searchProperty) {
+            $or->add($innerQuery->expr()->eq('op.name',
+                $outerQuery->createNamedParameter($searchProperty)));
+        }
+        $innerQuery->andWhere($or);
+
+        if ($pattern !== '') {
+            $innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
+                $outerQuery->createNamedParameter('%' .
+                    $this->db->escapeLikeParameter($pattern) . '%')));
+        }
+
+        $outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
+            ->from('calendarobjects', 'c');
+
+        if (isset($options['timerange'])) {
+            if (isset($options['timerange']['start'])) {
+                $outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',
+                    $outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp)));
+
+            }
+            if (isset($options['timerange']['end'])) {
+                $outerQuery->andWhere($outerQuery->expr()->lt('firstoccurence',
+                    $outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp)));
+            }
+        }
+
+        if (isset($options['types'])) {
+            $or = $outerQuery->expr()->orX();
+            foreach($options['types'] as $type) {
+                $or->add($outerQuery->expr()->eq('componenttype',
+                    $outerQuery->createNamedParameter($type)));
+            }
+            $outerQuery->andWhere($or);
+        }
+
+        $outerQuery->andWhere($outerQuery->expr()->in('c.id',
+            $outerQuery->createFunction($innerQuery->getSQL())));
+
+        if ($offset) {
+            $outerQuery->setFirstResult($offset);
+        }
+        if ($limit) {
+            $outerQuery->setMaxResults($limit);
+        }
+
+        $result = $outerQuery->execute();
+        $calendarObjects = $result->fetchAll();
+
+        return array_map(function($o) {
+            $calendarData = Reader::read($o['calendardata']);
+            $comps = $calendarData->getComponents();
+            $objects = [];
+            $timezones = [];
+            foreach($comps as $comp) {
+                if ($comp instanceof VTimeZone) {
+                    $timezones[] = $comp;
+                } else {
+                    $objects[] = $comp;
+                }
+            }
+
+            return [
+                'id' => $o['id'],
+                'type' => $o['componenttype'],
+                'uid' => $o['uid'],
+                'uri' => $o['uri'],
+                'objects' => array_map(function($c) {
+                    return $this->transformSearchData($c);
+                }, $objects),
+                'timezones' => array_map(function($c) {
+                    return $this->transformSearchData($c);
+                }, $timezones),
+            ];
+        }, $calendarObjects);
+    }
+
+    /**
+     * @param Component $comp
+     * @return array
+     */
+    private function transformSearchData(Component $comp) {
+        $data = [];
+        /** @var Component[] $subComponents */
+        $subComponents = $comp->getComponents();
+        /** @var Property[] $properties */
+        $properties = array_filter($comp->children(), function($c) {
+            return $c instanceof Property;
+        });
+        $validationRules = $comp->getValidationRules();
+
+        foreach($subComponents as $subComponent) {
+            $name = $subComponent->name;
+            if (!isset($data[$name])) {
+                $data[$name] = [];
+            }
+            $data[$name][] = $this->transformSearchData($subComponent);
+        }
+
+        foreach($properties as $property) {
+            $name = $property->name;
+            if (!isset($validationRules[$name])) {
+                $validationRules[$name] = '*';
+            }
+
+            $rule = $validationRules[$property->name];
+            if ($rule === '+' || $rule === '*') { // multiple
+                if (!isset($data[$name])) {
+                    $data[$name] = [];
+                }
+
+                $data[$name][] = $this->transformSearchProperty($property);
+            } else { // once
+                $data[$name] = $this->transformSearchProperty($property);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Property $prop
+     * @return array
+     */
+    private function transformSearchProperty(Property $prop) {
+        // No need to check Date, as it extends DateTime
+        if ($prop instanceof Property\ICalendar\DateTime) {
+            $value = $prop->getDateTime();
+        } else {
+            $value = $prop->getValue();
+        }
+
+        return [
+            $value,
+            $prop->parameters()
+        ];
+    }
+
+    /**
+     * Searches through all of a users calendars and calendar objects to find
+     * an object with a specific UID.
+     *
+     * This method should return the path to this object, relative to the
+     * calendar home, so this path usually only contains two parts:
+     *
+     * calendarpath/objectpath.ics
+     *
+     * If the uid is not found, return null.
+     *
+     * This method should only consider * objects that the principal owns, so
+     * any calendars owned by other principals that also appear in this
+     * collection should be ignored.
+     *
+     * @param string $principalUri
+     * @param string $uid
+     * @return string|null
+     */
+    function getCalendarObjectByUID($principalUri, $uid) {
+
+        $query = $this->db->getQueryBuilder();
+        $query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
+            ->from('calendarobjects', 'co')
+            ->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
+            ->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
+            ->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
+
+        $stmt = $query->execute();
+
+        if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            return $row['calendaruri'] . '/' . $row['objecturi'];
+        }
+
+        return null;
+    }
+
+    /**
+     * The getChanges method returns all the changes that have happened, since
+     * the specified syncToken in the specified calendar.
+     *
+     * This function should return an array, such as the following:
+     *
+     * [
+     *   'syncToken' => 'The current synctoken',
+     *   'added'   => [
+     *      'new.txt',
+     *   ],
+     *   'modified'   => [
+     *      'modified.txt',
+     *   ],
+     *   'deleted' => [
+     *      'foo.php.bak',
+     *      'old.txt'
+     *   ]
+     * );
+     *
+     * The returned syncToken property should reflect the *current* syncToken
+     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+     * property This is * needed here too, to ensure the operation is atomic.
+     *
+     * If the $syncToken argument is specified as null, this is an initial
+     * sync, and all members should be reported.
+     *
+     * The modified property is an array of nodenames that have changed since
+     * the last token.
+     *
+     * The deleted property is an array with nodenames, that have been deleted
+     * from collection.
+     *
+     * The $syncLevel argument is basically the 'depth' of the report. If it's
+     * 1, you only have to report changes that happened only directly in
+     * immediate descendants. If it's 2, it should also include changes from
+     * the nodes below the child collections. (grandchildren)
+     *
+     * The $limit argument allows a client to specify how many results should
+     * be returned at most. If the limit is not specified, it should be treated
+     * as infinite.
+     *
+     * If the limit (infinite or not) is higher than you're willing to return,
+     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+     *
+     * If the syncToken is expired (due to data cleanup) or unknown, you must
+     * return null.
+     *
+     * The limit is 'suggestive'. You are free to ignore it.
+     *
+     * @param string $calendarId
+     * @param string $syncToken
+     * @param int $syncLevel
+     * @param int $limit
+     * @param int $calendarType
+     * @return array
+     */
+    function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        // Current synctoken
+        $stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([ $calendarId ]);
+        $currentToken = $stmt->fetchColumn(0);
+
+        if (is_null($currentToken)) {
+            return null;
+        }
+
+        $result = [
+            'syncToken' => $currentToken,
+            'added'     => [],
+            'modified'  => [],
+            'deleted'   => [],
+        ];
+
+        if ($syncToken) {
+
+            $query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? AND `calendartype` = ? ORDER BY `synctoken`";
+            if ($limit>0) {
+                $query.= " LIMIT " . (int)$limit;
+            }
+
+            // Fetching all changes
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$syncToken, $currentToken, $calendarId, $calendarType]);
+
+            $changes = [];
+
+            // This loop ensures that any duplicates are overwritten, only the
+            // last change on a node is relevant.
+            while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+                $changes[$row['uri']] = $row['operation'];
+
+            }
+
+            foreach($changes as $uri => $operation) {
+
+                switch($operation) {
+                    case 1 :
+                        $result['added'][] = $uri;
+                        break;
+                    case 2 :
+                        $result['modified'][] = $uri;
+                        break;
+                    case 3 :
+                        $result['deleted'][] = $uri;
+                        break;
+                }
+
+            }
+        } else {
+            // No synctoken supplied, this is the initial sync.
+            $query = "SELECT `uri` FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?";
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$calendarId, $calendarType]);
+
+            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns a list of subscriptions for a principal.
+     *
+     * Every subscription is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    subscription. This can be the same as the uri or a database key.
+     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+     *  * principaluri. The owner of the subscription. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore, all the subscription info must be returned too:
+     *
+     * 1. {DAV:}displayname
+     * 2. {http://apple.com/ns/ical/}refreshrate
+     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+     *    should not be stripped).
+     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+     *    should not be stripped).
+     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+     *    attachments should not be stripped).
+     * 6. {http://calendarserver.org/ns/}source (Must be a
+     *     Sabre\DAV\Property\Href).
+     * 7. {http://apple.com/ns/ical/}calendar-color
+     * 8. {http://apple.com/ns/ical/}calendar-order
+     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     *    (should just be an instance of
+     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+     *    default components).
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getSubscriptionsForUser($principalUri) {
+        $fields = array_values($this->subscriptionPropertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'source';
+        $fields[] = 'principaluri';
+        $fields[] = 'lastmodified';
+        $fields[] = 'synctoken';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendarsubscriptions')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->orderBy('calendarorder', 'asc');
+        $stmt =$query->execute();
+
+        $subscriptions = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $subscription = [
+                'id'           => $row['id'],
+                'uri'          => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                'source'       => $row['source'],
+                'lastmodified' => $row['lastmodified'],
+
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            ];
+
+            foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+                if (!is_null($row[$dbName])) {
+                    $subscription[$xmlName] = $row[$dbName];
+                }
+            }
+
+            $subscriptions[] = $subscription;
+
+        }
+
+        return $subscriptions;
+    }
+
+    /**
+     * Creates a new subscription for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this subscription in other methods, such as updateSubscription.
+     *
+     * @param string $principalUri
+     * @param string $uri
+     * @param array $properties
+     * @return mixed
+     */
+    function createSubscription($principalUri, $uri, array $properties) {
+
+        if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
+            throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
+        }
+
+        $values = [
+            'principaluri' => $principalUri,
+            'uri'          => $uri,
+            'source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
+            'lastmodified' => time(),
+        ];
+
+        $propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
+
+        foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+            if (array_key_exists($xmlName, $properties)) {
+                    $values[$dbName] = $properties[$xmlName];
+                    if (in_array($dbName, $propertiesBoolean)) {
+                        $values[$dbName] = true;
+                }
+            }
+        }
+
+        $valuesToInsert = array();
+
+        $query = $this->db->getQueryBuilder();
+
+        foreach (array_keys($values) as $name) {
+            $valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
+        }
+
+        $query->insert('calendarsubscriptions')
+            ->values($valuesToInsert)
+            ->execute();
+
+        $subscriptionId = $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
+
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            [
+                'subscriptionId' => $subscriptionId,
+                'subscriptionData' => $this->getSubscriptionById($subscriptionId),
+            ]));
+
+        return $subscriptionId;
+    }
+
+    /**
+     * Updates a subscription
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param mixed $subscriptionId
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    function updateSubscription($subscriptionId, PropPatch $propPatch) {
+        $supportedProperties = array_keys($this->subscriptionPropertyMap);
+        $supportedProperties[] = '{http://calendarserver.org/ns/}source';
+
+        /**
+         * @suppress SqlInjectionChecker
+         */
+        $propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
+
+            $newValues = [];
+
+            foreach($mutations as $propertyName=>$propertyValue) {
+                if ($propertyName === '{http://calendarserver.org/ns/}source') {
+                    $newValues['source'] = $propertyValue->getHref();
+                } else {
+                    $fieldName = $this->subscriptionPropertyMap[$propertyName];
+                    $newValues[$fieldName] = $propertyValue;
+                }
+            }
+
+            $query = $this->db->getQueryBuilder();
+            $query->update('calendarsubscriptions')
+                ->set('lastmodified', $query->createNamedParameter(time()));
+            foreach($newValues as $fieldName=>$value) {
+                $query->set($fieldName, $query->createNamedParameter($value));
+            }
+            $query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+                ->execute();
+
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateSubscription', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateSubscription',
+                [
+                    'subscriptionId' => $subscriptionId,
+                    'subscriptionData' => $this->getSubscriptionById($subscriptionId),
+                    'propertyMutations' => $mutations,
+                ]));
+
+            return true;
+
+        });
+    }
+
+    /**
+     * Deletes a subscription.
+     *
+     * @param mixed $subscriptionId
+     * @return void
+     */
+    function deleteSubscription($subscriptionId) {
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            [
+                'subscriptionId' => $subscriptionId,
+                'subscriptionData' => $this->getSubscriptionById($subscriptionId),
+            ]));
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarsubscriptions')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+            ->execute();
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+
+        $query->delete('calendarchanges')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+    }
+
+    /**
+     * Returns a single scheduling object for the inbox collection.
+     *
+     * The returned array should contain the following elements:
+     *   * uri - A unique basename for the object. This will be used to
+     *           construct a full uri.
+     *   * calendardata - The iCalendar object
+     *   * lastmodified - The last modification date. Can be an int for a unix
+     *                    timestamp, or a PHP DateTime object.
+     *   * etag - A unique token that must change if the object changed.
+     *   * size - The size of the object, in bytes.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return array
+     */
+    function getSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+            ->from('schedulingobjects')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        return [
+                'uri'          => $row['uri'],
+                'calendardata' => $row['calendardata'],
+                'lastmodified' => $row['lastmodified'],
+                'etag'         => '"' . $row['etag'] . '"',
+                'size'         => (int)$row['size'],
+        ];
+    }
+
+    /**
+     * Returns all scheduling objects for the inbox collection.
+     *
+     * These objects should be returned as an array. Every item in the array
+     * should follow the same structure as returned from getSchedulingObject.
+     *
+     * The main difference is that 'calendardata' is optional.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getSchedulingObjects($principalUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+                ->from('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->execute();
+
+        $result = [];
+        foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $result[] = [
+                    'calendardata' => $row['calendardata'],
+                    'uri'          => $row['uri'],
+                    'lastmodified' => $row['lastmodified'],
+                    'etag'         => '"' . $row['etag'] . '"',
+                    'size'         => (int)$row['size'],
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes a scheduling object from the inbox collection.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return void
+     */
+    function deleteSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+                ->execute();
+    }
+
+    /**
+     * Creates a new scheduling object. This should land in a users' inbox.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @param string $objectData
+     * @return void
+     */
+    function createSchedulingObject($principalUri, $objectUri, $objectData) {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('schedulingobjects')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principalUri),
+                'calendardata' => $query->createNamedParameter($objectData, IQueryBuilder::PARAM_LOB),
+                'uri' => $query->createNamedParameter($objectUri),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter(md5($objectData)),
+                'size' => $query->createNamedParameter(strlen($objectData))
+            ])
+            ->execute();
+    }
+
+    /**
+     * Adds a change record to the calendarchanges table.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $operation 1 = add, 2 = modify, 3 = delete.
+     * @param int $calendarType
+     * @return void
+     */
+    protected function addChange($calendarId, $objectUri, $operation, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select('synctoken')
+            ->from($table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
+        $syncToken = (int)$query->execute()->fetchColumn();
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarchanges')
+            ->values([
+                'uri' => $query->createNamedParameter($objectUri),
+                'synctoken' => $query->createNamedParameter($syncToken),
+                'calendarid' => $query->createNamedParameter($calendarId),
+                'operation' => $query->createNamedParameter($operation),
+                'calendartype' => $query->createNamedParameter($calendarType),
+            ])
+            ->execute();
+
+        $stmt = $this->db->prepare("UPDATE `*PREFIX*$table` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?");
+        $stmt->execute([
+            $calendarId
+        ]);
+
+    }
+
+    /**
+     * Parses some information from calendar objects, used for optimized
+     * calendar-queries.
+     *
+     * Returns an array with the following keys:
+     *   * etag - An md5 checksum of the object without the quotes.
+     *   * size - Size of the object in bytes
+     *   * componentType - VEVENT, VTODO or VJOURNAL
+     *   * firstOccurence
+     *   * lastOccurence
+     *   * uid - value of the UID property
+     *
+     * @param string $calendarData
+     * @return array
+     */
+    public function getDenormalizedData($calendarData) {
+
+        $vObject = Reader::read($calendarData);
+        $componentType = null;
+        $component = null;
+        $firstOccurrence = null;
+        $lastOccurrence = null;
+        $uid = null;
+        $classification = self::CLASSIFICATION_PUBLIC;
+        foreach($vObject->getComponents() as $component) {
+            if ($component->name!=='VTIMEZONE') {
+                $componentType = $component->name;
+                $uid = (string)$component->UID;
+                break;
+            }
+        }
+        if (!$componentType) {
+            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+        }
+        if ($componentType === 'VEVENT' && $component->DTSTART) {
+            $firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
+            // Finding the last occurrence is a bit harder
+            if (!isset($component->RRULE)) {
+                if (isset($component->DTEND)) {
+                    $lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
+                } elseif (isset($component->DURATION)) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } elseif (!$component->DTSTART->hasTime()) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->modify('+1 day');
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } else {
+                    $lastOccurrence = $firstOccurrence;
+                }
+            } else {
+                $it = new EventIterator($vObject, (string)$component->UID);
+                $maxDate = new \DateTime(self::MAX_DATE);
+                if ($it->isInfinite()) {
+                    $lastOccurrence = $maxDate->getTimestamp();
+                } else {
+                    $end = $it->getDtEnd();
+                    while($it->valid() && $end < $maxDate) {
+                        $end = $it->getDtEnd();
+                        $it->next();
+
+                    }
+                    $lastOccurrence = $end->getTimestamp();
+                }
+
+            }
+        }
+
+        if ($component->CLASS) {
+            $classification = CalDavBackend::CLASSIFICATION_PRIVATE;
+            switch ($component->CLASS->getValue()) {
+                case 'PUBLIC':
+                    $classification = CalDavBackend::CLASSIFICATION_PUBLIC;
+                    break;
+                case 'CONFIDENTIAL':
+                    $classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
+                    break;
+            }
+        }
+        return [
+            'etag' => md5($calendarData),
+            'size' => strlen($calendarData),
+            'componentType' => $componentType,
+            'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
+            'lastOccurence'  => $lastOccurrence,
+            'uid' => $uid,
+            'classification' => $classification
+        ];
+
+    }
+
+    /**
+     * @param $cardData
+     * @return bool|string
+     */
+    private function readBlob($cardData) {
+        if (is_resource($cardData)) {
+            return stream_get_contents($cardData);
+        }
+
+        return $cardData;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param array $add
+     * @param array $remove
+     */
+    public function updateShares($shareable, $add, $remove) {
+        $calendarId = $shareable->getResourceId();
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::updateShares',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'shares' => $this->getShares($calendarId),
+                'add' => $add,
+                'remove' => $remove,
+            ]));
+        $this->calendarSharingBackend->updateShares($shareable, $add, $remove);
+    }
+
+    /**
+     * @param int $resourceId
+     * @param int $calendarType
+     * @return array
+     */
+    public function getShares($resourceId, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        return $this->calendarSharingBackend->getShares($resourceId);
+    }
+
+    /**
+     * @param boolean $value
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return string|null
+     */
+    public function setPublishStatus($value, $calendar) {
+
+        $calendarId = $calendar->getResourceId();
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::updateShares',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'public' => $value,
+            ]));
+
+        $query = $this->db->getQueryBuilder();
+        if ($value) {
+            $publicUri = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
+            $query->insert('dav_shares')
+                ->values([
+                    'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
+                    'type' => $query->createNamedParameter('calendar'),
+                    'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
+                    'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
+                    'publicuri' => $query->createNamedParameter($publicUri)
+                ]);
+            $query->execute();
+            return $publicUri;
+        }
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
+        $query->execute();
+        return null;
+    }
+
+    /**
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return mixed
+     */
+    public function getPublishStatus($calendar) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select('publicuri')
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->execute();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        return $row ? reset($row) : false;
+    }
+
+    /**
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        return $this->calendarSharingBackend->applyShareAcl($resourceId, $acl);
+    }
+
+
+
+    /**
+     * update properties table
+     *
+     * @param int $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     */
+    public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+        $objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
+
+        try {
+            $vCalendar = $this->readCalendarData($calendarData);
+        } catch (\Exception $ex) {
+            return;
+        }
+
+        $this->purgeProperties($calendarId, $objectId);
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert($this->dbObjectPropertiesTable)
+            ->values(
+                [
+                    'calendarid' => $query->createNamedParameter($calendarId),
+                    'calendartype' => $query->createNamedParameter($calendarType),
+                    'objectid' => $query->createNamedParameter($objectId),
+                    'name' => $query->createParameter('name'),
+                    'parameter' => $query->createParameter('parameter'),
+                    'value' => $query->createParameter('value'),
+                ]
+            );
+
+        $indexComponents = ['VEVENT', 'VJOURNAL', 'VTODO'];
+        foreach ($vCalendar->getComponents() as $component) {
+            if (!in_array($component->name, $indexComponents)) {
+                continue;
+            }
+
+            foreach ($component->children() as $property) {
+                if (in_array($property->name, self::$indexProperties)) {
+                    $value = $property->getValue();
+                    // is this a shitty db?
+                    if (!$this->db->supports4ByteText()) {
+                        $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
+                    }
+                    $value = mb_substr($value, 0, 254);
+
+                    $query->setParameter('name', $property->name);
+                    $query->setParameter('parameter', null);
+                    $query->setParameter('value', $value);
+                    $query->execute();
+                }
+
+                if (array_key_exists($property->name, self::$indexParameters)) {
+                    $parameters = $property->parameters();
+                    $indexedParametersForProperty = self::$indexParameters[$property->name];
+
+                    foreach ($parameters as $key => $value) {
+                        if (in_array($key, $indexedParametersForProperty)) {
+                            // is this a shitty db?
+                            if ($this->db->supports4ByteText()) {
+                                $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
+                            }
+                            $value = mb_substr($value, 0, 254);
+
+                            $query->setParameter('name', $property->name);
+                            $query->setParameter('parameter', substr($key, 0, 254));
+                            $query->setParameter('value', substr($value, 0, 254));
+                            $query->execute();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * deletes all birthday calendars
+     */
+    public function deleteAllBirthdayCalendars() {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id'])->from('calendars')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+            ->execute();
+
+        $ids = $result->fetchAll();
+        foreach($ids as $id) {
+            $this->deleteCalendar($id['id']);
+        }
+    }
+
+    /**
+     * @param $subscriptionId
+     */
+    public function purgeAllCachedEventsForSubscription($subscriptionId) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('uri')
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
+        $stmt = $query->execute();
+
+        $uris = [];
+        foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $uris[] = $row['uri'];
+        }
+        $stmt->closeCursor();
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+
+        $query->delete('calendarchanges')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->execute();
+
+        foreach($uris as $uri) {
+            $this->addChange($subscriptionId, $uri, 3, self::CALENDAR_TYPE_SUBSCRIPTION);
+        }
+    }
+
+    /**
+     * Move a calendar from one user to another
+     *
+     * @param string $uriName
+     * @param string $uriOrigin
+     * @param string $uriDestination
+     */
+    public function moveCalendar($uriName, $uriOrigin, $uriDestination)
+    {
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendars')
+            ->set('principaluri', $query->createNamedParameter($uriDestination))
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($uriOrigin)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($uriName)))
+            ->execute();
+    }
+
+    /**
+     * read VCalendar data into a VCalendar object
+     *
+     * @param string $objectData
+     * @return VCalendar
+     */
+    protected function readCalendarData($objectData) {
+        return Reader::read($objectData);
+    }
+
+    /**
+     * delete all properties from a given calendar object
+     *
+     * @param int $calendarId
+     * @param int $objectId
+     */
+    protected function purgeProperties($calendarId, $objectId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('objectid', $query->createNamedParameter($objectId)))
+            ->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
+        $query->execute();
+    }
+
+    /**
+     * get ID from a given calendar object
+     *
+     * @param int $calendarId
+     * @param string $uri
+     * @param int $calendarType
+     * @return int
+     */
+    protected function getCalendarObjectId($calendarId, $uri, $calendarType):int {
+        $query = $this->db->getQueryBuilder();
+        $query->select('id')
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        $result = $query->execute();
+        $objectIds = $result->fetch();
+        $result->closeCursor();
+
+        if (!isset($objectIds['id'])) {
+            throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
+        }
+
+        return (int)$objectIds['id'];
+    }
+
+    /**
+     * return legacy endpoint principal name to new principal name
+     *
+     * @param $principalUri
+     * @param $toV2
+     * @return string
+     */
+    private function convertPrincipal($principalUri, $toV2) {
+        if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+            list(, $name) = Uri\split($principalUri);
+            if ($toV2 === true) {
+                return "principals/users/$name";
+            }
+            return "principals/$name";
+        }
+        return $principalUri;
+    }
+
+    /**
+     * adds information about an owner to the calendar data
+     *
+     * @param $calendarInfo
+     */
+    private function addOwnerPrincipal(&$calendarInfo) {
+        $ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
+        $displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+        if (isset($calendarInfo[$ownerPrincipalKey])) {
+            $uri = $calendarInfo[$ownerPrincipalKey];
+        } else {
+            $uri = $calendarInfo['principaluri'];
+        }
+
+        $principalInformation = $this->principalBackend->getPrincipalByPath($uri);
+        if (isset($principalInformation['{DAV:}displayname'])) {
+            $calendarInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
+        }
+    }
 }

Spacing +150 added lines, -150 removed lines

@@ -223,7 +223,7 @@ 
 			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
 		}
 
-		return (int)$query->execute()->fetchColumn();
+		return (int) $query->execute()->fetchColumn();
 	}
 
 	/**
@@ -270,25 +270,25 @@ 
 		$stmt = $query->execute();
 
 		$calendars = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
 			];
 
-			foreach($this->propertyMap as $xmlName=>$dbName) {
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
 				$calendar[$xmlName] = $row[$dbName];
 			}
 
@@ -308,7 +308,7 @@ 
 		$principals = array_map(function($principal) {
 			return urldecode($principal);
 		}, $principals);
-		$principals[]= $principalUri;
+		$principals[] = $principalUri;
 
 		$fields = array_values($this->propertyMap);
 		$fields[] = 'a.id';
@@ -328,8 +328,8 @@ 
 			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
 			->execute();
 
-		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-		while($row = $result->fetch()) {
+		$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
+		while ($row = $result->fetch()) {
 			if ($row['principaluri'] === $principalUri) {
 				continue;
 			}
@@ -348,25 +348,25 @@ 
 			}
 
 			list(, $name) = Uri\split($row['principaluri']);
-			$uri = $row['uri'] . '_shared_by_' . $name;
-			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
+			$uri = $row['uri'].'_shared_by_'.$name;
+			$row['displayname'] = $row['displayname'].' ('.$this->getUserDisplayName($name).')';
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $uri,
 				'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
 				$readOnlyPropertyName => $readOnly,
 			];
 
-			foreach($this->propertyMap as $xmlName=>$dbName) {
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
 				$calendar[$xmlName] = $row[$dbName];
 			}
 
@@ -399,21 +399,21 @@ 
 			->orderBy('calendarorder', 'ASC');
 		$stmt = $query->execute();
 		$calendars = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 			];
-			foreach($this->propertyMap as $xmlName=>$dbName) {
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
 				$calendar[$xmlName] = $row[$dbName];
 			}
 
@@ -468,27 +468,27 @@ 
 			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
 			->execute();
 
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			list(, $name) = Uri\split($row['principaluri']);
-			$row['displayname'] = $row['displayname'] . "($name)";
+			$row['displayname'] = $row['displayname']."($name)";
 			$components = [];
 			if ($row['components']) {
-				$components = explode(',',$row['components']);
+				$components = explode(',', $row['components']);
 			}
 			$calendar = [
 				'id' => $row['id'],
 				'uri' => $row['publicuri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => (int) $row['access'] === Backend::ACCESS_READ,
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 			];
 
-			foreach($this->propertyMap as $xmlName=>$dbName) {
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
 				$calendar[$xmlName] = $row[$dbName];
 			}
 
@@ -532,29 +532,29 @@ 
 		$result->closeCursor();
 
 		if ($row === false) {
-			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
+			throw new NotFound('Node with name \''.$uri.'\' could not be found');
 		}
 
 		list(, $name) = Uri\split($row['principaluri']);
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
+		$row['displayname'] = $row['displayname'].' '."($name)";
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['publicuri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => (int) $row['access'] === Backend::ACCESS_READ,
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
 		];
 
-		foreach($this->propertyMap as $xmlName=>$dbName) {
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
 			$calendar[$xmlName] = $row[$dbName];
 		}
 
@@ -594,20 +594,20 @@ 
 
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 		];
 
-		foreach($this->propertyMap as $xmlName=>$dbName) {
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
 			$calendar[$xmlName] = $row[$dbName];
 		}
 
@@ -644,20 +644,20 @@ 
 
 		$components = [];
 		if ($row['components']) {
-			$components = explode(',',$row['components']);
+			$components = explode(',', $row['components']);
 		}
 
 		$calendar = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
 		];
 
-		foreach($this->propertyMap as $xmlName=>$dbName) {
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
 			$calendar[$xmlName] = $row[$dbName];
 		}
 
@@ -683,7 +683,7 @@ 
 			->from('calendarsubscriptions')
 			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
 			->orderBy('calendarorder', 'asc');
-		$stmt =$query->execute();
+		$stmt = $query->execute();
 
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 		$stmt->closeCursor();
@@ -697,11 +697,11 @@ 
 			'principaluri' => $row['principaluri'],
 			'source'       => $row['source'],
 			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
 		];
 
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+		foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
 			if (!is_null($row[$dbName])) {
 				$subscription[$xmlName] = $row[$dbName];
 			}
@@ -736,21 +736,21 @@ 
 		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
 		if (isset($properties[$sccs])) {
 			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+				throw new DAV\Exception('The '.$sccs.' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
 			}
-			$values['components'] = implode(',',$properties[$sccs]->getValue());
+			$values['components'] = implode(',', $properties[$sccs]->getValue());
 		} else if (isset($properties['components'])) {
 			// Allow to provide components internally without having
 			// to create a SupportedCalendarComponentSet object
 			$values['components'] = $properties['components'];
 		}
 
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		$transp = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
 		if (isset($properties[$transp])) {
 			$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
 		}
 
-		foreach($this->propertyMap as $xmlName=>$dbName) {
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
 			if (isset($properties[$xmlName])) {
 				$values[$dbName] = $properties[$xmlName];
 			}
@@ -758,7 +758,7 @@ 
 
 		$query = $this->db->getQueryBuilder();
 		$query->insert('calendars');
-		foreach($values as $column => $value) {
+		foreach ($values as $column => $value) {
 			$query->setValue($column, $query->createNamedParameter($value));
 		}
 		$query->execute();
@@ -792,7 +792,7 @@ 
 	 */
 	function updateCalendar($calendarId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->propertyMap);
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		$supportedProperties[] = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
 
 		/**
 		 * @suppress SqlInjectionChecker
@@ -802,7 +802,7 @@ 
 			foreach ($mutations as $propertyName => $propertyValue) {
 
 				switch ($propertyName) {
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
+					case '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' :
 						$fieldName = 'transparent';
 						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
 						break;
@@ -911,7 +911,7 @@ 
 	 * @param int $calendarType
 	 * @return array
 	 */
-	public function getCalendarObjects($id, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+	public function getCalendarObjects($id, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
 			->from('calendarobjects')
@@ -920,16 +920,16 @@ 
 		$stmt = $query->execute();
 
 		$result = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
 			$result[] = [
 				'id'           => $row['id'],
 				'uri'          => $row['uri'],
 				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
+				'etag'         => '"'.$row['etag'].'"',
 				'calendarid'   => $row['calendarid'],
-				'size'         => (int)$row['size'],
+				'size'         => (int) $row['size'],
 				'component'    => strtolower($row['componenttype']),
-				'classification'=> (int)$row['classification']
+				'classification'=> (int) $row['classification']
 			];
 		}
 
@@ -953,7 +953,7 @@ 
 	 * @param int $calendarType
 	 * @return array|null
 	 */
-	public function getCalendarObject($id, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function getCalendarObject($id, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
 			->from('calendarobjects')
@@ -963,7 +963,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -971,12 +971,12 @@ 
 			'id'            => $row['id'],
 			'uri'           => $row['uri'],
 			'lastmodified'  => $row['lastmodified'],
-			'etag'          => '"' . $row['etag'] . '"',
+			'etag'          => '"'.$row['etag'].'"',
 			'calendarid'    => $row['calendarid'],
-			'size'          => (int)$row['size'],
+			'size'          => (int) $row['size'],
 			'calendardata'  => $this->readBlob($row['calendardata']),
 			'component'     => strtolower($row['componenttype']),
-			'classification'=> (int)$row['classification']
+			'classification'=> (int) $row['classification']
 		];
 	}
 
@@ -993,7 +993,7 @@ 
 	 * @param int $calendarType
 	 * @return array
 	 */
-	public function getMultipleCalendarObjects($id, array $uris, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+	public function getMultipleCalendarObjects($id, array $uris, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
 		if (empty($uris)) {
 			return [];
 		}
@@ -1017,12 +1017,12 @@ 
 					'id'           => $row['id'],
 					'uri'          => $row['uri'],
 					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
+					'etag'         => '"'.$row['etag'].'"',
 					'calendarid'   => $row['calendarid'],
-					'size'         => (int)$row['size'],
+					'size'         => (int) $row['size'],
 					'calendardata' => $this->readBlob($row['calendardata']),
 					'component'    => strtolower($row['componenttype']),
-					'classification' => (int)$row['classification']
+					'classification' => (int) $row['classification']
 				];
 			}
 			$result->closeCursor();
@@ -1050,7 +1050,7 @@ 
 	 * @param int $calendarType
 	 * @return string
 	 */
-	function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$extraData = $this->getDenormalizedData($calendarData);
 
 		$q = $this->db->getQueryBuilder();
@@ -1111,7 +1111,7 @@ 
 		}
 		$this->addChange($calendarId, $objectUri, 1, $calendarType);
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1133,7 +1133,7 @@ 
 	 * @param int $calendarType
 	 * @return string
 	 */
-	function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$extraData = $this->getDenormalizedData($calendarData);
 		$query = $this->db->getQueryBuilder();
 		$query->update('calendarobjects')
@@ -1179,7 +1179,7 @@ 
 		}
 		$this->addChange($calendarId, $objectUri, 2, $calendarType);
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1209,7 +1209,7 @@ 
 	 * @param int $calendarType
 	 * @return void
 	 */
-	function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	function deleteCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
 		if (is_array($data)) {
 			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
@@ -1293,7 +1293,7 @@ 
 	 * @param int $calendarType
 	 * @return array
 	 */
-	public function calendarQuery($id, array $filters, $calendarType=self::CALENDAR_TYPE_CALENDAR):array {
+	public function calendarQuery($id, array $filters, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
 		$componentType = null;
 		$requirePostFilter = true;
 		$timeRange = null;
@@ -1347,13 +1347,13 @@ 
 		$stmt = $query->execute();
 
 		$result = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			if ($requirePostFilter) {
 				// validateFilterForObject will parse the calendar data
 				// catch parsing errors
 				try {
 					$matches = $this->validateFilterForObject($row, $filters);
-				} catch(ParseException $ex) {
+				} catch (ParseException $ex) {
 					$this->logger->logException($ex, [
 						'app' => 'dav',
 						'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$id.' uri:'.$row['uri']
@@ -1388,14 +1388,14 @@ 
 	 * @param integer|null $offset
 	 * @return array
 	 */
-	public function calendarSearch($principalUri, array $filters, $limit=null, $offset=null) {
+	public function calendarSearch($principalUri, array $filters, $limit = null, $offset = null) {
 		$calendars = $this->getCalendarsForUser($principalUri);
 		$ownCalendars = [];
 		$sharedCalendars = [];
 
 		$uriMapper = [];
 
-		foreach($calendars as $calendar) {
+		foreach ($calendars as $calendar) {
 			if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
 				$ownCalendars[] = $calendar['id'];
 			} else {
@@ -1410,14 +1410,14 @@ 
 		$query = $this->db->getQueryBuilder();
 		// Calendar id expressions
 		$calendarExpressions = [];
-		foreach($ownCalendars as $id) {
+		foreach ($ownCalendars as $id) {
 			$calendarExpressions[] = $query->expr()->andX(
 				$query->expr()->eq('c.calendarid',
 					$query->createNamedParameter($id)),
 				$query->expr()->eq('c.calendartype',
 						$query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
 		}
-		foreach($sharedCalendars as $id) {
+		foreach ($sharedCalendars as $id) {
 			$calendarExpressions[] = $query->expr()->andX(
 				$query->expr()->eq('c.calendarid',
 					$query->createNamedParameter($id)),
@@ -1435,7 +1435,7 @@ 
 
 		// Component expressions
 		$compExpressions = [];
-		foreach($filters['comps'] as $comp) {
+		foreach ($filters['comps'] as $comp) {
 			$compExpressions[] = $query->expr()
 				->eq('c.componenttype', $query->createNamedParameter($comp));
 		}
@@ -1454,13 +1454,13 @@ 
 		}
 
 		$propParamExpressions = [];
-		foreach($filters['props'] as $prop) {
+		foreach ($filters['props'] as $prop) {
 			$propParamExpressions[] = $query->expr()->andX(
 				$query->expr()->eq('i.name', $query->createNamedParameter($prop)),
 				$query->expr()->isNull('i.parameter')
 			);
 		}
-		foreach($filters['params'] as $param) {
+		foreach ($filters['params'] as $param) {
 			$propParamExpressions[] = $query->expr()->andX(
 				$query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
 				$query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
@@ -1492,8 +1492,8 @@ 
 		$stmt = $query->execute();
 
 		$result = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$path = $uriMapper[$row['calendarid']].'/'.$row['uri'];
 			if (!in_array($path, $result)) {
 				$result[] = $path;
 			}
@@ -1533,7 +1533,7 @@ 
 		}
 
 		$or = $innerQuery->expr()->orX();
-		foreach($searchProperties as $searchProperty) {
+		foreach ($searchProperties as $searchProperty) {
 			$or->add($innerQuery->expr()->eq('op.name',
 				$outerQuery->createNamedParameter($searchProperty)));
 		}
@@ -1541,8 +1541,8 @@ 
 
 		if ($pattern !== '') {
 			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
-				$outerQuery->createNamedParameter('%' .
-					$this->db->escapeLikeParameter($pattern) . '%')));
+				$outerQuery->createNamedParameter('%'.
+					$this->db->escapeLikeParameter($pattern).'%')));
 		}
 
 		$outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
@@ -1562,7 +1562,7 @@ 
 
 		if (isset($options['types'])) {
 			$or = $outerQuery->expr()->orX();
-			foreach($options['types'] as $type) {
+			foreach ($options['types'] as $type) {
 				$or->add($outerQuery->expr()->eq('componenttype',
 					$outerQuery->createNamedParameter($type)));
 			}
@@ -1587,7 +1587,7 @@ 
 			$comps = $calendarData->getComponents();
 			$objects = [];
 			$timezones = [];
-			foreach($comps as $comp) {
+			foreach ($comps as $comp) {
 				if ($comp instanceof VTimeZone) {
 					$timezones[] = $comp;
 				} else {
@@ -1624,7 +1624,7 @@ 
 		});
 		$validationRules = $comp->getValidationRules();
 
-		foreach($subComponents as $subComponent) {
+		foreach ($subComponents as $subComponent) {
 			$name = $subComponent->name;
 			if (!isset($data[$name])) {
 				$data[$name] = [];
@@ -1632,7 +1632,7 @@ 
 			$data[$name][] = $this->transformSearchData($subComponent);
 		}
 
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$name = $property->name;
 			if (!isset($validationRules[$name])) {
 				$validationRules[$name] = '*';
@@ -1703,7 +1703,7 @@ 
 		$stmt = $query->execute();
 
 		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
+			return $row['calendaruri'].'/'.$row['objecturi'];
 		}
 
 		return null;
@@ -1766,10 +1766,10 @@ 
 	 * @param int $calendarType
 	 * @return array
 	 */
-	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([ $calendarId ]);
+		$stmt->execute([$calendarId]);
 		$currentToken = $stmt->fetchColumn(0);
 
 		if (is_null($currentToken)) {
@@ -1786,8 +1786,8 @@ 
 		if ($syncToken) {
 
 			$query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? AND `calendartype` = ? ORDER BY `synctoken`";
-			if ($limit>0) {
-				$query.= " LIMIT " . (int)$limit;
+			if ($limit > 0) {
+				$query .= " LIMIT ".(int) $limit;
 			}
 
 			// Fetching all changes
@@ -1798,15 +1798,15 @@ 
 
 			// This loop ensures that any duplicates are overwritten, only the
 			// last change on a node is relevant.
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 
 				$changes[$row['uri']] = $row['operation'];
 
 			}
 
-			foreach($changes as $uri => $operation) {
+			foreach ($changes as $uri => $operation) {
 
-				switch($operation) {
+				switch ($operation) {
 					case 1 :
 						$result['added'][] = $uri;
 						break;
@@ -1877,10 +1877,10 @@ 
 			->from('calendarsubscriptions')
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
 			->orderBy('calendarorder', 'asc');
-		$stmt =$query->execute();
+		$stmt = $query->execute();
 
 		$subscriptions = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 
 			$subscription = [
 				'id'           => $row['id'],
@@ -1889,11 +1889,11 @@ 
 				'source'       => $row['source'],
 				'lastmodified' => $row['lastmodified'],
 
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
 			];
 
-			foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+			foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
 				if (!is_null($row[$dbName])) {
 					$subscription[$xmlName] = $row[$dbName];
 				}
@@ -1932,7 +1932,7 @@ 
 
 		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
 
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+		foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
 			if (array_key_exists($xmlName, $properties)) {
 					$values[$dbName] = $properties[$xmlName];
 					if (in_array($dbName, $propertiesBoolean)) {
@@ -1992,7 +1992,7 @@ 
 
 			$newValues = [];
 
-			foreach($mutations as $propertyName=>$propertyValue) {
+			foreach ($mutations as $propertyName=>$propertyValue) {
 				if ($propertyName === '{http://calendarserver.org/ns/}source') {
 					$newValues['source'] = $propertyValue->getHref();
 				} else {
@@ -2004,7 +2004,7 @@ 
 			$query = $this->db->getQueryBuilder();
 			$query->update('calendarsubscriptions')
 				->set('lastmodified', $query->createNamedParameter(time()));
-			foreach($newValues as $fieldName=>$value) {
+			foreach ($newValues as $fieldName=>$value) {
 				$query->set($fieldName, $query->createNamedParameter($value));
 			}
 			$query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
@@ -2085,7 +2085,7 @@ 
 
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -2093,8 +2093,8 @@ 
 				'uri'          => $row['uri'],
 				'calendardata' => $row['calendardata'],
 				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
-				'size'         => (int)$row['size'],
+				'etag'         => '"'.$row['etag'].'"',
+				'size'         => (int) $row['size'],
 		];
 	}
 
@@ -2117,13 +2117,13 @@ 
 				->execute();
 
 		$result = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
 			$result[] = [
 					'calendardata' => $row['calendardata'],
 					'uri'          => $row['uri'],
 					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
-					'size'         => (int)$row['size'],
+					'etag'         => '"'.$row['etag'].'"',
+					'size'         => (int) $row['size'],
 			];
 		}
 
@@ -2176,14 +2176,14 @@ 
 	 * @param int $calendarType
 	 * @return void
 	 */
-	protected function addChange($calendarId, $objectUri, $operation, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+	protected function addChange($calendarId, $objectUri, $operation, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars' : 'calendarsubscriptions';
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('synctoken')
 			->from($table)
 			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-		$syncToken = (int)$query->execute()->fetchColumn();
+		$syncToken = (int) $query->execute()->fetchColumn();
 
 		$query = $this->db->getQueryBuilder();
 		$query->insert('calendarchanges')
@@ -2227,10 +2227,10 @@ 
 		$lastOccurrence = null;
 		$uid = null;
 		$classification = self::CLASSIFICATION_PUBLIC;
-		foreach($vObject->getComponents() as $component) {
-			if ($component->name!=='VTIMEZONE') {
+		foreach ($vObject->getComponents() as $component) {
+			if ($component->name !== 'VTIMEZONE') {
 				$componentType = $component->name;
-				$uid = (string)$component->UID;
+				$uid = (string) $component->UID;
 				break;
 			}
 		}
@@ -2255,13 +2255,13 @@ 
 					$lastOccurrence = $firstOccurrence;
 				}
 			} else {
-				$it = new EventIterator($vObject, (string)$component->UID);
+				$it = new EventIterator($vObject, (string) $component->UID);
 				$maxDate = new \DateTime(self::MAX_DATE);
 				if ($it->isInfinite()) {
 					$lastOccurrence = $maxDate->getTimestamp();
 				} else {
 					$end = $it->getDtEnd();
-					while($it->valid() && $end < $maxDate) {
+					while ($it->valid() && $end < $maxDate) {
 						$end = $it->getDtEnd();
 						$it->next();
 
@@ -2331,7 +2331,7 @@ 
 	 * @param int $calendarType
 	 * @return array
 	 */
-	public function getShares($resourceId, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function getShares($resourceId, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		return $this->calendarSharingBackend->getShares($resourceId);
 	}
 
@@ -2408,7 +2408,7 @@ 
 	 * @param string $calendarData
 	 * @param int $calendarType
 	 */
-	public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
 		$objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
 
 		try {
@@ -2486,7 +2486,7 @@ 
 			->execute();
 
 		$ids = $result->fetchAll();
-		foreach($ids as $id) {
+		foreach ($ids as $id) {
 			$this->deleteCalendar($id['id']);
 		}
 	}
@@ -2503,7 +2503,7 @@ 
 		$stmt = $query->execute();
 
 		$uris = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
 			$uris[] = $row['uri'];
 		}
 		$stmt->closeCursor();
@@ -2524,7 +2524,7 @@ 
 			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
 			->execute();
 
-		foreach($uris as $uri) {
+		foreach ($uris as $uri) {
 			$this->addChange($subscriptionId, $uri, 3, self::CALENDAR_TYPE_SUBSCRIPTION);
 		}
 	}
@@ -2591,10 +2591,10 @@ 
 		$result->closeCursor();
 
 		if (!isset($objectIds['id'])) {
-			throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Calendarobject does not exists: '.$uri);
 		}
 
-		return (int)$objectIds['id'];
+		return (int) $objectIds['id'];
 	}
 
 	/**
@@ -2621,8 +2621,8 @@ 
 	 * @param $calendarInfo
 	 */
 	private function addOwnerPrincipal(&$calendarInfo) {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+		$ownerPrincipalKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal';
+		$displaynameKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname';
 		if (isset($calendarInfo[$ownerPrincipalKey])) {
 			$uri = $calendarInfo[$ownerPrincipalKey];
 		} else {

apps/dav/lib/CalDAV/Reminder/Notifier.php

Indentation +272 added lines, -272 removed lines

@@ -41,276 +41,276 @@
  */
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	private $l10nFactory;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IFactory $factory
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IFactory $factory,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
-		$this->l10nFactory = $factory;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID():string {
-		return Application::APP_ID;
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName():string {
-		return $this->l10nFactory->get('dav')->t('Calendar');
-	}
-
-	/**
-	 * Prepare sending the notification
-	 *
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \Exception
-	 */
-	public function prepare(INotification $notification,
-							string $languageCode):INotification {
-		if ($notification->getApp() !== Application::APP_ID) {
-			throw new \InvalidArgumentException('Notification not from this app');
-		}
-
-		// Read the language from the notification
-		$this->l10n = $this->l10nFactory->get('dav', $languageCode);
-
-		// Handle notifier subjects
-		switch($notification->getSubject()) {
-			case 'calendar_reminder':
-				return $this->prepareReminderNotification($notification);
-
-			default:
-				throw new \InvalidArgumentException('Unknown subject');
-
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @return INotification
-	 */
-	private function prepareReminderNotification(INotification $notification):INotification {
-		$imagePath = $this->urlGenerator->imagePath('core', 'places/calendar.svg');
-		$iconUrl = $this->urlGenerator->getAbsoluteURL($imagePath);
-		$notification->setIcon($iconUrl);
-
-		$this->prepareNotificationSubject($notification);
-		$this->prepareNotificationMessage($notification);
-
-		return $notification;
-	}
-
-	/**
-	 * Sets the notification subject based on the parameters set in PushProvider
-	 *
-	 * @param INotification $notification
-	 */
-	private function prepareNotificationSubject(INotification $notification): void {
-		$parameters = $notification->getSubjectParameters();
-
-		$startTime = \DateTime::createFromFormat(\DateTime::ATOM, $parameters['start_atom']);
-		$now = $this->timeFactory->getDateTime();
-		$title = $this->getTitleFromParameters($parameters);
-
-		$diff = $startTime->diff($now);
-		if ($diff === false) {
-			return;
-		}
-
-		$components = [];
-		if ($diff->y) {
-			$components[] = $this->l10n->n('%n year', '%n years', $diff->y);
-		}
-		if ($diff->m) {
-			$components[] = $this->l10n->n('%n month', '%n months', $diff->m);
-		}
-		if ($diff->d) {
-			$components[] = $this->l10n->n('%n day', '%n days', $diff->d);
-		}
-		if ($diff->h) {
-			$components[] = $this->l10n->n('%n hour', '%n hours', $diff->h);
-		}
-		if ($diff->i) {
-			$components[] = $this->l10n->n('%n minute', '%n minutes', $diff->i);
-		}
-
-		// Limiting to the first three components to prevent
-		// the string from getting too long
-		$firstThreeComponents = array_slice($components, 0, 2);
-		$diffLabel = implode(', ', $firstThreeComponents);
-
-		if ($diff->invert) {
-			$title = $this->l10n->t('%s (in %s)', [$title, $diffLabel]);
-		} else {
-			$title = $this->l10n->t('%s (%s ago)', [$title, $diffLabel]);
-		}
-
-		$notification->setParsedSubject($title);
-	}
-
-	/**
-	 * Sets the notification message based on the parameters set in PushProvider
-	 *
-	 * @param INotification $notification
-	 */
-	private function prepareNotificationMessage(INotification $notification): void {
-		$parameters = $notification->getMessageParameters();
-
-		$description = [
-			$this->l10n->t('Calendar: %s', $parameters['calendar_displayname']),
-			$this->l10n->t('Date: %s', $this->generateDateString($parameters)),
-		];
-		if ($parameters['description']) {
-			$description[] = $this->l10n->t('Description: %s', $parameters['description']);
-		}
-		if ($parameters['location']) {
-			$description[] = $this->l10n->t('Where: %s', $parameters['location']);
-		}
-
-		$message = implode("\r\n", $description);
-		$notification->setParsedMessage($message);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return string
-	 */
-	private function getTitleFromParameters(array $parameters):string {
-		return $parameters['title'] ?? $this->l10n->t('Untitled event');
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return string
-	 * @throws \Exception
-	 */
-	private function generateDateString(array $parameters):string {
-		$startDateTime = DateTime::createFromFormat(\DateTime::ATOM, $parameters['start_atom']);
-		$endDateTime = DateTime::createFromFormat(\DateTime::ATOM, $parameters['end_atom']);
-		$isAllDay = $parameters['all_day'];
-		$diff = $startDateTime->diff($endDateTime);
-
-		if ($isAllDay) {
-			// One day event
-			if ($diff->days === 1) {
-				return $this->getDateString($startDateTime);
-			}
-
-			return implode(' - ', [
-				$this->getDateString($startDateTime),
-				$this->getDateString($endDateTime),
-			]);
-		}
-
-		$startTimezone = $endTimezone = null;
-		if (!$parameters['start_is_floating']) {
-			$startTimezone = $parameters['start_timezone'];
-			$endTimezone = $parameters['end_timezone'];
-		}
-
-		$localeStart = implode(', ', [
-			$this->getWeekDayName($startDateTime),
-			$this->getDateTimeString($startDateTime)
-		]);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = implode(', ', [
-				$this->getWeekDayName($endDateTime),
-				$this->getDateTimeString($endDateTime)
-			]);
-
-			return $localeStart
-				. ' (' . $startTimezone . ') '
-				. ' - '
-				. $localeEnd
-				. ' (' . $endTimezone . ')';
-		}
-
-		// Show only the time if the day is the same
-		$localeEnd = $this->isDayEqual($startDateTime, $endDateTime)
-			? $this->getTimeString($endDateTime)
-			: implode(', ', [
-				$this->getWeekDayName($endDateTime),
-				$this->getDateTimeString($endDateTime)
-			]);
-
-		return $localeStart
-			. ' - '
-			. $localeEnd
-			. ' (' . $startTimezone . ')';
-	}
-
-	/**
-	 * @param DateTime $dtStart
-	 * @param DateTime $dtEnd
-	 * @return bool
-	 */
-	private function isDayEqual(DateTime $dtStart,
-								DateTime $dtEnd):bool {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getWeekDayName(DateTime $dt):string {
-		return $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateString(DateTime $dt):string {
-		return $this->l10n->l('date', $dt, ['width' => 'medium']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateTimeString(DateTime $dt):string {
-		return $this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getTimeString(DateTime $dt):string {
-		return $this->l10n->l('time', $dt, ['width' => 'short']);
-	}
+    /** @var IFactory */
+    private $l10nFactory;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IFactory $factory
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IFactory $factory,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory) {
+        $this->l10nFactory = $factory;
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID():string {
+        return Application::APP_ID;
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName():string {
+        return $this->l10nFactory->get('dav')->t('Calendar');
+    }
+
+    /**
+     * Prepare sending the notification
+     *
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \Exception
+     */
+    public function prepare(INotification $notification,
+                            string $languageCode):INotification {
+        if ($notification->getApp() !== Application::APP_ID) {
+            throw new \InvalidArgumentException('Notification not from this app');
+        }
+
+        // Read the language from the notification
+        $this->l10n = $this->l10nFactory->get('dav', $languageCode);
+
+        // Handle notifier subjects
+        switch($notification->getSubject()) {
+            case 'calendar_reminder':
+                return $this->prepareReminderNotification($notification);
+
+            default:
+                throw new \InvalidArgumentException('Unknown subject');
+
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @return INotification
+     */
+    private function prepareReminderNotification(INotification $notification):INotification {
+        $imagePath = $this->urlGenerator->imagePath('core', 'places/calendar.svg');
+        $iconUrl = $this->urlGenerator->getAbsoluteURL($imagePath);
+        $notification->setIcon($iconUrl);
+
+        $this->prepareNotificationSubject($notification);
+        $this->prepareNotificationMessage($notification);
+
+        return $notification;
+    }
+
+    /**
+     * Sets the notification subject based on the parameters set in PushProvider
+     *
+     * @param INotification $notification
+     */
+    private function prepareNotificationSubject(INotification $notification): void {
+        $parameters = $notification->getSubjectParameters();
+
+        $startTime = \DateTime::createFromFormat(\DateTime::ATOM, $parameters['start_atom']);
+        $now = $this->timeFactory->getDateTime();
+        $title = $this->getTitleFromParameters($parameters);
+
+        $diff = $startTime->diff($now);
+        if ($diff === false) {
+            return;
+        }
+
+        $components = [];
+        if ($diff->y) {
+            $components[] = $this->l10n->n('%n year', '%n years', $diff->y);
+        }
+        if ($diff->m) {
+            $components[] = $this->l10n->n('%n month', '%n months', $diff->m);
+        }
+        if ($diff->d) {
+            $components[] = $this->l10n->n('%n day', '%n days', $diff->d);
+        }
+        if ($diff->h) {
+            $components[] = $this->l10n->n('%n hour', '%n hours', $diff->h);
+        }
+        if ($diff->i) {
+            $components[] = $this->l10n->n('%n minute', '%n minutes', $diff->i);
+        }
+
+        // Limiting to the first three components to prevent
+        // the string from getting too long
+        $firstThreeComponents = array_slice($components, 0, 2);
+        $diffLabel = implode(', ', $firstThreeComponents);
+
+        if ($diff->invert) {
+            $title = $this->l10n->t('%s (in %s)', [$title, $diffLabel]);
+        } else {
+            $title = $this->l10n->t('%s (%s ago)', [$title, $diffLabel]);
+        }
+
+        $notification->setParsedSubject($title);
+    }
+
+    /**
+     * Sets the notification message based on the parameters set in PushProvider
+     *
+     * @param INotification $notification
+     */
+    private function prepareNotificationMessage(INotification $notification): void {
+        $parameters = $notification->getMessageParameters();
+
+        $description = [
+            $this->l10n->t('Calendar: %s', $parameters['calendar_displayname']),
+            $this->l10n->t('Date: %s', $this->generateDateString($parameters)),
+        ];
+        if ($parameters['description']) {
+            $description[] = $this->l10n->t('Description: %s', $parameters['description']);
+        }
+        if ($parameters['location']) {
+            $description[] = $this->l10n->t('Where: %s', $parameters['location']);
+        }
+
+        $message = implode("\r\n", $description);
+        $notification->setParsedMessage($message);
+    }
+
+    /**
+     * @param array $parameters
+     * @return string
+     */
+    private function getTitleFromParameters(array $parameters):string {
+        return $parameters['title'] ?? $this->l10n->t('Untitled event');
+    }
+
+    /**
+     * @param array $parameters
+     * @return string
+     * @throws \Exception
+     */
+    private function generateDateString(array $parameters):string {
+        $startDateTime = DateTime::createFromFormat(\DateTime::ATOM, $parameters['start_atom']);
+        $endDateTime = DateTime::createFromFormat(\DateTime::ATOM, $parameters['end_atom']);
+        $isAllDay = $parameters['all_day'];
+        $diff = $startDateTime->diff($endDateTime);
+
+        if ($isAllDay) {
+            // One day event
+            if ($diff->days === 1) {
+                return $this->getDateString($startDateTime);
+            }
+
+            return implode(' - ', [
+                $this->getDateString($startDateTime),
+                $this->getDateString($endDateTime),
+            ]);
+        }
+
+        $startTimezone = $endTimezone = null;
+        if (!$parameters['start_is_floating']) {
+            $startTimezone = $parameters['start_timezone'];
+            $endTimezone = $parameters['end_timezone'];
+        }
+
+        $localeStart = implode(', ', [
+            $this->getWeekDayName($startDateTime),
+            $this->getDateTimeString($startDateTime)
+        ]);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = implode(', ', [
+                $this->getWeekDayName($endDateTime),
+                $this->getDateTimeString($endDateTime)
+            ]);
+
+            return $localeStart
+                . ' (' . $startTimezone . ') '
+                . ' - '
+                . $localeEnd
+                . ' (' . $endTimezone . ')';
+        }
+
+        // Show only the time if the day is the same
+        $localeEnd = $this->isDayEqual($startDateTime, $endDateTime)
+            ? $this->getTimeString($endDateTime)
+            : implode(', ', [
+                $this->getWeekDayName($endDateTime),
+                $this->getDateTimeString($endDateTime)
+            ]);
+
+        return $localeStart
+            . ' - '
+            . $localeEnd
+            . ' (' . $startTimezone . ')';
+    }
+
+    /**
+     * @param DateTime $dtStart
+     * @param DateTime $dtEnd
+     * @return bool
+     */
+    private function isDayEqual(DateTime $dtStart,
+                                DateTime $dtEnd):bool {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getWeekDayName(DateTime $dt):string {
+        return $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateString(DateTime $dt):string {
+        return $this->l10n->l('date', $dt, ['width' => 'medium']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateTimeString(DateTime $dt):string {
+        return $this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getTimeString(DateTime $dt):string {
+        return $this->l10n->l('time', $dt, ['width' => 'short']);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 		$this->l10n = $this->l10nFactory->get('dav', $languageCode);
 
 		// Handle notifier subjects
-		switch($notification->getSubject()) {
+		switch ($notification->getSubject()) {
 			case 'calendar_reminder':
 				return $this->prepareReminderNotification($notification);
 
@@ -252,10 +252,10 @@ 
 			]);
 
 			return $localeStart
-				. ' (' . $startTimezone . ') '
+				. ' ('.$startTimezone.') '
 				. ' - '
 				. $localeEnd
-				. ' (' . $endTimezone . ')';
+				. ' ('.$endTimezone.')';
 		}
 
 		// Show only the time if the day is the same
@@ -269,7 +269,7 @@ 
 		return $localeStart
 			. ' - '
 			. $localeEnd
-			. ' (' . $startTimezone . ')';
+			. ' ('.$startTimezone.')';
 	}
 
 	/**

apps/dav/lib/CalDAV/Reminder/INotificationProvider.php

Indentation +11 added lines, -11 removed lines

@@ -33,15 +33,15 @@
  */
 interface INotificationProvider {
 
-	/**
-	 * Send notification
-	 *
-	 * @param VEvent $vevent
-	 * @param string $calendarDisplayName
-	 * @param IUser[] $users
-	 * @return void
-	 */
-	public function send(VEvent $vevent,
-						 string $calendarDisplayName,
-						 array $users=[]): void;
+    /**
+     * Send notification
+     *
+     * @param VEvent $vevent
+     * @param string $calendarDisplayName
+     * @param IUser[] $users
+     * @return void
+     */
+    public function send(VEvent $vevent,
+                            string $calendarDisplayName,
+                            array $users=[]): void;
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -43,5 +43,5 @@
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName,
-						 array $users=[]): void;
+						 array $users = []): void;
 }
\ No newline at end of file

apps/dav/lib/CalDAV/Reminder/ReminderService.php

Indentation +718 added lines, -718 removed lines

@@ -40,722 +40,722 @@
 
 class ReminderService {
 
-	/** @var Backend */
-	private $backend;
-
-	/** @var NotificationProviderManager */
-	private $notificationProviderManager;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var CalDavBackend */
-	private $caldavBackend;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	public const REMINDER_TYPE_EMAIL = 'EMAIL';
-	public const REMINDER_TYPE_DISPLAY = 'DISPLAY';
-	public const REMINDER_TYPE_AUDIO = 'AUDIO';
-
-	/**
-	 * @var String[]
-	 *
-	 * Official RFC5545 reminder types
-	 */
-	public const REMINDER_TYPES = [
-		self::REMINDER_TYPE_EMAIL,
-		self::REMINDER_TYPE_DISPLAY,
-		self::REMINDER_TYPE_AUDIO
-	];
-
-	/**
-	 * ReminderService constructor.
-	 *
-	 * @param Backend $backend
-	 * @param NotificationProviderManager $notificationProviderManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param CalDavBackend $caldavBackend
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(Backend $backend,
-								NotificationProviderManager $notificationProviderManager,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								CalDavBackend $caldavBackend,
-								ITimeFactory $timeFactory) {
-		$this->backend = $backend;
-		$this->notificationProviderManager = $notificationProviderManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->caldavBackend = $caldavBackend;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * Process reminders to activate
-	 *
-	 * @throws NotificationProvider\ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function processReminders():void {
-		$reminders = $this->backend->getRemindersToProcess();
-
-		foreach($reminders as $reminder) {
-			$vcalendar = $this->parseCalendarData($reminder['calendardata']);
-			if (!$vcalendar) {
-				$this->backend->removeReminder($reminder['id']);
-				continue;
-			}
-
-			$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);
-			if (!$vevent) {
-				$this->backend->removeReminder($reminder['id']);
-				continue;
-			}
-
-			if ($this->wasEventCancelled($vevent)) {
-				$this->deleteOrProcessNext($reminder, $vevent);
-				continue;
-			}
-
-			if (!$this->notificationProviderManager->hasProvider($reminder['type'])) {
-				$this->deleteOrProcessNext($reminder, $vevent);
-				continue;
-			}
-
-			$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
-			$user = $this->getUserFromPrincipalURI($reminder['principaluri']);
-			if ($user) {
-				$users[] = $user;
-			}
-
-			$notificationProvider = $this->notificationProviderManager->getProvider($reminder['type']);
-			$notificationProvider->send($vevent, $reminder['displayname'], $users);
-
-			$this->deleteOrProcessNext($reminder, $vevent);
-		}
-	}
-
-	/**
-	 * @param string $action
-	 * @param array $objectData
-	 * @throws VObject\InvalidDataException
-	 */
-	public function onTouchCalendarObject(string $action,
-										  array $objectData):void {
-		// We only support VEvents for now
-		if (strcasecmp($objectData['component'], 'vevent') !== 0) {
-			return;
-		}
-
-		switch($action) {
-			case '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject':
-				$this->onCalendarObjectCreate($objectData);
-				break;
-
-			case '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject':
-				$this->onCalendarObjectEdit($objectData);
-				break;
-
-			case '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject':
-				$this->onCalendarObjectDelete($objectData);
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 */
-	private function onCalendarObjectCreate(array $objectData):void {
-		/** @var VObject\Component\VCalendar $vcalendar */
-		$vcalendar = $this->parseCalendarData($objectData['calendardata']);
-		if (!$vcalendar) {
-			return;
-		}
-
-		$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
-		if (count($vevents) === 0) {
-			return;
-		}
-
-		$uid = (string) $vevents[0]->UID;
-		$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
-		$masterItem = $this->getMasterItemFromListOfVEvents($vevents);
-		$now = $this->timeFactory->getDateTime();
-		$isRecurring = $masterItem ? $this->isRecurring($masterItem) : false;
-
-		foreach($recurrenceExceptions as $recurrenceException) {
-			$eventHash = $this->getEventHash($recurrenceException);
-
-			foreach($recurrenceException->VALARM as $valarm) {
-				/** @var VAlarm $valarm */
-				$alarmHash = $this->getAlarmHash($valarm);
-				$triggerTime = $valarm->getEffectiveTriggerTime();
-				$diff = $now->diff($triggerTime);
-				if ($diff->invert === 1) {
-					continue;
-				}
-
-				$alarms = $this->getRemindersForVAlarm($valarm, $objectData,
-					$eventHash, $alarmHash, true, true);
-				$this->writeRemindersToDatabase($alarms);
-			}
-		}
-
-		if ($masterItem) {
-			$processedAlarms = [];
-			$masterAlarms = [];
-			$masterHash = $this->getEventHash($masterItem);
-
-			foreach($masterItem->VALARM as $valarm) {
-				$masterAlarms[] = $this->getAlarmHash($valarm);
-			}
-
-			try {
-				$iterator = new EventIterator($vevents, $uid);
-			} catch (NoInstancesException $e) {
-				// This event is recurring, but it doesn't have a single
-				// instance. We are skipping this event from the output
-				// entirely.
-				return;
-			}
-
-			while($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
-				$event = $iterator->getEventObject();
-
-				// Recurrence-exceptions are handled separately, so just ignore them here
-				if (\in_array($event, $recurrenceExceptions, true)) {
-					$iterator->next();
-					continue;
-				}
-
-				foreach($event->VALARM as $valarm) {
-					/** @var VAlarm $valarm */
-					$alarmHash = $this->getAlarmHash($valarm);
-					if (\in_array($alarmHash, $processedAlarms, true)) {
-						continue;
-					}
-
-					if (!\in_array((string) $valarm->ACTION, self::REMINDER_TYPES, true)) {
-						// Action allows x-name, we don't insert reminders
-						// into the database if they are not standard
-						$processedAlarms[] = $alarmHash;
-						continue;
-					}
-
-					$triggerTime = $valarm->getEffectiveTriggerTime();
-
-					// If effective trigger time is in the past
-					// just skip and generate for next event
-					$diff = $now->diff($triggerTime);
-					if ($diff->invert === 1) {
-						// If an absolute alarm is in the past,
-						// just add it to processedAlarms, so
-						// we don't extend till eternity
-						if (!$this->isAlarmRelative($valarm)) {
-							$processedAlarms[] = $alarmHash;
-						}
-
-						continue;
-					}
-
-					$alarms = $this->getRemindersForVAlarm($valarm, $objectData, $masterHash, $alarmHash, $isRecurring, false);
-					$this->writeRemindersToDatabase($alarms);
-					$processedAlarms[] = $alarmHash;
-				}
-
-				$iterator->next();
-			}
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 */
-	private function onCalendarObjectEdit(array $objectData):void {
-		// TODO - this can be vastly improved
-		//  - get cached reminders
-		//  - ...
-
-		$this->onCalendarObjectDelete($objectData);
-		$this->onCalendarObjectCreate($objectData);
-	}
-
-	/**
-	 * @param array $objectData
-	 */
-	private function onCalendarObjectDelete(array $objectData):void {
-		$this->backend->cleanRemindersForEvent((int) $objectData['id']);
-	}
-
-	/**
-	 * @param VAlarm $valarm
-	 * @param array $objectData
-	 * @param string|null $eventHash
-	 * @param string|null $alarmHash
-	 * @param bool $isRecurring
-	 * @param bool $isRecurrenceException
-	 * @return array
-	 */
-	private function getRemindersForVAlarm(VAlarm $valarm,
-										   array $objectData,
-										   string $eventHash=null,
-										   string $alarmHash=null,
-										   bool $isRecurring=false,
-										   bool $isRecurrenceException=false):array {
-		if ($eventHash === null) {
-			$eventHash = $this->getEventHash($valarm->parent);
-		}
-		if ($alarmHash === null) {
-			$alarmHash = $this->getAlarmHash($valarm);
-		}
-
-		$recurrenceId = $this->getEffectiveRecurrenceIdOfVEvent($valarm->parent);
-		$isRelative = $this->isAlarmRelative($valarm);
-		/** @var DateTimeImmutable $notificationDate */
-		$notificationDate = $valarm->getEffectiveTriggerTime();
-		$clonedNotificationDate = new \DateTime('now', $notificationDate->getTimezone());
-		$clonedNotificationDate->setTimestamp($notificationDate->getTimestamp());
-
-		$alarms = [];
-
-		$alarms[] = [
-			'calendar_id' => $objectData['calendarid'],
-			'object_id' => $objectData['id'],
-			'uid' => (string) $valarm->parent->UID,
-			'is_recurring' => $isRecurring,
-			'recurrence_id' => $recurrenceId,
-			'is_recurrence_exception' => $isRecurrenceException,
-			'event_hash' => $eventHash,
-			'alarm_hash' => $alarmHash,
-			'type' => (string) $valarm->ACTION,
-			'is_relative' => $isRelative,
-			'notification_date' => $notificationDate->getTimestamp(),
-			'is_repeat_based' => false,
-		];
-
-		$repeat = isset($valarm->REPEAT) ? (int) $valarm->REPEAT->getValue() : 0;
-		for($i = 0; $i < $repeat; $i++) {
-			if ($valarm->DURATION === null) {
-				continue;
-			}
-
-			$clonedNotificationDate->add($valarm->DURATION->getDateInterval());
-			$alarms[] = [
-				'calendar_id' => $objectData['calendarid'],
-				'object_id' => $objectData['id'],
-				'uid' => (string) $valarm->parent->UID,
-				'is_recurring' => $isRecurring,
-				'recurrence_id' => $recurrenceId,
-				'is_recurrence_exception' => $isRecurrenceException,
-				'event_hash' => $eventHash,
-				'alarm_hash' => $alarmHash,
-				'type' => (string) $valarm->ACTION,
-				'is_relative' => $isRelative,
-				'notification_date' => $clonedNotificationDate->getTimestamp(),
-				'is_repeat_based' => true,
-			];
-		}
-
-		return $alarms;
-	}
-
-	/**
-	 * @param array $reminders
-	 */
-	private function writeRemindersToDatabase(array $reminders): void {
-		foreach($reminders as $reminder) {
-			$this->backend->insertReminder(
-				(int) $reminder['calendar_id'],
-				(int) $reminder['object_id'],
-				$reminder['uid'],
-				$reminder['is_recurring'],
-				(int) $reminder['recurrence_id'],
-				$reminder['is_recurrence_exception'],
-				$reminder['event_hash'],
-				$reminder['alarm_hash'],
-				$reminder['type'],
-				$reminder['is_relative'],
-				(int) $reminder['notification_date'],
-				$reminder['is_repeat_based']
-			);
-		}
-	}
-
-	/**
-	 * @param array $reminder
-	 * @param VEvent $vevent
-	 */
-	private function deleteOrProcessNext(array $reminder,
-										 VObject\Component\VEvent $vevent):void {
-		if ($reminder['is_repeat_based'] ||
-			!$reminder['is_recurring'] ||
-			!$reminder['is_relative'] ||
-			$reminder['is_recurrence_exception']) {
-
-			$this->backend->removeReminder($reminder['id']);
-			return;
-		}
-
-		$vevents = $this->getAllVEventsFromVCalendar($vevent->parent);
-		$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
-		$now = $this->timeFactory->getDateTime();
-
-		try {
-			$iterator = new EventIterator($vevents, $reminder['uid']);
-		} catch (NoInstancesException $e) {
-			// This event is recurring, but it doesn't have a single
-			// instance. We are skipping this event from the output
-			// entirely.
-			return;
-		}
-
-		while($iterator->valid()) {
-			$event = $iterator->getEventObject();
-
-			// Recurrence-exceptions are handled separately, so just ignore them here
-			if (\in_array($event, $recurrenceExceptions, true)) {
-				$iterator->next();
-				continue;
-			}
-
-			$recurrenceId = $this->getEffectiveRecurrenceIdOfVEvent($event);
-			if ($reminder['recurrence_id'] >= $recurrenceId) {
-				$iterator->next();
-				continue;
-			}
-
-			foreach($event->VALARM as $valarm) {
-				/** @var VAlarm $valarm */
-				$alarmHash = $this->getAlarmHash($valarm);
-				if ($alarmHash !== $reminder['alarm_hash']) {
-					continue;
-				}
-
-				$triggerTime = $valarm->getEffectiveTriggerTime();
-
-				// If effective trigger time is in the past
-				// just skip and generate for next event
-				$diff = $now->diff($triggerTime);
-				if ($diff->invert === 1) {
-					continue;
-				}
-
-				$this->backend->removeReminder($reminder['id']);
-				$alarms = $this->getRemindersForVAlarm($valarm, [
-					'calendarid' => $reminder['calendar_id'],
-					'id' => $reminder['object_id'],
-				], $reminder['event_hash'], $alarmHash, true, false);
-				$this->writeRemindersToDatabase($alarms);
-
-				// Abort generating reminders after creating one successfully
-				return;
-			}
-
-			$iterator->next();
-		}
-
-		$this->backend->removeReminder($reminder['id']);
-	}
-
-	/**
-	 * @param int $calendarId
-	 * @return IUser[]
-	 */
-	private function getAllUsersWithWriteAccessToCalendar(int $calendarId):array {
-		$shares = $this->caldavBackend->getShares($calendarId);
-
-		$users = [];
-		$userIds = [];
-		$groups = [];
-		foreach ($shares as $share) {
-			// Only consider writable shares
-			if ($share['readOnly']) {
-				continue;
-			}
-
-			$principal = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($principal[1] === 'users') {
-				$user = $this->userManager->get($principal[2]);
-				if ($user) {
-					$users[] = $user;
-					$userIds[] = $principal[2];
-				}
-			} else if ($principal[1] === 'groups') {
-				$groups[] = $principal[2];
-			}
-		}
-
-		foreach ($groups as $gid) {
-			$group = $this->groupManager->get($gid);
-			if ($group instanceof IGroup) {
-				foreach ($group->getUsers() as $user) {
-					if (!\in_array($user->getUID(), $userIds, true)) {
-						$users[] = $user;
-						$userIds[] = $user->getUID();
-					}
-				}
-			}
-		}
-
-		return $users;
-	}
-
-	/**
-	 * Gets a hash of the event.
-	 * If the hash changes, we have to update all relative alarms.
-	 *
-	 * @param VEvent $vevent
-	 * @return string
-	 */
-	private function getEventHash(VEvent $vevent):string {
-		$properties = [
-			(string) $vevent->DTSTART->serialize(),
-		];
-
-		if ($vevent->DTEND) {
-			$properties[] = (string) $vevent->DTEND->serialize();
-		}
-		if ($vevent->DURATION) {
-			$properties[] = (string) $vevent->DURATION->serialize();
-		}
-		if ($vevent->{'RECURRENCE-ID'}) {
-			$properties[] = (string) $vevent->{'RECURRENCE-ID'}->serialize();
-		}
-		if ($vevent->RRULE) {
-			$properties[] = (string) $vevent->RRULE->serialize();
-		}
-		if ($vevent->EXDATE) {
-			$properties[] = (string) $vevent->EXDATE->serialize();
-		}
-		if ($vevent->RDATE) {
-			$properties[] = (string) $vevent->RDATE->serialize();
-		}
-
-		return md5(implode('::', $properties));
-	}
-
-	/**
-	 * Gets a hash of the alarm.
-	 * If the hash changes, we have to update oc_dav_reminders.
-	 *
-	 * @param VAlarm $valarm
-	 * @return string
-	 */
-	private function getAlarmHash(VAlarm $valarm):string {
-		$properties = [
-			(string) $valarm->ACTION->serialize(),
-			(string) $valarm->TRIGGER->serialize(),
-		];
-
-		if ($valarm->DURATION) {
-			$properties[] = (string) $valarm->DURATION->serialize();
-		}
-		if ($valarm->REPEAT) {
-			$properties[] = (string) $valarm->REPEAT->serialize();
-		}
-
-		return md5(implode('::', $properties));
-	}
-
-	/**
-	 * @param VObject\Component\VCalendar $vcalendar
-	 * @param int $recurrenceId
-	 * @param bool $isRecurrenceException
-	 * @return VEvent|null
-	 */
-	private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
-											 int $recurrenceId,
-											 bool $isRecurrenceException):?VEvent {
-		$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
-		if (count($vevents) === 0) {
-			return null;
-		}
-
-		$uid = (string) $vevents[0]->UID;
-		$recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
-		$masterItem = $this->getMasterItemFromListOfVEvents($vevents);
-
-		// Handle recurrence-exceptions first, because recurrence-expansion is expensive
-		if ($isRecurrenceException) {
-			foreach($recurrenceExceptions as $recurrenceException) {
-				if ($this->getEffectiveRecurrenceIdOfVEvent($recurrenceException) === $recurrenceId) {
-					return $recurrenceException;
-				}
-			}
-
-			return null;
-		}
-
-		if ($masterItem) {
-			try {
-				$iterator = new EventIterator($vevents, $uid);
-			} catch (NoInstancesException $e) {
-				// This event is recurring, but it doesn't have a single
-				// instance. We are skipping this event from the output
-				// entirely.
-				return null;
-			}
-
-			while ($iterator->valid()) {
-				$event = $iterator->getEventObject();
-
-				// Recurrence-exceptions are handled separately, so just ignore them here
-				if (\in_array($event, $recurrenceExceptions, true)) {
-					$iterator->next();
-					continue;
-				}
-
-				if ($this->getEffectiveRecurrenceIdOfVEvent($event) === $recurrenceId) {
-					return $event;
-				}
-
-				$iterator->next();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return string
-	 */
-	private function getStatusOfEvent(VEvent $vevent):string {
-		if ($vevent->STATUS) {
-			return (string) $vevent->STATUS;
-		}
-
-		// Doesn't say so in the standard,
-		// but we consider events without a status
-		// to be confirmed
-		return 'CONFIRMED';
-	}
-
-	/**
-	 * @param VObject\Component\VEvent $vevent
-	 * @return bool
-	 */
-	private function wasEventCancelled(VObject\Component\VEvent $vevent):bool {
-		return $this->getStatusOfEvent($vevent) === 'CANCELLED';
-	}
-
-	/**
-	 * @param string $calendarData
-	 * @return VObject\Component\VCalendar|null
-	 */
-	private function parseCalendarData(string $calendarData):?VObject\Component\VCalendar {
-		try {
-			return VObject\Reader::read($calendarData,
-				VObject\Reader::OPTION_FORGIVING);
-		} catch(ParseException $ex) {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return IUser|null
-	 */
-	private function getUserFromPrincipalURI(string $principalUri):?IUser {
-		if (!$principalUri) {
-			return null;
-		}
-
-		if (stripos($principalUri, 'principals/users/') !== 0) {
-			return null;
-		}
-
-		$userId = substr($principalUri, 17);
-		return $this->userManager->get($userId);
-	}
-
-	/**
-	 * @param VObject\Component\VCalendar $vcalendar
-	 * @return VObject\Component\VEvent[]
-	 */
-	private function getAllVEventsFromVCalendar(VObject\Component\VCalendar $vcalendar):array {
-		$vevents = [];
-
-		foreach($vcalendar->children() as $child) {
-			if (!($child instanceof VObject\Component)) {
-				continue;
-			}
-
-			if ($child->name !== 'VEVENT') {
-				continue;
-			}
-
-			$vevents[] = $child;
-		}
-
-		return $vevents;
-	}
-
-	/**
-	 * @param array $vevents
-	 * @return VObject\Component\VEvent[]
-	 */
-	private function getRecurrenceExceptionFromListOfVEvents(array $vevents):array {
-		return array_values(array_filter($vevents, function(VEvent $vevent) {
-			return $vevent->{'RECURRENCE-ID'} !== null;
-		}));
-	}
-
-	/**
-	 * @param array $vevents
-	 * @return VEvent|null
-	 */
-	private function getMasterItemFromListOfVEvents(array $vevents):?VEvent {
-		$elements = array_values(array_filter($vevents, function(VEvent $vevent) {
-			return $vevent->{'RECURRENCE-ID'} === null;
-		}));
-
-		if (count($elements) === 0) {
-			return null;
-		}
-		if (count($elements) > 1) {
-			throw new \TypeError('Multiple master objects');
-		}
-
-		return $elements[0];
-	}
-
-	/**
-	 * @param VAlarm $valarm
-	 * @return bool
-	 */
-	private function isAlarmRelative(VAlarm $valarm):bool {
-		$trigger = $valarm->TRIGGER;
-		return $trigger instanceof VObject\Property\ICalendar\Duration;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return int
-	 */
-	private function getEffectiveRecurrenceIdOfVEvent(VEvent $vevent):int {
-		if (isset($vevent->{'RECURRENCE-ID'})) {
-			return $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp();
-		}
-
-		return $vevent->DTSTART->getDateTime()->getTimestamp();
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return bool
-	 */
-	private function isRecurring(VEvent $vevent):bool {
-		return isset($vevent->RRULE) || isset($vevent->RDATE);
-	}
+    /** @var Backend */
+    private $backend;
+
+    /** @var NotificationProviderManager */
+    private $notificationProviderManager;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var CalDavBackend */
+    private $caldavBackend;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    public const REMINDER_TYPE_EMAIL = 'EMAIL';
+    public const REMINDER_TYPE_DISPLAY = 'DISPLAY';
+    public const REMINDER_TYPE_AUDIO = 'AUDIO';
+
+    /**
+     * @var String[]
+     *
+     * Official RFC5545 reminder types
+     */
+    public const REMINDER_TYPES = [
+        self::REMINDER_TYPE_EMAIL,
+        self::REMINDER_TYPE_DISPLAY,
+        self::REMINDER_TYPE_AUDIO
+    ];
+
+    /**
+     * ReminderService constructor.
+     *
+     * @param Backend $backend
+     * @param NotificationProviderManager $notificationProviderManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param CalDavBackend $caldavBackend
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(Backend $backend,
+                                NotificationProviderManager $notificationProviderManager,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                CalDavBackend $caldavBackend,
+                                ITimeFactory $timeFactory) {
+        $this->backend = $backend;
+        $this->notificationProviderManager = $notificationProviderManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->caldavBackend = $caldavBackend;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * Process reminders to activate
+     *
+     * @throws NotificationProvider\ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function processReminders():void {
+        $reminders = $this->backend->getRemindersToProcess();
+
+        foreach($reminders as $reminder) {
+            $vcalendar = $this->parseCalendarData($reminder['calendardata']);
+            if (!$vcalendar) {
+                $this->backend->removeReminder($reminder['id']);
+                continue;
+            }
+
+            $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);
+            if (!$vevent) {
+                $this->backend->removeReminder($reminder['id']);
+                continue;
+            }
+
+            if ($this->wasEventCancelled($vevent)) {
+                $this->deleteOrProcessNext($reminder, $vevent);
+                continue;
+            }
+
+            if (!$this->notificationProviderManager->hasProvider($reminder['type'])) {
+                $this->deleteOrProcessNext($reminder, $vevent);
+                continue;
+            }
+
+            $users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
+            $user = $this->getUserFromPrincipalURI($reminder['principaluri']);
+            if ($user) {
+                $users[] = $user;
+            }
+
+            $notificationProvider = $this->notificationProviderManager->getProvider($reminder['type']);
+            $notificationProvider->send($vevent, $reminder['displayname'], $users);
+
+            $this->deleteOrProcessNext($reminder, $vevent);
+        }
+    }
+
+    /**
+     * @param string $action
+     * @param array $objectData
+     * @throws VObject\InvalidDataException
+     */
+    public function onTouchCalendarObject(string $action,
+                                            array $objectData):void {
+        // We only support VEvents for now
+        if (strcasecmp($objectData['component'], 'vevent') !== 0) {
+            return;
+        }
+
+        switch($action) {
+            case '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject':
+                $this->onCalendarObjectCreate($objectData);
+                break;
+
+            case '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject':
+                $this->onCalendarObjectEdit($objectData);
+                break;
+
+            case '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject':
+                $this->onCalendarObjectDelete($objectData);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param array $objectData
+     */
+    private function onCalendarObjectCreate(array $objectData):void {
+        /** @var VObject\Component\VCalendar $vcalendar */
+        $vcalendar = $this->parseCalendarData($objectData['calendardata']);
+        if (!$vcalendar) {
+            return;
+        }
+
+        $vevents = $this->getAllVEventsFromVCalendar($vcalendar);
+        if (count($vevents) === 0) {
+            return;
+        }
+
+        $uid = (string) $vevents[0]->UID;
+        $recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
+        $masterItem = $this->getMasterItemFromListOfVEvents($vevents);
+        $now = $this->timeFactory->getDateTime();
+        $isRecurring = $masterItem ? $this->isRecurring($masterItem) : false;
+
+        foreach($recurrenceExceptions as $recurrenceException) {
+            $eventHash = $this->getEventHash($recurrenceException);
+
+            foreach($recurrenceException->VALARM as $valarm) {
+                /** @var VAlarm $valarm */
+                $alarmHash = $this->getAlarmHash($valarm);
+                $triggerTime = $valarm->getEffectiveTriggerTime();
+                $diff = $now->diff($triggerTime);
+                if ($diff->invert === 1) {
+                    continue;
+                }
+
+                $alarms = $this->getRemindersForVAlarm($valarm, $objectData,
+                    $eventHash, $alarmHash, true, true);
+                $this->writeRemindersToDatabase($alarms);
+            }
+        }
+
+        if ($masterItem) {
+            $processedAlarms = [];
+            $masterAlarms = [];
+            $masterHash = $this->getEventHash($masterItem);
+
+            foreach($masterItem->VALARM as $valarm) {
+                $masterAlarms[] = $this->getAlarmHash($valarm);
+            }
+
+            try {
+                $iterator = new EventIterator($vevents, $uid);
+            } catch (NoInstancesException $e) {
+                // This event is recurring, but it doesn't have a single
+                // instance. We are skipping this event from the output
+                // entirely.
+                return;
+            }
+
+            while($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
+                $event = $iterator->getEventObject();
+
+                // Recurrence-exceptions are handled separately, so just ignore them here
+                if (\in_array($event, $recurrenceExceptions, true)) {
+                    $iterator->next();
+                    continue;
+                }
+
+                foreach($event->VALARM as $valarm) {
+                    /** @var VAlarm $valarm */
+                    $alarmHash = $this->getAlarmHash($valarm);
+                    if (\in_array($alarmHash, $processedAlarms, true)) {
+                        continue;
+                    }
+
+                    if (!\in_array((string) $valarm->ACTION, self::REMINDER_TYPES, true)) {
+                        // Action allows x-name, we don't insert reminders
+                        // into the database if they are not standard
+                        $processedAlarms[] = $alarmHash;
+                        continue;
+                    }
+
+                    $triggerTime = $valarm->getEffectiveTriggerTime();
+
+                    // If effective trigger time is in the past
+                    // just skip and generate for next event
+                    $diff = $now->diff($triggerTime);
+                    if ($diff->invert === 1) {
+                        // If an absolute alarm is in the past,
+                        // just add it to processedAlarms, so
+                        // we don't extend till eternity
+                        if (!$this->isAlarmRelative($valarm)) {
+                            $processedAlarms[] = $alarmHash;
+                        }
+
+                        continue;
+                    }
+
+                    $alarms = $this->getRemindersForVAlarm($valarm, $objectData, $masterHash, $alarmHash, $isRecurring, false);
+                    $this->writeRemindersToDatabase($alarms);
+                    $processedAlarms[] = $alarmHash;
+                }
+
+                $iterator->next();
+            }
+        }
+    }
+
+    /**
+     * @param array $objectData
+     */
+    private function onCalendarObjectEdit(array $objectData):void {
+        // TODO - this can be vastly improved
+        //  - get cached reminders
+        //  - ...
+
+        $this->onCalendarObjectDelete($objectData);
+        $this->onCalendarObjectCreate($objectData);
+    }
+
+    /**
+     * @param array $objectData
+     */
+    private function onCalendarObjectDelete(array $objectData):void {
+        $this->backend->cleanRemindersForEvent((int) $objectData['id']);
+    }
+
+    /**
+     * @param VAlarm $valarm
+     * @param array $objectData
+     * @param string|null $eventHash
+     * @param string|null $alarmHash
+     * @param bool $isRecurring
+     * @param bool $isRecurrenceException
+     * @return array
+     */
+    private function getRemindersForVAlarm(VAlarm $valarm,
+                                            array $objectData,
+                                            string $eventHash=null,
+                                            string $alarmHash=null,
+                                            bool $isRecurring=false,
+                                            bool $isRecurrenceException=false):array {
+        if ($eventHash === null) {
+            $eventHash = $this->getEventHash($valarm->parent);
+        }
+        if ($alarmHash === null) {
+            $alarmHash = $this->getAlarmHash($valarm);
+        }
+
+        $recurrenceId = $this->getEffectiveRecurrenceIdOfVEvent($valarm->parent);
+        $isRelative = $this->isAlarmRelative($valarm);
+        /** @var DateTimeImmutable $notificationDate */
+        $notificationDate = $valarm->getEffectiveTriggerTime();
+        $clonedNotificationDate = new \DateTime('now', $notificationDate->getTimezone());
+        $clonedNotificationDate->setTimestamp($notificationDate->getTimestamp());
+
+        $alarms = [];
+
+        $alarms[] = [
+            'calendar_id' => $objectData['calendarid'],
+            'object_id' => $objectData['id'],
+            'uid' => (string) $valarm->parent->UID,
+            'is_recurring' => $isRecurring,
+            'recurrence_id' => $recurrenceId,
+            'is_recurrence_exception' => $isRecurrenceException,
+            'event_hash' => $eventHash,
+            'alarm_hash' => $alarmHash,
+            'type' => (string) $valarm->ACTION,
+            'is_relative' => $isRelative,
+            'notification_date' => $notificationDate->getTimestamp(),
+            'is_repeat_based' => false,
+        ];
+
+        $repeat = isset($valarm->REPEAT) ? (int) $valarm->REPEAT->getValue() : 0;
+        for($i = 0; $i < $repeat; $i++) {
+            if ($valarm->DURATION === null) {
+                continue;
+            }
+
+            $clonedNotificationDate->add($valarm->DURATION->getDateInterval());
+            $alarms[] = [
+                'calendar_id' => $objectData['calendarid'],
+                'object_id' => $objectData['id'],
+                'uid' => (string) $valarm->parent->UID,
+                'is_recurring' => $isRecurring,
+                'recurrence_id' => $recurrenceId,
+                'is_recurrence_exception' => $isRecurrenceException,
+                'event_hash' => $eventHash,
+                'alarm_hash' => $alarmHash,
+                'type' => (string) $valarm->ACTION,
+                'is_relative' => $isRelative,
+                'notification_date' => $clonedNotificationDate->getTimestamp(),
+                'is_repeat_based' => true,
+            ];
+        }
+
+        return $alarms;
+    }
+
+    /**
+     * @param array $reminders
+     */
+    private function writeRemindersToDatabase(array $reminders): void {
+        foreach($reminders as $reminder) {
+            $this->backend->insertReminder(
+                (int) $reminder['calendar_id'],
+                (int) $reminder['object_id'],
+                $reminder['uid'],
+                $reminder['is_recurring'],
+                (int) $reminder['recurrence_id'],
+                $reminder['is_recurrence_exception'],
+                $reminder['event_hash'],
+                $reminder['alarm_hash'],
+                $reminder['type'],
+                $reminder['is_relative'],
+                (int) $reminder['notification_date'],
+                $reminder['is_repeat_based']
+            );
+        }
+    }
+
+    /**
+     * @param array $reminder
+     * @param VEvent $vevent
+     */
+    private function deleteOrProcessNext(array $reminder,
+                                            VObject\Component\VEvent $vevent):void {
+        if ($reminder['is_repeat_based'] ||
+            !$reminder['is_recurring'] ||
+            !$reminder['is_relative'] ||
+            $reminder['is_recurrence_exception']) {
+
+            $this->backend->removeReminder($reminder['id']);
+            return;
+        }
+
+        $vevents = $this->getAllVEventsFromVCalendar($vevent->parent);
+        $recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
+        $now = $this->timeFactory->getDateTime();
+
+        try {
+            $iterator = new EventIterator($vevents, $reminder['uid']);
+        } catch (NoInstancesException $e) {
+            // This event is recurring, but it doesn't have a single
+            // instance. We are skipping this event from the output
+            // entirely.
+            return;
+        }
+
+        while($iterator->valid()) {
+            $event = $iterator->getEventObject();
+
+            // Recurrence-exceptions are handled separately, so just ignore them here
+            if (\in_array($event, $recurrenceExceptions, true)) {
+                $iterator->next();
+                continue;
+            }
+
+            $recurrenceId = $this->getEffectiveRecurrenceIdOfVEvent($event);
+            if ($reminder['recurrence_id'] >= $recurrenceId) {
+                $iterator->next();
+                continue;
+            }
+
+            foreach($event->VALARM as $valarm) {
+                /** @var VAlarm $valarm */
+                $alarmHash = $this->getAlarmHash($valarm);
+                if ($alarmHash !== $reminder['alarm_hash']) {
+                    continue;
+                }
+
+                $triggerTime = $valarm->getEffectiveTriggerTime();
+
+                // If effective trigger time is in the past
+                // just skip and generate for next event
+                $diff = $now->diff($triggerTime);
+                if ($diff->invert === 1) {
+                    continue;
+                }
+
+                $this->backend->removeReminder($reminder['id']);
+                $alarms = $this->getRemindersForVAlarm($valarm, [
+                    'calendarid' => $reminder['calendar_id'],
+                    'id' => $reminder['object_id'],
+                ], $reminder['event_hash'], $alarmHash, true, false);
+                $this->writeRemindersToDatabase($alarms);
+
+                // Abort generating reminders after creating one successfully
+                return;
+            }
+
+            $iterator->next();
+        }
+
+        $this->backend->removeReminder($reminder['id']);
+    }
+
+    /**
+     * @param int $calendarId
+     * @return IUser[]
+     */
+    private function getAllUsersWithWriteAccessToCalendar(int $calendarId):array {
+        $shares = $this->caldavBackend->getShares($calendarId);
+
+        $users = [];
+        $userIds = [];
+        $groups = [];
+        foreach ($shares as $share) {
+            // Only consider writable shares
+            if ($share['readOnly']) {
+                continue;
+            }
+
+            $principal = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($principal[1] === 'users') {
+                $user = $this->userManager->get($principal[2]);
+                if ($user) {
+                    $users[] = $user;
+                    $userIds[] = $principal[2];
+                }
+            } else if ($principal[1] === 'groups') {
+                $groups[] = $principal[2];
+            }
+        }
+
+        foreach ($groups as $gid) {
+            $group = $this->groupManager->get($gid);
+            if ($group instanceof IGroup) {
+                foreach ($group->getUsers() as $user) {
+                    if (!\in_array($user->getUID(), $userIds, true)) {
+                        $users[] = $user;
+                        $userIds[] = $user->getUID();
+                    }
+                }
+            }
+        }
+
+        return $users;
+    }
+
+    /**
+     * Gets a hash of the event.
+     * If the hash changes, we have to update all relative alarms.
+     *
+     * @param VEvent $vevent
+     * @return string
+     */
+    private function getEventHash(VEvent $vevent):string {
+        $properties = [
+            (string) $vevent->DTSTART->serialize(),
+        ];
+
+        if ($vevent->DTEND) {
+            $properties[] = (string) $vevent->DTEND->serialize();
+        }
+        if ($vevent->DURATION) {
+            $properties[] = (string) $vevent->DURATION->serialize();
+        }
+        if ($vevent->{'RECURRENCE-ID'}) {
+            $properties[] = (string) $vevent->{'RECURRENCE-ID'}->serialize();
+        }
+        if ($vevent->RRULE) {
+            $properties[] = (string) $vevent->RRULE->serialize();
+        }
+        if ($vevent->EXDATE) {
+            $properties[] = (string) $vevent->EXDATE->serialize();
+        }
+        if ($vevent->RDATE) {
+            $properties[] = (string) $vevent->RDATE->serialize();
+        }
+
+        return md5(implode('::', $properties));
+    }
+
+    /**
+     * Gets a hash of the alarm.
+     * If the hash changes, we have to update oc_dav_reminders.
+     *
+     * @param VAlarm $valarm
+     * @return string
+     */
+    private function getAlarmHash(VAlarm $valarm):string {
+        $properties = [
+            (string) $valarm->ACTION->serialize(),
+            (string) $valarm->TRIGGER->serialize(),
+        ];
+
+        if ($valarm->DURATION) {
+            $properties[] = (string) $valarm->DURATION->serialize();
+        }
+        if ($valarm->REPEAT) {
+            $properties[] = (string) $valarm->REPEAT->serialize();
+        }
+
+        return md5(implode('::', $properties));
+    }
+
+    /**
+     * @param VObject\Component\VCalendar $vcalendar
+     * @param int $recurrenceId
+     * @param bool $isRecurrenceException
+     * @return VEvent|null
+     */
+    private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
+                                                int $recurrenceId,
+                                                bool $isRecurrenceException):?VEvent {
+        $vevents = $this->getAllVEventsFromVCalendar($vcalendar);
+        if (count($vevents) === 0) {
+            return null;
+        }
+
+        $uid = (string) $vevents[0]->UID;
+        $recurrenceExceptions = $this->getRecurrenceExceptionFromListOfVEvents($vevents);
+        $masterItem = $this->getMasterItemFromListOfVEvents($vevents);
+
+        // Handle recurrence-exceptions first, because recurrence-expansion is expensive
+        if ($isRecurrenceException) {
+            foreach($recurrenceExceptions as $recurrenceException) {
+                if ($this->getEffectiveRecurrenceIdOfVEvent($recurrenceException) === $recurrenceId) {
+                    return $recurrenceException;
+                }
+            }
+
+            return null;
+        }
+
+        if ($masterItem) {
+            try {
+                $iterator = new EventIterator($vevents, $uid);
+            } catch (NoInstancesException $e) {
+                // This event is recurring, but it doesn't have a single
+                // instance. We are skipping this event from the output
+                // entirely.
+                return null;
+            }
+
+            while ($iterator->valid()) {
+                $event = $iterator->getEventObject();
+
+                // Recurrence-exceptions are handled separately, so just ignore them here
+                if (\in_array($event, $recurrenceExceptions, true)) {
+                    $iterator->next();
+                    continue;
+                }
+
+                if ($this->getEffectiveRecurrenceIdOfVEvent($event) === $recurrenceId) {
+                    return $event;
+                }
+
+                $iterator->next();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return string
+     */
+    private function getStatusOfEvent(VEvent $vevent):string {
+        if ($vevent->STATUS) {
+            return (string) $vevent->STATUS;
+        }
+
+        // Doesn't say so in the standard,
+        // but we consider events without a status
+        // to be confirmed
+        return 'CONFIRMED';
+    }
+
+    /**
+     * @param VObject\Component\VEvent $vevent
+     * @return bool
+     */
+    private function wasEventCancelled(VObject\Component\VEvent $vevent):bool {
+        return $this->getStatusOfEvent($vevent) === 'CANCELLED';
+    }
+
+    /**
+     * @param string $calendarData
+     * @return VObject\Component\VCalendar|null
+     */
+    private function parseCalendarData(string $calendarData):?VObject\Component\VCalendar {
+        try {
+            return VObject\Reader::read($calendarData,
+                VObject\Reader::OPTION_FORGIVING);
+        } catch(ParseException $ex) {
+            return null;
+        }
+    }
+
+    /**
+     * @param string $principalUri
+     * @return IUser|null
+     */
+    private function getUserFromPrincipalURI(string $principalUri):?IUser {
+        if (!$principalUri) {
+            return null;
+        }
+
+        if (stripos($principalUri, 'principals/users/') !== 0) {
+            return null;
+        }
+
+        $userId = substr($principalUri, 17);
+        return $this->userManager->get($userId);
+    }
+
+    /**
+     * @param VObject\Component\VCalendar $vcalendar
+     * @return VObject\Component\VEvent[]
+     */
+    private function getAllVEventsFromVCalendar(VObject\Component\VCalendar $vcalendar):array {
+        $vevents = [];
+
+        foreach($vcalendar->children() as $child) {
+            if (!($child instanceof VObject\Component)) {
+                continue;
+            }
+
+            if ($child->name !== 'VEVENT') {
+                continue;
+            }
+
+            $vevents[] = $child;
+        }
+
+        return $vevents;
+    }
+
+    /**
+     * @param array $vevents
+     * @return VObject\Component\VEvent[]
+     */
+    private function getRecurrenceExceptionFromListOfVEvents(array $vevents):array {
+        return array_values(array_filter($vevents, function(VEvent $vevent) {
+            return $vevent->{'RECURRENCE-ID'} !== null;
+        }));
+    }
+
+    /**
+     * @param array $vevents
+     * @return VEvent|null
+     */
+    private function getMasterItemFromListOfVEvents(array $vevents):?VEvent {
+        $elements = array_values(array_filter($vevents, function(VEvent $vevent) {
+            return $vevent->{'RECURRENCE-ID'} === null;
+        }));
+
+        if (count($elements) === 0) {
+            return null;
+        }
+        if (count($elements) > 1) {
+            throw new \TypeError('Multiple master objects');
+        }
+
+        return $elements[0];
+    }
+
+    /**
+     * @param VAlarm $valarm
+     * @return bool
+     */
+    private function isAlarmRelative(VAlarm $valarm):bool {
+        $trigger = $valarm->TRIGGER;
+        return $trigger instanceof VObject\Property\ICalendar\Duration;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return int
+     */
+    private function getEffectiveRecurrenceIdOfVEvent(VEvent $vevent):int {
+        if (isset($vevent->{'RECURRENCE-ID'})) {
+            return $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp();
+        }
+
+        return $vevent->DTSTART->getDateTime()->getTimestamp();
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return bool
+     */
+    private function isRecurring(VEvent $vevent):bool {
+        return isset($vevent->RRULE) || isset($vevent->RDATE);
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -106,7 +106,7 @@ 
 	public function processReminders():void {
 		$reminders = $this->backend->getRemindersToProcess();
 
-		foreach($reminders as $reminder) {
+		foreach ($reminders as $reminder) {
 			$vcalendar = $this->parseCalendarData($reminder['calendardata']);
 			if (!$vcalendar) {
 				$this->backend->removeReminder($reminder['id']);
@@ -154,7 +154,7 @@ 
 			return;
 		}
 
-		switch($action) {
+		switch ($action) {
 			case '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject':
 				$this->onCalendarObjectCreate($objectData);
 				break;
@@ -193,10 +193,10 @@ 
 		$now = $this->timeFactory->getDateTime();
 		$isRecurring = $masterItem ? $this->isRecurring($masterItem) : false;
 
-		foreach($recurrenceExceptions as $recurrenceException) {
+		foreach ($recurrenceExceptions as $recurrenceException) {
 			$eventHash = $this->getEventHash($recurrenceException);
 
-			foreach($recurrenceException->VALARM as $valarm) {
+			foreach ($recurrenceException->VALARM as $valarm) {
 				/** @var VAlarm $valarm */
 				$alarmHash = $this->getAlarmHash($valarm);
 				$triggerTime = $valarm->getEffectiveTriggerTime();
@@ -216,7 +216,7 @@ 
 			$masterAlarms = [];
 			$masterHash = $this->getEventHash($masterItem);
 
-			foreach($masterItem->VALARM as $valarm) {
+			foreach ($masterItem->VALARM as $valarm) {
 				$masterAlarms[] = $this->getAlarmHash($valarm);
 			}
 
@@ -229,7 +229,7 @@ 
 				return;
 			}
 
-			while($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
+			while ($iterator->valid() && count($processedAlarms) < count($masterAlarms)) {
 				$event = $iterator->getEventObject();
 
 				// Recurrence-exceptions are handled separately, so just ignore them here
@@ -238,7 +238,7 @@ 
 					continue;
 				}
 
-				foreach($event->VALARM as $valarm) {
+				foreach ($event->VALARM as $valarm) {
 					/** @var VAlarm $valarm */
 					$alarmHash = $this->getAlarmHash($valarm);
 					if (\in_array($alarmHash, $processedAlarms, true)) {
@@ -308,10 +308,10 @@ 
 	 */
 	private function getRemindersForVAlarm(VAlarm $valarm,
 										   array $objectData,
-										   string $eventHash=null,
-										   string $alarmHash=null,
-										   bool $isRecurring=false,
-										   bool $isRecurrenceException=false):array {
+										   string $eventHash = null,
+										   string $alarmHash = null,
+										   bool $isRecurring = false,
+										   bool $isRecurrenceException = false):array {
 		if ($eventHash === null) {
 			$eventHash = $this->getEventHash($valarm->parent);
 		}
@@ -344,7 +344,7 @@ 
 		];
 
 		$repeat = isset($valarm->REPEAT) ? (int) $valarm->REPEAT->getValue() : 0;
-		for($i = 0; $i < $repeat; $i++) {
+		for ($i = 0; $i < $repeat; $i++) {
 			if ($valarm->DURATION === null) {
 				continue;
 			}
@@ -373,7 +373,7 @@ 
 	 * @param array $reminders
 	 */
 	private function writeRemindersToDatabase(array $reminders): void {
-		foreach($reminders as $reminder) {
+		foreach ($reminders as $reminder) {
 			$this->backend->insertReminder(
 				(int) $reminder['calendar_id'],
 				(int) $reminder['object_id'],
@@ -419,7 +419,7 @@ 
 			return;
 		}
 
-		while($iterator->valid()) {
+		while ($iterator->valid()) {
 			$event = $iterator->getEventObject();
 
 			// Recurrence-exceptions are handled separately, so just ignore them here
@@ -434,7 +434,7 @@ 
 				continue;
 			}
 
-			foreach($event->VALARM as $valarm) {
+			foreach ($event->VALARM as $valarm) {
 				/** @var VAlarm $valarm */
 				$alarmHash = $this->getAlarmHash($valarm);
 				if ($alarmHash !== $reminder['alarm_hash']) {
@@ -575,7 +575,7 @@ 
 	 */
 	private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
 											 int $recurrenceId,
-											 bool $isRecurrenceException):?VEvent {
+											 bool $isRecurrenceException): ?VEvent {
 		$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
 		if (count($vevents) === 0) {
 			return null;
@@ -587,7 +587,7 @@ 
 
 		// Handle recurrence-exceptions first, because recurrence-expansion is expensive
 		if ($isRecurrenceException) {
-			foreach($recurrenceExceptions as $recurrenceException) {
+			foreach ($recurrenceExceptions as $recurrenceException) {
 				if ($this->getEffectiveRecurrenceIdOfVEvent($recurrenceException) === $recurrenceId) {
 					return $recurrenceException;
 				}
@@ -653,11 +653,11 @@ 
 	 * @param string $calendarData
 	 * @return VObject\Component\VCalendar|null
 	 */
-	private function parseCalendarData(string $calendarData):?VObject\Component\VCalendar {
+	private function parseCalendarData(string $calendarData): ?VObject\Component\VCalendar {
 		try {
 			return VObject\Reader::read($calendarData,
 				VObject\Reader::OPTION_FORGIVING);
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			return null;
 		}
 	}
@@ -666,7 +666,7 @@ 
 	 * @param string $principalUri
 	 * @return IUser|null
 	 */
-	private function getUserFromPrincipalURI(string $principalUri):?IUser {
+	private function getUserFromPrincipalURI(string $principalUri): ?IUser {
 		if (!$principalUri) {
 			return null;
 		}
@@ -686,7 +686,7 @@ 
 	private function getAllVEventsFromVCalendar(VObject\Component\VCalendar $vcalendar):array {
 		$vevents = [];
 
-		foreach($vcalendar->children() as $child) {
+		foreach ($vcalendar->children() as $child) {
 			if (!($child instanceof VObject\Component)) {
 				continue;
 			}
@@ -715,7 +715,7 @@ 
 	 * @param array $vevents
 	 * @return VEvent|null
 	 */
-	private function getMasterItemFromListOfVEvents(array $vevents):?VEvent {
+	private function getMasterItemFromListOfVEvents(array $vevents): ?VEvent {
 		$elements = array_values(array_filter($vevents, function(VEvent $vevent) {
 			return $vevent->{'RECURRENCE-ID'} === null;
 		}));

apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php

Indentation +42 added lines, -42 removed lines

@@ -31,51 +31,51 @@
  */
 class NotificationProviderManager {
 
-	/** @var INotificationProvider[] */
-	private $providers = [];
+    /** @var INotificationProvider[] */
+    private $providers = [];
 
-	/**
-	 * Checks whether a provider for a given ACTION exists
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function hasProvider(string $type):bool {
-		return (\in_array($type, ReminderService::REMINDER_TYPES, true)
-			&& isset($this->providers[$type]));
-	}
+    /**
+     * Checks whether a provider for a given ACTION exists
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function hasProvider(string $type):bool {
+        return (\in_array($type, ReminderService::REMINDER_TYPES, true)
+            && isset($this->providers[$type]));
+    }
 
-	/**
-	 * Get provider for a given ACTION
-	 *
-	 * @param string $type
-	 * @return INotificationProvider
-	 * @throws NotificationProvider\ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function getProvider(string $type):INotificationProvider {
-		if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
-			if (isset($this->providers[$type])) {
-				return $this->providers[$type];
-			}
-			throw new NotificationProvider\ProviderNotAvailableException($type);
-		}
-		throw new NotificationTypeDoesNotExistException($type);
-	}
+    /**
+     * Get provider for a given ACTION
+     *
+     * @param string $type
+     * @return INotificationProvider
+     * @throws NotificationProvider\ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function getProvider(string $type):INotificationProvider {
+        if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
+            if (isset($this->providers[$type])) {
+                return $this->providers[$type];
+            }
+            throw new NotificationProvider\ProviderNotAvailableException($type);
+        }
+        throw new NotificationTypeDoesNotExistException($type);
+    }
 
-	/**
-	 * Registers a new provider
-	 *
-	 * @param string $providerClassName
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function registerProvider(string $providerClassName):void {
-		$provider = \OC::$server->query($providerClassName);
+    /**
+     * Registers a new provider
+     *
+     * @param string $providerClassName
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function registerProvider(string $providerClassName):void {
+        $provider = \OC::$server->query($providerClassName);
 
-		if (!$provider instanceof INotificationProvider) {
-			throw new \InvalidArgumentException('Invalid notification provider registered');
-		}
+        if (!$provider instanceof INotificationProvider) {
+            throw new \InvalidArgumentException('Invalid notification provider registered');
+        }
 
-		$this->providers[$provider::NOTIFICATION_TYPE] = $provider;
-	}
+        $this->providers[$provider::NOTIFICATION_TYPE] = $provider;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationTypeDoesNotExistException.php

Indentation +10 added lines, -10 removed lines

@@ -26,15 +26,15 @@
 
 class NotificationTypeDoesNotExistException extends \Exception {
 
-	/**
-	 * NotificationTypeDoesNotExistException constructor.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $type ReminderType
-	 */
-	public function __construct(string $type) {
-		parent::__construct("Type $type is not an accepted type of notification");
-	}
+    /**
+     * NotificationTypeDoesNotExistException constructor.
+     *
+     * @since 16.0.0
+     *
+     * @param string $type ReminderType
+     */
+    public function __construct(string $type) {
+        parent::__construct("Type $type is not an accepted type of notification");
+    }
 
 }

apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php

Indentation +142 added lines, -142 removed lines

@@ -43,146 +43,146 @@
  */
 abstract class AbstractProvider implements INotificationProvider  {
 
-	/** @var string */
-	public const NOTIFICATION_TYPE = '';
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var L10NFactory */
-	private $l10nFactory;
-
-	/** @var IL10N[] */
-	private $l10ns;
-
-	/** @var string */
-	private $fallbackLanguage;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param ILogger $logger
-	 * @param L10NFactory $l10nFactory
-	 * @param IConfig $config
-	 * @param IUrlGenerator $urlGenerator
-	 */
-	public function __construct(ILogger $logger,
-								L10NFactory $l10nFactory,
-								IURLGenerator $urlGenerator,
-								IConfig $config) {
-		$this->logger = $logger;
-		$this->l10nFactory = $l10nFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->config = $config;
-	}
-
-	/**
-	 * Send notification
-	 *
-	 * @param VEvent $vevent
-	 * @param string $calendarDisplayName
-	 * @param IUser[] $users
-	 * @return void
-	 */
-	abstract public function send(VEvent $vevent,
-						   string $calendarDisplayName,
-						   array $users=[]): void;
-
-	/**
-	 * @return string
-	 */
-	protected function getFallbackLanguage():string {
-		if ($this->fallbackLanguage) {
-			return $this->fallbackLanguage;
-		}
-
-		$fallbackLanguage = $this->l10nFactory->findLanguage();
-		$this->fallbackLanguage = $fallbackLanguage;
-
-		return $fallbackLanguage;
-	}
-
-	/**
-	 * @param string $lang
-	 * @return bool
-	 */
-	protected function hasL10NForLang(string $lang):bool {
-		return $this->l10nFactory->languageExists('dav', $lang);
-	}
-
-	/**
-	 * @param string $lang
-	 * @return IL10N
-	 */
-	protected function getL10NForLang(string $lang):IL10N {
-		if (isset($this->l10ns[$lang])) {
-			return $this->l10ns[$lang];
-		}
-
-		$l10n = $this->l10nFactory->get('dav', $lang);
-		$this->l10ns[$lang] = $l10n;
-
-		return $l10n;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return string
-	 */
-	private function getStatusOfEvent(VEvent $vevent):string {
-		if ($vevent->STATUS) {
-			return (string) $vevent->STATUS;
-		}
-
-		// Doesn't say so in the standard,
-		// but we consider events without a status
-		// to be confirmed
-		return 'CONFIRMED';
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return bool
-	 */
-	protected function isEventTentative(VEvent $vevent):bool {
-		return $this->getStatusOfEvent($vevent) === 'TENTATIVE';
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return Property\ICalendar\DateTime
-	 */
-	protected function getDTEndFromEvent(VEvent $vevent):Property\ICalendar\DateTime {
-		if (isset($vevent->DTEND)) {
-			return $vevent->DTEND;
-		}
-
-		if (isset($vevent->DURATION)) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-
-			return $end;
-		}
-
-		if (!$vevent->DTSTART->hasTime()) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-
-			return $end;
-		}
-
-		return clone $vevent->DTSTART;
-	}
+    /** @var string */
+    public const NOTIFICATION_TYPE = '';
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var L10NFactory */
+    private $l10nFactory;
+
+    /** @var IL10N[] */
+    private $l10ns;
+
+    /** @var string */
+    private $fallbackLanguage;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param ILogger $logger
+     * @param L10NFactory $l10nFactory
+     * @param IConfig $config
+     * @param IUrlGenerator $urlGenerator
+     */
+    public function __construct(ILogger $logger,
+                                L10NFactory $l10nFactory,
+                                IURLGenerator $urlGenerator,
+                                IConfig $config) {
+        $this->logger = $logger;
+        $this->l10nFactory = $l10nFactory;
+        $this->urlGenerator = $urlGenerator;
+        $this->config = $config;
+    }
+
+    /**
+     * Send notification
+     *
+     * @param VEvent $vevent
+     * @param string $calendarDisplayName
+     * @param IUser[] $users
+     * @return void
+     */
+    abstract public function send(VEvent $vevent,
+                            string $calendarDisplayName,
+                            array $users=[]): void;
+
+    /**
+     * @return string
+     */
+    protected function getFallbackLanguage():string {
+        if ($this->fallbackLanguage) {
+            return $this->fallbackLanguage;
+        }
+
+        $fallbackLanguage = $this->l10nFactory->findLanguage();
+        $this->fallbackLanguage = $fallbackLanguage;
+
+        return $fallbackLanguage;
+    }
+
+    /**
+     * @param string $lang
+     * @return bool
+     */
+    protected function hasL10NForLang(string $lang):bool {
+        return $this->l10nFactory->languageExists('dav', $lang);
+    }
+
+    /**
+     * @param string $lang
+     * @return IL10N
+     */
+    protected function getL10NForLang(string $lang):IL10N {
+        if (isset($this->l10ns[$lang])) {
+            return $this->l10ns[$lang];
+        }
+
+        $l10n = $this->l10nFactory->get('dav', $lang);
+        $this->l10ns[$lang] = $l10n;
+
+        return $l10n;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return string
+     */
+    private function getStatusOfEvent(VEvent $vevent):string {
+        if ($vevent->STATUS) {
+            return (string) $vevent->STATUS;
+        }
+
+        // Doesn't say so in the standard,
+        // but we consider events without a status
+        // to be confirmed
+        return 'CONFIRMED';
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return bool
+     */
+    protected function isEventTentative(VEvent $vevent):bool {
+        return $this->getStatusOfEvent($vevent) === 'TENTATIVE';
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return Property\ICalendar\DateTime
+     */
+    protected function getDTEndFromEvent(VEvent $vevent):Property\ICalendar\DateTime {
+        if (isset($vevent->DTEND)) {
+            return $vevent->DTEND;
+        }
+
+        if (isset($vevent->DURATION)) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+
+            return $end;
+        }
+
+        if (!$vevent->DTSTART->hasTime()) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+
+            return $end;
+        }
+
+        return clone $vevent->DTSTART;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
  *
  * @package OCA\DAV\CalDAV\Reminder\NotificationProvider
  */
-abstract class AbstractProvider implements INotificationProvider  {
+abstract class AbstractProvider implements INotificationProvider {
 
 	/** @var string */
 	public const NOTIFICATION_TYPE = '';
@@ -90,7 +90,7 @@ 
 	 */
 	abstract public function send(VEvent $vevent,
 						   string $calendarDisplayName,
-						   array $users=[]): void;
+						   array $users = []): void;
 
 	/**
 	 * @return string

apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php

Indentation +454 added lines, -454 removed lines

@@ -46,458 +46,458 @@
  */
 class EmailProvider extends AbstractProvider {
 
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'EMAIL';
-
-	/** @var IMailer */
-	private $mailer;
-
-	/**
-	 * @param IConfig $config
-	 * @param IMailer $mailer
-	 * @param ILogger $logger
-	 * @param L10NFactory $l10nFactory
-	 * @param IUrlGenerator $urlGenerator
-	 */
-	public function __construct(IConfig $config,
-								IMailer $mailer,
-								ILogger $logger,
-								L10NFactory $l10nFactory,
-								IURLGenerator $urlGenerator) {
-		parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
-		$this->mailer = $mailer;
-	}
-
-	/**
-	 * Send out notification via email
-	 *
-	 * @param VEvent $vevent
-	 * @param string $calendarDisplayName
-	 * @param array $users
-	 * @throws \Exception
-	 */
-	public function send(VEvent $vevent,
-						 string $calendarDisplayName,
-						 array $users=[]):void {
-		$fallbackLanguage = $this->getFallbackLanguage();
-
-		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
-		$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
-
-		// Quote from php.net:
-		// If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
-		// => if there are duplicate email addresses, it will always take the system value
-		$emailAddresses = array_merge(
-			$emailAddressesOfAttendees,
-			$emailAddressesOfSharees
-		);
-
-		$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
-		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
-
-		foreach($sortedByLanguage as $lang => $emailAddresses) {
-			if (!$this->hasL10NForLang($lang)) {
-				$lang = $fallbackLanguage;
-			}
-			$l10n = $this->getL10NForLang($lang);
-			$fromEMail = \OCP\Util::getDefaultEmailAddress('reminders-noreply');
-
-			$template = $this->mailer->createEMailTemplate('dav.calendarReminder');
-			$template->addHeader();
-			$this->addSubjectAndHeading($template, $l10n, $vevent);
-			$this->addBulletList($template, $l10n, $calendarDisplayName, $vevent);
-			$template->addFooter();
-
-			foreach ($emailAddresses as $emailAddress) {
-				$message = $this->mailer->createMessage();
-				$message->setFrom([$fromEMail]);
-				if ($organizer) {
-					$message->setReplyTo($organizer);
-				}
-				$message->setTo([$emailAddress]);
-				$message->useTemplate($template);
-
-				try {
-					$failed = $this->mailer->send($message);
-					if ($failed) {
-						$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-					}
-				} catch (\Exception $ex) {
-					$this->logger->logException($ex, ['app' => 'dav']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param VEvent $vevent
-	 */
-	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
-		$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
-		$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param string $calendarDisplayName
-	 * @param array $eventData
-	 */
-	private function addBulletList(IEMailTemplate $template,
-								   IL10N $l10n,
-								   string $calendarDisplayName,
-								   VEvent $vevent):void {
-		$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
-			$this->getAbsoluteImagePath('actions/info.svg'));
-
-		$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
-			$this->getAbsoluteImagePath('places/calendar.svg'));
-
-		if (isset($vevent->LOCATION)) {
-			$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
-				$this->getAbsoluteImagePath('actions/address.svg'));
-		}
-		if (isset($vevent->DESCRIPTION)) {
-			$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('actions/more.svg'));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function getAbsoluteImagePath(string $path):string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array|null
-	 */
-	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
-		if (!$vevent->ORGANIZER) {
-			return null;
-		}
-
-		$organizer = $vevent->ORGANIZER;
-		if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
-			return null;
-		}
-
-		$organizerEMail = substr($organizer->getValue(), 7);
-
-		$name = $organizer->offsetGet('CN');
-		if ($name instanceof Parameter) {
-			return [$organizerEMail => $name];
-		}
-
-		return [$organizerEMail];
-	}
-
-	/**
-	 * @param array $emails
-	 * @param string $defaultLanguage
-	 * @return array
-	 */
-	private function sortEMailAddressesByLanguage(array $emails,
-												  string $defaultLanguage):array {
-		$sortedByLanguage = [];
-
-		foreach($emails as $emailAddress => $parameters) {
-			if (isset($parameters['LANG'])) {
-				$lang = $parameters['LANG'];
-			} else {
-				$lang = $defaultLanguage;
-			}
-
-			if (!isset($sortedByLanguage[$lang])) {
-				$sortedByLanguage[$lang] = [];
-			}
-
-			$sortedByLanguage[$lang][] = $emailAddress;
-		}
-
-		return $sortedByLanguage;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array
-	 */
-	private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
-		$emailAddresses = [];
-
-		if (isset($vevent->ATTENDEE)) {
-			foreach ($vevent->ATTENDEE as $attendee) {
-				if (!($attendee instanceof VObject\Property)) {
-					continue;
-				}
-
-				$cuType = $this->getCUTypeOfAttendee($attendee);
-				if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
-					// Don't send emails to things
-					continue;
-				}
-
-				$partstat = $this->getPartstatOfAttendee($attendee);
-				if ($partstat === 'DECLINED') {
-					// Don't send out emails to people who declined
-					continue;
-				}
-				if ($partstat === 'DELEGATED') {
-					$delegates = $attendee->offsetGet('DELEGATED-TO');
-					if (!($delegates instanceof VObject\Parameter)) {
-						continue;
-					}
-
-					$emailAddressesOfDelegates = $delegates->getParts();
-					foreach($emailAddressesOfDelegates as $addressesOfDelegate) {
-						if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
-							$emailAddresses[substr($addressesOfDelegate, 7)] = [];
-						}
-					}
-
-					continue;
-				}
-
-				$emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
-				if ($emailAddressOfAttendee !== null) {
-					$properties = [];
-
-					$langProp = $attendee->offsetGet('LANG');
-					if ($langProp instanceof VObject\Parameter) {
-						$properties['LANG'] = $langProp->getValue();
-					}
-
-					$emailAddresses[$emailAddressOfAttendee] = $properties;
-				}
-			}
-		}
-
-		if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
-			$emailAddresses[$this->getEMailAddressOfAttendee($vevent->ORGANIZER)] = [];
-		}
-
-		return $emailAddresses;
-	}
-
-
-
-	/**
-	 * @param VObject\Property $attendee
-	 * @return string
-	 */
-	private function getCUTypeOfAttendee(VObject\Property $attendee):string {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if ($cuType instanceof VObject\Parameter) {
-			return strtoupper($cuType->getValue());
-		}
-
-		return 'INDIVIDUAL';
-	}
-
-	/**
-	 * @param VObject\Property $attendee
-	 * @return string
-	 */
-	private function getPartstatOfAttendee(VObject\Property $attendee):string {
-		$partstat = $attendee->offsetGet('PARTSTAT');
-		if ($partstat instanceof VObject\Parameter) {
-			return strtoupper($partstat->getValue());
-		}
-
-		return 'NEEDS-ACTION';
-	}
-
-	/**
-	 * @param VObject\Property $attendee
-	 * @return bool
-	 */
-	private function hasAttendeeMailURI(VObject\Property $attendee):bool {
-		return stripos($attendee->getValue(), 'mailto:') === 0;
-	}
-
-	/**
-	 * @param VObject\Property $attendee
-	 * @return string|null
-	 */
-	private function getEMailAddressOfAttendee(VObject\Property $attendee):?string {
-		if (!$this->hasAttendeeMailURI($attendee)) {
-			return null;
-		}
-
-		return substr($attendee->getValue(), 7);
-	}
-
-	/**
-	 * @param array $users
-	 * @return array
-	 */
-	private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
-		$emailAddresses = [];
-
-		foreach($users as $user) {
-			$emailAddress = $user->getEMailAddress();
-			if ($emailAddress) {
-				$lang = $this->getLangForUser($user);
-				if ($lang) {
-					$emailAddresses[$emailAddress] = [
-						'LANG' => $lang,
-					];
-				} else {
-					$emailAddresses[$emailAddress] = [];
-				}
-			}
-		}
-
-		return $emailAddresses;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string
-	 */
-	private function getLangForUser(IUser $user): ?string {
-		return $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param VEvent $vevent
-	 * @return string
-	 * @throws \Exception
-	 */
-	private function generateDateString(IL10N $l10n, VEvent $vevent):string {
-		$isAllDay = $vevent->DTSTART instanceof Property\ICalendar\Date;
-
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
-		/** @var \DateTimeImmutable $dtstartDt */
-		$dtstartDt = $vevent->DTSTART->getDateTime();
-		/** @var \DateTimeImmutable $dtendDt */
-		$dtendDt = $this->getDTEndFromEvent($vevent)->getDateTime();
-
-		$diff = $dtstartDt->diff($dtendDt);
-
-		/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-		$dtstartDt = new \DateTime($dtstartDt->format(\DateTime::ATOM));
-		/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-		$dtendDt = new \DateTime($dtendDt->format(\DateTime::ATOM));
-
-		if ($isAllDay) {
-			// One day event
-			if ($diff->days === 1) {
-				return $this->getDateString($l10n, $dtstartDt);
-			}
-
-			return implode(' - ', [
-				$this->getDateString($l10n, $dtstartDt),
-				$this->getDateString($l10n, $dtendDt),
-			]);
-		}
-
-		$startTimezone = $endTimezone = null;
-		if (!$vevent->DTSTART->isFloating()) {
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			$startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			$endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
-		}
-
-		$localeStart = implode(', ', [
-			$this->getWeekDayName($l10n, $dtstartDt),
-			$this->getDateTimeString($l10n, $dtstartDt)
-		]);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-			return $localeStart
-				. ' (' . $startTimezone . ') '
-				. ' - '
-				. $localeEnd
-				. ' (' . $endTimezone . ')';
-		}
-
-		// Show only the time if the day is the same
-		$localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
-			? $this->getTimeString($l10n, $dtendDt)
-			: implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-		return $localeStart
-			. ' - '
-			. $localeEnd
-			. ' (' . $startTimezone . ')';
-	}
-
-	/**
-	 * @param DateTime $dtStart
-	 * @param DateTime $dtEnd
-	 * @return bool
-	 */
-	private function isDayEqual(DateTime $dtStart,
-								DateTime $dtEnd):bool {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
-		return $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateString(IL10N $l10n, DateTime $dt):string {
-		return $l10n->l('date', $dt, ['width' => 'medium']);
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
-		return $l10n->l('datetime', $dt, ['width' => 'medium|short']);
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getTimeString(IL10N $l10n, DateTime $dt):string {
-		return $l10n->l('time', $dt, ['width' => 'short']);
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @param IL10N $l10n
-	 * @return string
-	 */
-	private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
-		if (isset($vevent->SUMMARY)) {
-			return (string)$vevent->SUMMARY;
-		}
-
-		return $l10n->t('Untitled event');
-	}
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'EMAIL';
+
+    /** @var IMailer */
+    private $mailer;
+
+    /**
+     * @param IConfig $config
+     * @param IMailer $mailer
+     * @param ILogger $logger
+     * @param L10NFactory $l10nFactory
+     * @param IUrlGenerator $urlGenerator
+     */
+    public function __construct(IConfig $config,
+                                IMailer $mailer,
+                                ILogger $logger,
+                                L10NFactory $l10nFactory,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Send out notification via email
+     *
+     * @param VEvent $vevent
+     * @param string $calendarDisplayName
+     * @param array $users
+     * @throws \Exception
+     */
+    public function send(VEvent $vevent,
+                            string $calendarDisplayName,
+                            array $users=[]):void {
+        $fallbackLanguage = $this->getFallbackLanguage();
+
+        $emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
+        $emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
+
+        // Quote from php.net:
+        // If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
+        // => if there are duplicate email addresses, it will always take the system value
+        $emailAddresses = array_merge(
+            $emailAddressesOfAttendees,
+            $emailAddressesOfSharees
+        );
+
+        $sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
+        $organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
+
+        foreach($sortedByLanguage as $lang => $emailAddresses) {
+            if (!$this->hasL10NForLang($lang)) {
+                $lang = $fallbackLanguage;
+            }
+            $l10n = $this->getL10NForLang($lang);
+            $fromEMail = \OCP\Util::getDefaultEmailAddress('reminders-noreply');
+
+            $template = $this->mailer->createEMailTemplate('dav.calendarReminder');
+            $template->addHeader();
+            $this->addSubjectAndHeading($template, $l10n, $vevent);
+            $this->addBulletList($template, $l10n, $calendarDisplayName, $vevent);
+            $template->addFooter();
+
+            foreach ($emailAddresses as $emailAddress) {
+                $message = $this->mailer->createMessage();
+                $message->setFrom([$fromEMail]);
+                if ($organizer) {
+                    $message->setReplyTo($organizer);
+                }
+                $message->setTo([$emailAddress]);
+                $message->useTemplate($template);
+
+                try {
+                    $failed = $this->mailer->send($message);
+                    if ($failed) {
+                        $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                    }
+                } catch (\Exception $ex) {
+                    $this->logger->logException($ex, ['app' => 'dav']);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param VEvent $vevent
+     */
+    private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
+        $template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
+        $template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param string $calendarDisplayName
+     * @param array $eventData
+     */
+    private function addBulletList(IEMailTemplate $template,
+                                    IL10N $l10n,
+                                    string $calendarDisplayName,
+                                    VEvent $vevent):void {
+        $template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
+            $this->getAbsoluteImagePath('actions/info.svg'));
+
+        $template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
+            $this->getAbsoluteImagePath('places/calendar.svg'));
+
+        if (isset($vevent->LOCATION)) {
+            $template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
+                $this->getAbsoluteImagePath('actions/address.svg'));
+        }
+        if (isset($vevent->DESCRIPTION)) {
+            $template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
+                $this->getAbsoluteImagePath('actions/more.svg'));
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function getAbsoluteImagePath(string $path):string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array|null
+     */
+    private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
+        if (!$vevent->ORGANIZER) {
+            return null;
+        }
+
+        $organizer = $vevent->ORGANIZER;
+        if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
+            return null;
+        }
+
+        $organizerEMail = substr($organizer->getValue(), 7);
+
+        $name = $organizer->offsetGet('CN');
+        if ($name instanceof Parameter) {
+            return [$organizerEMail => $name];
+        }
+
+        return [$organizerEMail];
+    }
+
+    /**
+     * @param array $emails
+     * @param string $defaultLanguage
+     * @return array
+     */
+    private function sortEMailAddressesByLanguage(array $emails,
+                                                    string $defaultLanguage):array {
+        $sortedByLanguage = [];
+
+        foreach($emails as $emailAddress => $parameters) {
+            if (isset($parameters['LANG'])) {
+                $lang = $parameters['LANG'];
+            } else {
+                $lang = $defaultLanguage;
+            }
+
+            if (!isset($sortedByLanguage[$lang])) {
+                $sortedByLanguage[$lang] = [];
+            }
+
+            $sortedByLanguage[$lang][] = $emailAddress;
+        }
+
+        return $sortedByLanguage;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array
+     */
+    private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
+        $emailAddresses = [];
+
+        if (isset($vevent->ATTENDEE)) {
+            foreach ($vevent->ATTENDEE as $attendee) {
+                if (!($attendee instanceof VObject\Property)) {
+                    continue;
+                }
+
+                $cuType = $this->getCUTypeOfAttendee($attendee);
+                if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
+                    // Don't send emails to things
+                    continue;
+                }
+
+                $partstat = $this->getPartstatOfAttendee($attendee);
+                if ($partstat === 'DECLINED') {
+                    // Don't send out emails to people who declined
+                    continue;
+                }
+                if ($partstat === 'DELEGATED') {
+                    $delegates = $attendee->offsetGet('DELEGATED-TO');
+                    if (!($delegates instanceof VObject\Parameter)) {
+                        continue;
+                    }
+
+                    $emailAddressesOfDelegates = $delegates->getParts();
+                    foreach($emailAddressesOfDelegates as $addressesOfDelegate) {
+                        if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
+                            $emailAddresses[substr($addressesOfDelegate, 7)] = [];
+                        }
+                    }
+
+                    continue;
+                }
+
+                $emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
+                if ($emailAddressOfAttendee !== null) {
+                    $properties = [];
+
+                    $langProp = $attendee->offsetGet('LANG');
+                    if ($langProp instanceof VObject\Parameter) {
+                        $properties['LANG'] = $langProp->getValue();
+                    }
+
+                    $emailAddresses[$emailAddressOfAttendee] = $properties;
+                }
+            }
+        }
+
+        if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
+            $emailAddresses[$this->getEMailAddressOfAttendee($vevent->ORGANIZER)] = [];
+        }
+
+        return $emailAddresses;
+    }
+
+
+
+    /**
+     * @param VObject\Property $attendee
+     * @return string
+     */
+    private function getCUTypeOfAttendee(VObject\Property $attendee):string {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if ($cuType instanceof VObject\Parameter) {
+            return strtoupper($cuType->getValue());
+        }
+
+        return 'INDIVIDUAL';
+    }
+
+    /**
+     * @param VObject\Property $attendee
+     * @return string
+     */
+    private function getPartstatOfAttendee(VObject\Property $attendee):string {
+        $partstat = $attendee->offsetGet('PARTSTAT');
+        if ($partstat instanceof VObject\Parameter) {
+            return strtoupper($partstat->getValue());
+        }
+
+        return 'NEEDS-ACTION';
+    }
+
+    /**
+     * @param VObject\Property $attendee
+     * @return bool
+     */
+    private function hasAttendeeMailURI(VObject\Property $attendee):bool {
+        return stripos($attendee->getValue(), 'mailto:') === 0;
+    }
+
+    /**
+     * @param VObject\Property $attendee
+     * @return string|null
+     */
+    private function getEMailAddressOfAttendee(VObject\Property $attendee):?string {
+        if (!$this->hasAttendeeMailURI($attendee)) {
+            return null;
+        }
+
+        return substr($attendee->getValue(), 7);
+    }
+
+    /**
+     * @param array $users
+     * @return array
+     */
+    private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
+        $emailAddresses = [];
+
+        foreach($users as $user) {
+            $emailAddress = $user->getEMailAddress();
+            if ($emailAddress) {
+                $lang = $this->getLangForUser($user);
+                if ($lang) {
+                    $emailAddresses[$emailAddress] = [
+                        'LANG' => $lang,
+                    ];
+                } else {
+                    $emailAddresses[$emailAddress] = [];
+                }
+            }
+        }
+
+        return $emailAddresses;
+    }
+
+    /**
+     * @param IUser $user
+     * @return string
+     */
+    private function getLangForUser(IUser $user): ?string {
+        return $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param VEvent $vevent
+     * @return string
+     * @throws \Exception
+     */
+    private function generateDateString(IL10N $l10n, VEvent $vevent):string {
+        $isAllDay = $vevent->DTSTART instanceof Property\ICalendar\Date;
+
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
+        /** @var \DateTimeImmutable $dtstartDt */
+        $dtstartDt = $vevent->DTSTART->getDateTime();
+        /** @var \DateTimeImmutable $dtendDt */
+        $dtendDt = $this->getDTEndFromEvent($vevent)->getDateTime();
+
+        $diff = $dtstartDt->diff($dtendDt);
+
+        /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+        $dtstartDt = new \DateTime($dtstartDt->format(\DateTime::ATOM));
+        /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+        $dtendDt = new \DateTime($dtendDt->format(\DateTime::ATOM));
+
+        if ($isAllDay) {
+            // One day event
+            if ($diff->days === 1) {
+                return $this->getDateString($l10n, $dtstartDt);
+            }
+
+            return implode(' - ', [
+                $this->getDateString($l10n, $dtstartDt),
+                $this->getDateString($l10n, $dtendDt),
+            ]);
+        }
+
+        $startTimezone = $endTimezone = null;
+        if (!$vevent->DTSTART->isFloating()) {
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            $startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            $endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
+        }
+
+        $localeStart = implode(', ', [
+            $this->getWeekDayName($l10n, $dtstartDt),
+            $this->getDateTimeString($l10n, $dtstartDt)
+        ]);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+            return $localeStart
+                . ' (' . $startTimezone . ') '
+                . ' - '
+                . $localeEnd
+                . ' (' . $endTimezone . ')';
+        }
+
+        // Show only the time if the day is the same
+        $localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
+            ? $this->getTimeString($l10n, $dtendDt)
+            : implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+        return $localeStart
+            . ' - '
+            . $localeEnd
+            . ' (' . $startTimezone . ')';
+    }
+
+    /**
+     * @param DateTime $dtStart
+     * @param DateTime $dtEnd
+     * @return bool
+     */
+    private function isDayEqual(DateTime $dtStart,
+                                DateTime $dtEnd):bool {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
+        return $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateString(IL10N $l10n, DateTime $dt):string {
+        return $l10n->l('date', $dt, ['width' => 'medium']);
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
+        return $l10n->l('datetime', $dt, ['width' => 'medium|short']);
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getTimeString(IL10N $l10n, DateTime $dt):string {
+        return $l10n->l('time', $dt, ['width' => 'short']);
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @param IL10N $l10n
+     * @return string
+     */
+    private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
+        if (isset($vevent->SUMMARY)) {
+            return (string)$vevent->SUMMARY;
+        }
+
+        return $l10n->t('Untitled event');
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName,
-						 array $users=[]):void {
+						 array $users = []):void {
 		$fallbackLanguage = $this->getFallbackLanguage();
 
 		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
@@ -95,7 +95,7 @@ 
 		$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
 		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
 
-		foreach($sortedByLanguage as $lang => $emailAddresses) {
+		foreach ($sortedByLanguage as $lang => $emailAddresses) {
 			if (!$this->hasL10NForLang($lang)) {
 				$lang = $fallbackLanguage;
 			}
@@ -135,7 +135,7 @@ 
 	 * @param VEvent $vevent
 	 */
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
-		$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
+		$template->setSubject('Notification: '.$this->getTitleFromVEvent($vevent, $l10n));
 		$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
 	}
 
@@ -179,7 +179,7 @@ 
 	 * @param VEvent $vevent
 	 * @return array|null
 	 */
-	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
+	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent): ?array {
 		if (!$vevent->ORGANIZER) {
 			return null;
 		}
@@ -208,7 +208,7 @@ 
 												  string $defaultLanguage):array {
 		$sortedByLanguage = [];
 
-		foreach($emails as $emailAddress => $parameters) {
+		foreach ($emails as $emailAddress => $parameters) {
 			if (isset($parameters['LANG'])) {
 				$lang = $parameters['LANG'];
 			} else {
@@ -256,7 +256,7 @@ 
 					}
 
 					$emailAddressesOfDelegates = $delegates->getParts();
-					foreach($emailAddressesOfDelegates as $addressesOfDelegate) {
+					foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
 						if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
 							$emailAddresses[substr($addressesOfDelegate, 7)] = [];
 						}
@@ -326,7 +326,7 @@ 
 	 * @param VObject\Property $attendee
 	 * @return string|null
 	 */
-	private function getEMailAddressOfAttendee(VObject\Property $attendee):?string {
+	private function getEMailAddressOfAttendee(VObject\Property $attendee): ?string {
 		if (!$this->hasAttendeeMailURI($attendee)) {
 			return null;
 		}
@@ -341,7 +341,7 @@ 
 	private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
 		$emailAddresses = [];
 
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$emailAddress = $user->getEMailAddress();
 			if ($emailAddress) {
 				$lang = $this->getLangForUser($user);
@@ -422,10 +422,10 @@ 
 			]);
 
 			return $localeStart
-				. ' (' . $startTimezone . ') '
+				. ' ('.$startTimezone.') '
 				. ' - '
 				. $localeEnd
-				. ' (' . $endTimezone . ')';
+				. ' ('.$endTimezone.')';
 		}
 
 		// Show only the time if the day is the same
@@ -439,7 +439,7 @@ 
 		return $localeStart
 			. ' - '
 			. $localeEnd
-			. ' (' . $startTimezone . ')';
+			. ' ('.$startTimezone.')';
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 */
 	private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
 		if (isset($vevent->SUMMARY)) {
-			return (string)$vevent->SUMMARY;
+			return (string) $vevent->SUMMARY;
 		}
 
 		return $l10n->t('Untitled event');

apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php

Indentation +84 added lines, -84 removed lines

@@ -44,96 +44,96 @@
  */
 class PushProvider extends AbstractProvider {
 
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'DISPLAY';
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'DISPLAY';
 
-	/** @var IManager */
-	private $manager;
+    /** @var IManager */
+    private $manager;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IConfig $config
-	 * @param IManager $manager
-	 * @param ILogger $logger
-	 * @param L10NFactory $l10nFactory
-	 * @param IUrlGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IConfig $config,
-								IManager $manager,
-								ILogger $logger,
-								L10NFactory $l10nFactory,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
-		parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
-		$this->manager = $manager;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param IConfig $config
+     * @param IManager $manager
+     * @param ILogger $logger
+     * @param L10NFactory $l10nFactory
+     * @param IUrlGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IConfig $config,
+                                IManager $manager,
+                                ILogger $logger,
+                                L10NFactory $l10nFactory,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory) {
+        parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
+        $this->manager = $manager;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * Send push notification to all users.
-	 *
-	 * @param VEvent $vevent
-	 * @param string $calendarDisplayName
-	 * @param IUser[] $users
-	 * @throws \Exception
-	 */
-	public function send(VEvent $vevent,
-						 string $calendarDisplayName=null,
-						 array $users=[]):void {
-		$eventDetails = $this->extractEventDetails($vevent);
-		$eventDetails['calendar_displayname'] = $calendarDisplayName;
+    /**
+     * Send push notification to all users.
+     *
+     * @param VEvent $vevent
+     * @param string $calendarDisplayName
+     * @param IUser[] $users
+     * @throws \Exception
+     */
+    public function send(VEvent $vevent,
+                            string $calendarDisplayName=null,
+                            array $users=[]):void {
+        $eventDetails = $this->extractEventDetails($vevent);
+        $eventDetails['calendar_displayname'] = $calendarDisplayName;
 
-		foreach($users as $user) {
-			/** @var INotification $notification */
-			$notification = $this->manager->createNotification();
-			$notification->setApp(Application::APP_ID)
-				->setUser($user->getUID())
-				->setDateTime($this->timeFactory->getDateTime())
-				->setObject(Application::APP_ID, (string) $vevent->UID)
-				->setSubject('calendar_reminder', [
-					'title' => $eventDetails['title'],
-					'start_atom' => $eventDetails['start_atom']
-				])
-				->setMessage('calendar_reminder', $eventDetails);
+        foreach($users as $user) {
+            /** @var INotification $notification */
+            $notification = $this->manager->createNotification();
+            $notification->setApp(Application::APP_ID)
+                ->setUser($user->getUID())
+                ->setDateTime($this->timeFactory->getDateTime())
+                ->setObject(Application::APP_ID, (string) $vevent->UID)
+                ->setSubject('calendar_reminder', [
+                    'title' => $eventDetails['title'],
+                    'start_atom' => $eventDetails['start_atom']
+                ])
+                ->setMessage('calendar_reminder', $eventDetails);
 
-			$this->manager->notify($notification);
-		}
-	}
+            $this->manager->notify($notification);
+        }
+    }
 
-	/**
-	 * @var VEvent $vevent
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function extractEventDetails(VEvent $vevent):array {
-		/** @var Property\ICalendar\DateTime $start */
-		$start = $vevent->DTSTART;
-		$end = $this->getDTEndFromEvent($vevent);
+    /**
+     * @var VEvent $vevent
+     * @return array
+     * @throws \Exception
+     */
+    protected function extractEventDetails(VEvent $vevent):array {
+        /** @var Property\ICalendar\DateTime $start */
+        $start = $vevent->DTSTART;
+        $end = $this->getDTEndFromEvent($vevent);
 
-		return [
-			'title' => isset($vevent->SUMMARY)
-				? ((string) $vevent->SUMMARY)
-				: null,
-			'description' => isset($vevent->DESCRIPTION)
-				? ((string) $vevent->DESCRIPTION)
-				: null,
-			'location' => isset($vevent->LOCATION)
-				? ((string) $vevent->LOCATION)
-				: null,
-			'all_day' => $start instanceof Property\ICalendar\Date,
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			'start_atom' => $start->getDateTime()->format(\DateTime::ATOM),
-			'start_is_floating' => $start->isFloating(),
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			'start_timezone' => $start->getDateTime()->getTimezone()->getName(),
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			'end_atom' => $end->getDateTime()->format(\DateTime::ATOM),
-			'end_is_floating' => $end->isFloating(),
-			/** @phan-suppress-next-line PhanUndeclaredClassMethod */
-			'end_timezone' => $end->getDateTime()->getTimezone()->getName(),
-		];
-	}
+        return [
+            'title' => isset($vevent->SUMMARY)
+                ? ((string) $vevent->SUMMARY)
+                : null,
+            'description' => isset($vevent->DESCRIPTION)
+                ? ((string) $vevent->DESCRIPTION)
+                : null,
+            'location' => isset($vevent->LOCATION)
+                ? ((string) $vevent->LOCATION)
+                : null,
+            'all_day' => $start instanceof Property\ICalendar\Date,
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            'start_atom' => $start->getDateTime()->format(\DateTime::ATOM),
+            'start_is_floating' => $start->isFloating(),
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            'start_timezone' => $start->getDateTime()->getTimezone()->getName(),
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            'end_atom' => $end->getDateTime()->format(\DateTime::ATOM),
+            'end_is_floating' => $end->isFloating(),
+            /** @phan-suppress-next-line PhanUndeclaredClassMethod */
+            'end_timezone' => $end->getDateTime()->getTimezone()->getName(),
+        ];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -81,12 +81,12 @@
 	 * @throws \Exception
 	 */
 	public function send(VEvent $vevent,
-						 string $calendarDisplayName=null,
-						 array $users=[]):void {
+						 string $calendarDisplayName = null,
+						 array $users = []):void {
 		$eventDetails = $this->extractEventDetails($vevent);
 		$eventDetails['calendar_displayname'] = $calendarDisplayName;
 
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			/** @var INotification $notification */
 			$notification = $this->manager->createNotification();
 			$notification->setApp(Application::APP_ID)