nextcloud / server

apps/dav/lib/CalDAV/CalDavBackend.php

Doc Comments +7 added lines, -7 removed lines

@@ -203,7 +203,7 @@ 
 	 *
 	 * By default this excludes the automatically generated birthday calendar
 	 *
-	 * @param $principalUri
+	 * @param string $principalUri
 	 * @param bool $excludeBirthday
 	 * @return int
 	 */
@@ -373,7 +373,7 @@ 
 	}
 
 	/**
-	 * @param $principalUri
+	 * @param string $principalUri
 	 * @return array
 	 */
 	public function getUsersOwnCalendars($principalUri) {
@@ -1081,7 +1081,7 @@ 
 	 * 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 integer $calendarId
 	 * @param string $objectUri
 	 * @param string $calendarData
 	 * @return string
@@ -1149,7 +1149,7 @@ 
 	 * 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 integer $calendarId
 	 * @param string $objectUri
 	 * @param string $calendarData
 	 * @return string
@@ -1917,7 +1917,7 @@ 
 	 * @param string $principalUri
 	 * @param string $uri
 	 * @param array $properties
-	 * @return mixed
+	 * @return integer
 	 */
 	function createSubscription($principalUri, $uri, array $properties) {
 
@@ -2475,7 +2475,7 @@ 
 
 	/**
 	 * @param $subscriptionId
-	 * @param $objectUri
+	 * @param string $objectUri
 	 * @param $calendarData
 	 * @return string
 	 * @throws DAV\Exception\BadRequest
@@ -2553,7 +2553,7 @@ 
 	 * return legacy endpoint principal name to new principal name
 	 *
 	 * @param $principalUri
-	 * @param $toV2
+	 * @param boolean $toV2
 	 * @return string
 	 */
 	private function convertPrincipal($principalUri, $toV2) {

Indentation +2512 added lines, -2512 removed lines

@@ -73,2517 +73,2517 @@
  */
 class CalDavBackend extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
 
-	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 $sharingBackend;
-
-	/** @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,
-								$legacyEndpoint = false) {
-		$this->db = $db;
-		$this->principalBackend = $principalBackend;
-		$this->userManager = $userManager;
-		$this->sharingBackend = 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->createFunction('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_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 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 $sharingBackend;
+
+    /** @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,
+                                $legacyEndpoint = false) {
+        $this->db = $db;
+        $this->principalBackend = $principalBackend;
+        $this->userManager = $userManager;
+        $this->sharingBackend = 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->createFunction('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_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[] = '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']),
-		];
-
-		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());
-		}
-		$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` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ?');
-		$stmt->execute([$calendarId]);
-
-		$this->sharingBackend->deleteAllShares($calendarId);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->execute();
-	}
-
-	/**
-	 * Delete all of an user's shares
-	 *
-	 * @param string $principaluri
-	 * @return void
-	 */
-	function deleteAllSharesByUser($principaluri) {
-		$this->sharingBackend->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 $calendarId
-	 * @return array
-	 */
-	function getCalendarObjects($calendarId):array {
-		return $this->commonGetCalendarObjects('calendarobjects', 'calendarid', $calendarId);
-	}
-
-	/**
-	 * @param mixed $subscriptionId
-	 * @return array
-	 */
-	public function getCachedCalendarObjects($subscriptionId):array {
-		return $this->commonGetCalendarObjects('calendarsubscrobjects', 'subscriptionid', $subscriptionId);
-	}
-
-	/**
-	 * @param string $tablename
-	 * @param string $selector
-	 * @param mixed $id
-	 * @return array
-	 */
-	private function commonGetCalendarObjects(string $tablename, string $selector, $id):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'componenttype', 'classification'])
-			->from($tablename)
-			->where($query->expr()->eq($selector, $query->createNamedParameter($id)));
-		$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[$selector],
-				'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 $calendarId
-	 * @param string $objectUri
-	 * @return array|null
-	 */
-	function getCalendarObject($calendarId, $objectUri) {
-		return $this->commonGetCalendarObject('calendarobjects', 'calendarid', $calendarId, $objectUri);
-	}
-
-	/**
-	 * @param $subscriptionId
-	 * @param $objectUri
-	 * @return array
-	 */
-	public function getCachedCalendarObject($subscriptionId, $objectUri) {
-		return $this->commonGetCalendarObject('calendarsubscrobjects', 'subscriptionid', $subscriptionId, $objectUri);
-	}
-
-	/**
-	 * @param string $tablename
-	 * @param string $selector
-	 * @param $id
-	 * @param $objectUri
-	 * @return array
-	 */
-	private function commonGetCalendarObject(string $tablename, string $selector, $id, $objectUri):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'calendardata', 'componenttype', 'classification'])
-			->from($tablename)
-			->where($query->expr()->eq($selector, $query->createNamedParameter($id)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)));
-		$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[$selector],
-			'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
-	 * @return array
-	 */
-	function getMultipleCalendarObjects($calendarId, array $uris) {
-		return $this->commonGetMultipleCachedCalendarObjects('calendarobjects', 'calendarid', $calendarId, $uris);
-	}
-
-	/**
-	 * @param $subscripionId
-	 * @param array $uris
-	 * @return array
-	 */
-	function getMultipleCachedCalendarObjects($subscripionId, array $uris) {
-		return $this->commonGetMultipleCachedCalendarObjects('calendarsubscrobjects', 'subscriptionid', $subscripionId, $uris);
-	}
-
-	/**
-	 * @param string $tablename
-	 * @param string $selector
-	 * @param $id
-	 * @param array $uris
-	 * @return array
-	 */
-	private function commonGetMultipleCachedCalendarObjects(string $tablename, string $selector, $id, array $uris) {
-		if (empty($uris)) {
-			return [];
-		}
-
-		$chunks = array_chunk($uris, 100);
-		$objects = [];
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'calendardata', 'componenttype', 'classification'])
-			->from($tablename)
-			->where($query->expr()->eq($selector, $query->createNamedParameter($id)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
-
-		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[$selector],
-					'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
-	 * @return string
-	 */
-	function createCalendarObject($calendarId, $objectUri, $calendarData) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$q = $this->db->getQueryBuilder();
-		$q->select($q->createFunction('COUNT(*)'))
-			->from('calendarobjects')
-			->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
-			->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])));
-
-		$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']),
-			])
-			->execute();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData);
-
-		$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),
-			]
-		));
-		$this->addChange($calendarId, $objectUri, 1);
-
-		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
-	 * @return string
-	 */
-	function updateCalendarObject($calendarId, $objectUri, $calendarData) {
-		$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)))
-			->execute();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData);
-
-		$data = $this->getCalendarObject($calendarId, $objectUri);
-		if (is_array($data)) {
-			$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,
-				]
-			));
-		}
-		$this->addChange($calendarId, $objectUri, 2);
-
-		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
-	 * @return void
-	 */
-	function deleteCalendarObject($calendarId, $objectUri) {
-		$data = $this->getCalendarObject($calendarId, $objectUri);
-		if (is_array($data)) {
-			$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,
-				]
-			));
-		}
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ?');
-		$stmt->execute([$calendarId, $objectUri]);
-
-		$this->purgeProperties($calendarId, $data['id']);
-
-		$this->addChange($calendarId, $objectUri, 3);
-	}
-
-	/**
-	 * 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 $calendarId
-	 * @param array $filters
-	 * @return array
-	 */
-	function calendarQuery($calendarId, array $filters):array {
-		return $this->commonCalendarQuery('calendarobjects', 'calendarid', $calendarId, $filters);
-	}
-
-	/**
-	 * @param $subscriptionId
-	 * @param array $filters
-	 * @return array
-	 */
-	public function cachedCalendarQuery($subscriptionId, array $filters):array {
-		return $this->commonCalendarQuery('calendarsubscrobjects', 'subscriptionid', $subscriptionId, $filters);
-	}
-
-	/**
-	 * @param string $tablename
-	 * @param string $selector
-	 * @param $id
-	 * @param array $filters
-	 * @return array
-	 */
-	private function commonCalendarQuery(string $tablename, string $selector, $id, array $filters) {
-		$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($tablename)
-			->where($query->expr()->eq($selector, $query->createNamedParameter($id)));
-
-		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
-	 *
-	 * @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()
-				->eq('c.calendarid', $query->createNamedParameter($id));
-		}
-		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))
-			);
-		}
-
-		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'])));
-
-		// 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)));
-
-		$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
-	 * @return array
-	 */
-	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
-		// 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` = ? ORDER BY `synctoken`";
-			if ($limit>0) {
-				$query.= " LIMIT " . (int)$limit;
-			}
-
-			// Fetching all changes
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$syncToken, $currentToken, $calendarId]);
-
-			$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` = ?";
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$calendarId]);
-
-			$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';
-
-		$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']),
-			];
-
-			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();
-	}
-
-	/**
-	 * 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),
-				'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.
-	 * @return void
-	 */
-	protected function addChange($calendarId, $objectUri, $operation) {
-
-		$stmt = $this->db->prepare('INSERT INTO `*PREFIX*calendarchanges` (`uri`, `synctoken`, `calendarid`, `operation`) SELECT ?, `synctoken`, ?, ? FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([
-			$objectUri,
-			$calendarId,
-			$operation,
-			$calendarId
-		]);
-		$stmt = $this->db->prepare('UPDATE `*PREFIX*calendars` 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->sharingBackend->updateShares($shareable, $add, $remove);
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @return array
-	 */
-	public function getShares($resourceId) {
-		return $this->sharingBackend->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->sharingBackend->applyShareAcl($resourceId, $acl);
-	}
-
-
-
-	/**
-	 * update properties table
-	 *
-	 * @param int $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 */
-	public function updateProperties($calendarId, $objectUri, $calendarData) {
-		$objectId = $this->getCalendarObjectId($calendarId, $objectUri);
-
-		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),
-					'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->delete('calendarsubscrobjects')
-			->where($query->expr()->eq('subscriptionid', $query->createNamedParameter($subscriptionId)));
-		$query->execute();
-	}
-
-	/**
-	 * @param $subscriptionId
-	 * @param $objectUri
-	 * @param $calendarData
-	 * @return string
-	 * @throws DAV\Exception\BadRequest
-	 */
-	public function addCachedEvent($subscriptionId, $objectUri, $calendarData) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarsubscrobjects')
-			->values([
-				'subscriptionid' => $query->createNamedParameter($subscriptionId),
-				'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']),
-			])
-			->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
-	 * @return int
-	 */
-	protected function getCalendarObjectId($calendarId, $uri) {
-		$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)));
-
-		$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[] = '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']),
+        ];
+
+        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());
+        }
+        $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` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ?');
+        $stmt->execute([$calendarId]);
+
+        $this->sharingBackend->deleteAllShares($calendarId);
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->execute();
+    }
+
+    /**
+     * Delete all of an user's shares
+     *
+     * @param string $principaluri
+     * @return void
+     */
+    function deleteAllSharesByUser($principaluri) {
+        $this->sharingBackend->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 $calendarId
+     * @return array
+     */
+    function getCalendarObjects($calendarId):array {
+        return $this->commonGetCalendarObjects('calendarobjects', 'calendarid', $calendarId);
+    }
+
+    /**
+     * @param mixed $subscriptionId
+     * @return array
+     */
+    public function getCachedCalendarObjects($subscriptionId):array {
+        return $this->commonGetCalendarObjects('calendarsubscrobjects', 'subscriptionid', $subscriptionId);
+    }
+
+    /**
+     * @param string $tablename
+     * @param string $selector
+     * @param mixed $id
+     * @return array
+     */
+    private function commonGetCalendarObjects(string $tablename, string $selector, $id):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'componenttype', 'classification'])
+            ->from($tablename)
+            ->where($query->expr()->eq($selector, $query->createNamedParameter($id)));
+        $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[$selector],
+                '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 $calendarId
+     * @param string $objectUri
+     * @return array|null
+     */
+    function getCalendarObject($calendarId, $objectUri) {
+        return $this->commonGetCalendarObject('calendarobjects', 'calendarid', $calendarId, $objectUri);
+    }
+
+    /**
+     * @param $subscriptionId
+     * @param $objectUri
+     * @return array
+     */
+    public function getCachedCalendarObject($subscriptionId, $objectUri) {
+        return $this->commonGetCalendarObject('calendarsubscrobjects', 'subscriptionid', $subscriptionId, $objectUri);
+    }
+
+    /**
+     * @param string $tablename
+     * @param string $selector
+     * @param $id
+     * @param $objectUri
+     * @return array
+     */
+    private function commonGetCalendarObject(string $tablename, string $selector, $id, $objectUri):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from($tablename)
+            ->where($query->expr()->eq($selector, $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)));
+        $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[$selector],
+            '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
+     * @return array
+     */
+    function getMultipleCalendarObjects($calendarId, array $uris) {
+        return $this->commonGetMultipleCachedCalendarObjects('calendarobjects', 'calendarid', $calendarId, $uris);
+    }
+
+    /**
+     * @param $subscripionId
+     * @param array $uris
+     * @return array
+     */
+    function getMultipleCachedCalendarObjects($subscripionId, array $uris) {
+        return $this->commonGetMultipleCachedCalendarObjects('calendarsubscrobjects', 'subscriptionid', $subscripionId, $uris);
+    }
+
+    /**
+     * @param string $tablename
+     * @param string $selector
+     * @param $id
+     * @param array $uris
+     * @return array
+     */
+    private function commonGetMultipleCachedCalendarObjects(string $tablename, string $selector, $id, array $uris) {
+        if (empty($uris)) {
+            return [];
+        }
+
+        $chunks = array_chunk($uris, 100);
+        $objects = [];
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', $selector, 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from($tablename)
+            ->where($query->expr()->eq($selector, $query->createNamedParameter($id)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
+
+        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[$selector],
+                    '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
+     * @return string
+     */
+    function createCalendarObject($calendarId, $objectUri, $calendarData) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $q = $this->db->getQueryBuilder();
+        $q->select($q->createFunction('COUNT(*)'))
+            ->from('calendarobjects')
+            ->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
+            ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])));
+
+        $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']),
+            ])
+            ->execute();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData);
+
+        $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),
+            ]
+        ));
+        $this->addChange($calendarId, $objectUri, 1);
+
+        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
+     * @return string
+     */
+    function updateCalendarObject($calendarId, $objectUri, $calendarData) {
+        $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)))
+            ->execute();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData);
+
+        $data = $this->getCalendarObject($calendarId, $objectUri);
+        if (is_array($data)) {
+            $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,
+                ]
+            ));
+        }
+        $this->addChange($calendarId, $objectUri, 2);
+
+        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
+     * @return void
+     */
+    function deleteCalendarObject($calendarId, $objectUri) {
+        $data = $this->getCalendarObject($calendarId, $objectUri);
+        if (is_array($data)) {
+            $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,
+                ]
+            ));
+        }
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ?');
+        $stmt->execute([$calendarId, $objectUri]);
+
+        $this->purgeProperties($calendarId, $data['id']);
+
+        $this->addChange($calendarId, $objectUri, 3);
+    }
+
+    /**
+     * 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 $calendarId
+     * @param array $filters
+     * @return array
+     */
+    function calendarQuery($calendarId, array $filters):array {
+        return $this->commonCalendarQuery('calendarobjects', 'calendarid', $calendarId, $filters);
+    }
+
+    /**
+     * @param $subscriptionId
+     * @param array $filters
+     * @return array
+     */
+    public function cachedCalendarQuery($subscriptionId, array $filters):array {
+        return $this->commonCalendarQuery('calendarsubscrobjects', 'subscriptionid', $subscriptionId, $filters);
+    }
+
+    /**
+     * @param string $tablename
+     * @param string $selector
+     * @param $id
+     * @param array $filters
+     * @return array
+     */
+    private function commonCalendarQuery(string $tablename, string $selector, $id, array $filters) {
+        $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($tablename)
+            ->where($query->expr()->eq($selector, $query->createNamedParameter($id)));
+
+        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
+     *
+     * @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()
+                ->eq('c.calendarid', $query->createNamedParameter($id));
+        }
+        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))
+            );
+        }
+
+        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'])));
+
+        // 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)));
+
+        $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
+     * @return array
+     */
+    function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
+        // 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` = ? ORDER BY `synctoken`";
+            if ($limit>0) {
+                $query.= " LIMIT " . (int)$limit;
+            }
+
+            // Fetching all changes
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$syncToken, $currentToken, $calendarId]);
+
+            $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` = ?";
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$calendarId]);
+
+            $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';
+
+        $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']),
+            ];
+
+            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();
+    }
+
+    /**
+     * 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),
+                '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.
+     * @return void
+     */
+    protected function addChange($calendarId, $objectUri, $operation) {
+
+        $stmt = $this->db->prepare('INSERT INTO `*PREFIX*calendarchanges` (`uri`, `synctoken`, `calendarid`, `operation`) SELECT ?, `synctoken`, ?, ? FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([
+            $objectUri,
+            $calendarId,
+            $operation,
+            $calendarId
+        ]);
+        $stmt = $this->db->prepare('UPDATE `*PREFIX*calendars` 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->sharingBackend->updateShares($shareable, $add, $remove);
+    }
+
+    /**
+     * @param int $resourceId
+     * @return array
+     */
+    public function getShares($resourceId) {
+        return $this->sharingBackend->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->sharingBackend->applyShareAcl($resourceId, $acl);
+    }
+
+
+
+    /**
+     * update properties table
+     *
+     * @param int $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     */
+    public function updateProperties($calendarId, $objectUri, $calendarData) {
+        $objectId = $this->getCalendarObjectId($calendarId, $objectUri);
+
+        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),
+                    '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->delete('calendarsubscrobjects')
+            ->where($query->expr()->eq('subscriptionid', $query->createNamedParameter($subscriptionId)));
+        $query->execute();
+    }
+
+    /**
+     * @param $subscriptionId
+     * @param $objectUri
+     * @param $calendarData
+     * @return string
+     * @throws DAV\Exception\BadRequest
+     */
+    public function addCachedEvent($subscriptionId, $objectUri, $calendarData) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarsubscrobjects')
+            ->values([
+                'subscriptionid' => $query->createNamedParameter($subscriptionId),
+                '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']),
+            ])
+            ->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
+     * @return int
+     */
+    protected function getCalendarObjectId($calendarId, $uri) {
+        $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)));
+
+        $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 +133 added lines, -133 removed lines

@@ -218,7 +218,7 @@ 
 			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
 		}
 
-		return (int)$query->execute()->fetchColumn();
+		return (int) $query->execute()->fetchColumn();
 	}
 
 	/**
@@ -265,25 +265,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];
 			}
 
@@ -301,7 +301,7 @@ 
 		$principals = array_map(function($principal) {
 			return urldecode($principal);
 		}, $principals);
-		$principals[]= $principalUri;
+		$principals[] = $principalUri;
 
 		$fields = array_values($this->propertyMap);
 		$fields[] = 'a.id';
@@ -321,8 +321,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;
 			}
@@ -341,25 +341,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];
 			}
 
@@ -392,21 +392,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];
 			}
 
@@ -461,27 +461,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];
 			}
 
@@ -525,29 +525,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];
 		}
 
@@ -587,20 +587,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];
 		}
 
@@ -637,20 +637,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];
 		}
 
@@ -675,7 +675,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();
@@ -689,10 +689,10 @@ 
 			'principaluri' => $row['principaluri'],
 			'source'       => $row['source'],
 			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
 		];
 
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+		foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
 			if (!is_null($row[$dbName])) {
 				$subscription[$xmlName] = $row[$dbName];
 			}
@@ -727,16 +727,16 @@ 
 		$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());
 		}
-		$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];
 			}
@@ -744,7 +744,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();
@@ -778,7 +778,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
@@ -788,7 +788,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;
@@ -921,16 +921,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[$selector],
-				'size'         => (int)$row['size'],
+				'size'         => (int) $row['size'],
 				'component'    => strtolower($row['componenttype']),
-				'classification'=> (int)$row['classification']
+				'classification'=> (int) $row['classification']
 			];
 		}
 
@@ -982,7 +982,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -990,12 +990,12 @@ 
 			'id'            => $row['id'],
 			'uri'           => $row['uri'],
 			'lastmodified'  => $row['lastmodified'],
-			'etag'          => '"' . $row['etag'] . '"',
+			'etag'          => '"'.$row['etag'].'"',
 			'calendarid'    => $row[$selector],
-			'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']
 		];
 	}
 
@@ -1054,12 +1054,12 @@ 
 					'id'           => $row['id'],
 					'uri'          => $row['uri'],
 					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
+					'etag'         => '"'.$row['etag'].'"',
 					'calendarid'   => $row[$selector],
-					'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();
@@ -1133,7 +1133,7 @@ 
 		));
 		$this->addChange($calendarId, $objectUri, 1);
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1188,7 +1188,7 @@ 
 		}
 		$this->addChange($calendarId, $objectUri, 2);
 
-		return '"' . $extraData['etag'] . '"';
+		return '"'.$extraData['etag'].'"';
 	}
 
 	/**
@@ -1361,13 +1361,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']
@@ -1400,14 +1400,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 {
@@ -1422,11 +1422,11 @@ 
 		$query = $this->db->getQueryBuilder();
 		// Calendar id expressions
 		$calendarExpressions = [];
-		foreach($ownCalendars as $id) {
+		foreach ($ownCalendars as $id) {
 			$calendarExpressions[] = $query->expr()
 				->eq('c.calendarid', $query->createNamedParameter($id));
 		}
-		foreach($sharedCalendars as $id) {
+		foreach ($sharedCalendars as $id) {
 			$calendarExpressions[] = $query->expr()->andX(
 				$query->expr()->eq('c.calendarid',
 					$query->createNamedParameter($id)),
@@ -1443,7 +1443,7 @@ 
 
 		// Component expressions
 		$compExpressions = [];
-		foreach($filters['comps'] as $comp) {
+		foreach ($filters['comps'] as $comp) {
 			$compExpressions[] = $query->expr()
 				->eq('c.componenttype', $query->createNamedParameter($comp));
 		}
@@ -1462,13 +1462,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']))
@@ -1500,8 +1500,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;
 			}
@@ -1539,7 +1539,7 @@ 
 		}
 
 		$or = $innerQuery->expr()->orX();
-		foreach($searchProperties as $searchProperty) {
+		foreach ($searchProperties as $searchProperty) {
 			$or->add($innerQuery->expr()->eq('op.name',
 				$outerQuery->createNamedParameter($searchProperty)));
 		}
@@ -1547,8 +1547,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')
@@ -1568,7 +1568,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)));
 			}
@@ -1593,7 +1593,7 @@ 
 			$comps = $calendarData->getComponents();
 			$objects = [];
 			$timezones = [];
-			foreach($comps as $comp) {
+			foreach ($comps as $comp) {
 				if ($comp instanceof VTimeZone) {
 					$timezones[] = $comp;
 				} else {
@@ -1630,7 +1630,7 @@ 
 		});
 		$validationRules = $comp->getValidationRules();
 
-		foreach($subComponents as $subComponent) {
+		foreach ($subComponents as $subComponent) {
 			$name = $subComponent->name;
 			if (!isset($data[$name])) {
 				$data[$name] = [];
@@ -1638,7 +1638,7 @@ 
 			$data[$name][] = $this->transformSearchData($subComponent);
 		}
 
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$name = $property->name;
 			if (!isset($validationRules[$name])) {
 				$validationRules[$name] = '*';
@@ -1708,7 +1708,7 @@ 
 		$stmt = $query->execute();
 
 		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
+			return $row['calendaruri'].'/'.$row['objecturi'];
 		}
 
 		return null;
@@ -1773,7 +1773,7 @@ 
 	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
 		// 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)) {
@@ -1790,8 +1790,8 @@ 
 		if ($syncToken) {
 
 			$query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? ORDER BY `synctoken`";
-			if ($limit>0) {
-				$query.= " LIMIT " . (int)$limit;
+			if ($limit > 0) {
+				$query .= " LIMIT ".(int) $limit;
 			}
 
 			// Fetching all changes
@@ -1802,15 +1802,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;
@@ -1880,10 +1880,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'],
@@ -1892,10 +1892,10 @@ 
 				'source'       => $row['source'],
 				'lastmodified' => $row['lastmodified'],
 
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
 			];
 
-			foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+			foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
 				if (!is_null($row[$dbName])) {
 					$subscription[$xmlName] = $row[$dbName];
 				}
@@ -1934,7 +1934,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)) {
@@ -1994,7 +1994,7 @@ 
 
 			$newValues = [];
 
-			foreach($mutations as $propertyName=>$propertyValue) {
+			foreach ($mutations as $propertyName=>$propertyValue) {
 				if ($propertyName === '{http://calendarserver.org/ns/}source') {
 					$newValues['source'] = $propertyValue->getHref();
 				} else {
@@ -2006,7 +2006,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)))
@@ -2071,7 +2071,7 @@ 
 
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -2079,8 +2079,8 @@ 
 				'uri'          => $row['uri'],
 				'calendardata' => $row['calendardata'],
 				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
-				'size'         => (int)$row['size'],
+				'etag'         => '"'.$row['etag'].'"',
+				'size'         => (int) $row['size'],
 		];
 	}
 
@@ -2103,13 +2103,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'],
 			];
 		}
 
@@ -2201,10 +2201,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;
 			}
 		}
@@ -2229,13 +2229,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();
 
@@ -2458,7 +2458,7 @@ 
 			->execute();
 
 		$ids = $result->fetchAll();
-		foreach($ids as $id) {
+		foreach ($ids as $id) {
 			$this->deleteCalendar($id['id']);
 		}
 	}
@@ -2543,10 +2543,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'];
 	}
 
 	/**
@@ -2573,8 +2573,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/WebcalCaching/Plugin.php

Unused Use Statements -3 removed lines

@@ -24,15 +24,12 @@
 namespace OCA\DAV\CalDAV\WebcalCaching;
 
 use OCA\DAV\CalDAV\CalendarHome;
-use OCP\BackgroundJob\IJobList;
 use OCP\IRequest;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Plugin extends ServerPlugin {
 

Indentation +99 added lines, -99 removed lines

@@ -36,115 +36,115 @@
 
 class Plugin extends ServerPlugin {
 
-	/**
-	 * list of regular expressions for calendar user agents,
-	 * that do not support subscriptions on their own
-	 *
-	 * @var string[]
-	 */
-	const ENABLE_FOR_CLIENTS = [
-		// TODO - fill me
-	];
+    /**
+     * list of regular expressions for calendar user agents,
+     * that do not support subscriptions on their own
+     *
+     * @var string[]
+     */
+    const ENABLE_FOR_CLIENTS = [
+        // TODO - fill me
+    ];
 
-	/**
-	 * @var bool
-	 */
-	private $enabled=false;
+    /**
+     * @var bool
+     */
+    private $enabled=false;
 
-	/**
-	 * @var Server
-	 */
-	private $server;
+    /**
+     * @var Server
+     */
+    private $server;
 
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param IRequest $request
-	 */
-	public function __construct(IRequest $request) {
-		if ($request->isUserAgent(self::ENABLE_FOR_CLIENTS)) {
-			$this->enabled = true;
-		}
+    /**
+     * Plugin constructor.
+     *
+     * @param IRequest $request
+     */
+    public function __construct(IRequest $request) {
+        if ($request->isUserAgent(self::ENABLE_FOR_CLIENTS)) {
+            $this->enabled = true;
+        }
 
-		$magicHeader = $request->getHeader('X-NC-CALDAV-WEBCAL-CACHING');
-		if ($magicHeader === 'ON') {
-			$this->enabled = true;
-		}
-	}
+        $magicHeader = $request->getHeader('X-NC-CALDAV-WEBCAL-CACHING');
+        if ($magicHeader === 'ON') {
+            $this->enabled = true;
+        }
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$server->on('beforeMethod', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $server->on('beforeMethod', [$this, 'beforeMethod']);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled) {
-			return;
-		}
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled) {
+            return;
+        }
 
-		$path = $request->getPath();
-		$pathParts = explode('/', ltrim($path, '/'));
-		if (\count($pathParts) < 2) {
-			return;
-		}
+        $path = $request->getPath();
+        $pathParts = explode('/', ltrim($path, '/'));
+        if (\count($pathParts) < 2) {
+            return;
+        }
 
-		// $calendarHomePath will look like: calendars/username
-		$calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
-		try {
-			$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-			if (!($calendarHome instanceof CalendarHome)) {
-				//how did we end up here?
-				return;
-			}
+        // $calendarHomePath will look like: calendars/username
+        $calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
+        try {
+            $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+            if (!($calendarHome instanceof CalendarHome)) {
+                //how did we end up here?
+                return;
+            }
 
-			$calendarHome->enableCachedSubscriptionsForThisRequest();
-		} catch(NotFound $ex) {
-			return;
-		}
-	}
+            $calendarHome->enableCachedSubscriptionsForThisRequest();
+        } catch(NotFound $ex) {
+            return;
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function isCachingEnabledForThisRequest():bool {
-		return $this->enabled;
-	}
+    /**
+     * @return bool
+     */
+    public function isCachingEnabledForThisRequest():bool {
+        return $this->enabled;
+    }
 
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures():array {
-		return ['nc-calendar-webcal-cache'];
-	}
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures():array {
+        return ['nc-calendar-webcal-cache'];
+    }
 
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName():string {
-		return 'nc-calendar-webcal-cache';
-	}
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName():string {
+        return 'nc-calendar-webcal-cache';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	/**
 	 * @var bool
 	 */
-	private $enabled=false;
+	private $enabled = false;
 
 	/**
 	 * @var Server
@@ -103,7 +103,7 @@ 
 		}
 
 		// $calendarHomePath will look like: calendars/username
-		$calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
+		$calendarHomePath = $pathParts[0].'/'.$pathParts[1];
 		try {
 			$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
 			if (!($calendarHome instanceof CalendarHome)) {
@@ -112,7 +112,7 @@ 
 			}
 
 			$calendarHome->enableCachedSubscriptionsForThisRequest();
-		} catch(NotFound $ex) {
+		} catch (NotFound $ex) {
 			return;
 		}
 	}

apps/dav/composer/composer/autoload_static.php

Spacing +173 added lines, -173 removed lines

@@ -6,192 +6,192 @@
 
 class ComposerStaticInitDAV
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\DAV\\' => 8,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\DAV\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\DAV\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\DAV\\AppInfo\\PluginManager' => __DIR__ . '/..' . '/../lib/AppInfo/PluginManager.php',
-        'OCA\\DAV\\Avatars\\AvatarHome' => __DIR__ . '/..' . '/../lib/Avatars/AvatarHome.php',
-        'OCA\\DAV\\Avatars\\AvatarNode' => __DIR__ . '/..' . '/../lib/Avatars/AvatarNode.php',
-        'OCA\\DAV\\Avatars\\RootCollection' => __DIR__ . '/..' . '/../lib/Avatars/RootCollection.php',
-        'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
-        'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
-        'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/RefreshWebcalJob.php',
-        'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Backend' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Backend.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Filter/Calendar.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Filter/Todo.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Base.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Calendar.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Event.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Todo.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Calendar.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Event.php',
-        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Todo.php',
-        'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
-        'OCA\\DAV\\CalDAV\\BirthdayService' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayService.php',
-        'OCA\\DAV\\CalDAV\\CachedSubscription' => __DIR__ . '/..' . '/../lib/CalDAV/CachedSubscription.php',
-        'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => __DIR__ . '/..' . '/../lib/CalDAV/CachedSubscriptionObject.php',
-        'OCA\\DAV\\CalDAV\\CalDavBackend' => __DIR__ . '/..' . '/../lib/CalDAV/CalDavBackend.php',
-        'OCA\\DAV\\CalDAV\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Calendar.php',
-        'OCA\\DAV\\CalDAV\\CalendarHome' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarHome.php',
-        'OCA\\DAV\\CalDAV\\CalendarImpl' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarImpl.php',
-        'OCA\\DAV\\CalDAV\\CalendarManager' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarManager.php',
-        'OCA\\DAV\\CalDAV\\CalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarObject.php',
-        'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarRoot.php',
-        'OCA\\DAV\\CalDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Plugin.php',
-        'OCA\\DAV\\CalDAV\\Principal\\Collection' => __DIR__ . '/..' . '/../lib/CalDAV/Principal/Collection.php',
-        'OCA\\DAV\\CalDAV\\Principal\\User' => __DIR__ . '/..' . '/../lib/CalDAV/Principal/User.php',
-        'OCA\\DAV\\CalDAV\\PublicCalendar' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendar.php',
-        'OCA\\DAV\\CalDAV\\PublicCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendarObject.php',
-        'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendarRoot.php',
-        'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Publishing/PublishPlugin.php',
-        'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => __DIR__ . '/..' . '/../lib/CalDAV/Publishing/Xml/Publisher.php',
-        'OCA\\DAV\\CalDAV\\ResourceBooking\\AbstractPrincipalBackend' => __DIR__ . '/..' . '/../lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php',
-        'OCA\\DAV\\CalDAV\\ResourceBooking\\ResourcePrincipalBackend' => __DIR__ . '/..' . '/../lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php',
-        'OCA\\DAV\\CalDAV\\ResourceBooking\\RoomPrincipalBackend' => __DIR__ . '/..' . '/../lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php',
-        'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Schedule/IMipPlugin.php',
-        'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Schedule/Plugin.php',
-        'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Search/SearchPlugin.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
-        'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
-        'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/WebcalCaching/Plugin.php',
-        'OCA\\DAV\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\DAV\\CardDAV\\AddressBook' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBook.php',
-        'OCA\\DAV\\CardDAV\\AddressBookImpl' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookImpl.php',
-        'OCA\\DAV\\CardDAV\\AddressBookRoot' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookRoot.php',
-        'OCA\\DAV\\CardDAV\\CardDavBackend' => __DIR__ . '/..' . '/../lib/CardDAV/CardDavBackend.php',
-        'OCA\\DAV\\CardDAV\\ContactsManager' => __DIR__ . '/..' . '/../lib/CardDAV/ContactsManager.php',
-        'OCA\\DAV\\CardDAV\\Converter' => __DIR__ . '/..' . '/../lib/CardDAV/Converter.php',
-        'OCA\\DAV\\CardDAV\\ImageExportPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/ImageExportPlugin.php',
-        'OCA\\DAV\\CardDAV\\PhotoCache' => __DIR__ . '/..' . '/../lib/CardDAV/PhotoCache.php',
-        'OCA\\DAV\\CardDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CardDAV/Plugin.php',
-        'OCA\\DAV\\CardDAV\\SyncService' => __DIR__ . '/..' . '/../lib/CardDAV/SyncService.php',
-        'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__ . '/..' . '/../lib/CardDAV/UserAddressBooks.php',
-        'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__ . '/..' . '/../lib/CardDAV/Xml/Groups.php',
-        'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__ . '/..' . '/../lib/Command/CreateAddressBook.php',
-        'OCA\\DAV\\Command\\CreateCalendar' => __DIR__ . '/..' . '/../lib/Command/CreateCalendar.php',
-        'OCA\\DAV\\Command\\RemoveInvalidShares' => __DIR__ . '/..' . '/../lib/Command/RemoveInvalidShares.php',
-        'OCA\\DAV\\Command\\SyncBirthdayCalendar' => __DIR__ . '/..' . '/../lib/Command/SyncBirthdayCalendar.php',
-        'OCA\\DAV\\Command\\SyncSystemAddressBook' => __DIR__ . '/..' . '/../lib/Command/SyncSystemAddressBook.php',
-        'OCA\\DAV\\Comments\\CommentNode' => __DIR__ . '/..' . '/../lib/Comments/CommentNode.php',
-        'OCA\\DAV\\Comments\\CommentsPlugin' => __DIR__ . '/..' . '/../lib/Comments/CommentsPlugin.php',
-        'OCA\\DAV\\Comments\\EntityCollection' => __DIR__ . '/..' . '/../lib/Comments/EntityCollection.php',
-        'OCA\\DAV\\Comments\\EntityTypeCollection' => __DIR__ . '/..' . '/../lib/Comments/EntityTypeCollection.php',
-        'OCA\\DAV\\Comments\\RootCollection' => __DIR__ . '/..' . '/../lib/Comments/RootCollection.php',
-        'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__ . '/..' . '/../lib/Connector/LegacyDAVACL.php',
-        'OCA\\DAV\\Connector\\PublicAuth' => __DIR__ . '/..' . '/../lib/Connector/PublicAuth.php',
-        'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AppEnabledPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Auth.php',
-        'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BearerAuth.php',
-        'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\CachingTree' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CachingTree.php',
-        'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ChecksumList.php',
-        'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CustomPropertiesBackend.php',
-        'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/DavAclPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\Directory' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Directory.php',
-        'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/FileLocked.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/Forbidden.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
-        'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
-        'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\File' => __DIR__ . '/..' . '/../lib/Connector/Sabre/File.php',
-        'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FilesPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FilesReportPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/LockPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/MaintenancePlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\Node' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Node.php',
-        'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ObjectTree.php',
-        'OCA\\DAV\\Connector\\Sabre\\Principal' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Principal.php',
-        'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/QuotaPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\Server' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Server.php',
-        'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ServerFactory.php',
-        'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ShareTypeList.php',
-        'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/SharesPlugin.php',
-        'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagList.php',
-        'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagsPlugin.php',
-        'OCA\\DAV\\Controller\\BirthdayCalendarController' => __DIR__ . '/..' . '/../lib/Controller/BirthdayCalendarController.php',
-        'OCA\\DAV\\Controller\\DirectController' => __DIR__ . '/..' . '/../lib/Controller/DirectController.php',
-        'OCA\\DAV\\DAV\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/DAV/CustomPropertiesBackend.php',
-        'OCA\\DAV\\DAV\\GroupPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/GroupPrincipalBackend.php',
-        'OCA\\DAV\\DAV\\PublicAuth' => __DIR__ . '/..' . '/../lib/DAV/PublicAuth.php',
-        'OCA\\DAV\\DAV\\Sharing\\Backend' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Backend.php',
-        'OCA\\DAV\\DAV\\Sharing\\IShareable' => __DIR__ . '/..' . '/../lib/DAV/Sharing/IShareable.php',
-        'OCA\\DAV\\DAV\\Sharing\\Plugin' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Plugin.php',
-        'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/Invite.php',
-        'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
-        'OCA\\DAV\\DAV\\SystemPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/SystemPrincipalBackend.php',
-        'OCA\\DAV\\Db\\Direct' => __DIR__ . '/..' . '/../lib/Db/Direct.php',
-        'OCA\\DAV\\Db\\DirectMapper' => __DIR__ . '/..' . '/../lib/Db/DirectMapper.php',
-        'OCA\\DAV\\Direct\\DirectFile' => __DIR__ . '/..' . '/../lib/Direct/DirectFile.php',
-        'OCA\\DAV\\Direct\\DirectHome' => __DIR__ . '/..' . '/../lib/Direct/DirectHome.php',
-        'OCA\\DAV\\Direct\\Server' => __DIR__ . '/..' . '/../lib/Direct/Server.php',
-        'OCA\\DAV\\Direct\\ServerFactory' => __DIR__ . '/..' . '/../lib/Direct/ServerFactory.php',
-        'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php',
-        'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php',
-        'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php',
-        'OCA\\DAV\\Files\\LazySearchBackend' => __DIR__ . '/..' . '/../lib/Files/LazySearchBackend.php',
-        'OCA\\DAV\\Files\\RootCollection' => __DIR__ . '/..' . '/../lib/Files/RootCollection.php',
-        'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/FilesDropPlugin.php',
-        'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
-        'OCA\\DAV\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
-        'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndex.php',
-        'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
-        'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
-        'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',
-        'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => __DIR__ . '/..' . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
-        'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170825134824.php',
-        'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170919104507.php',
-        'OCA\\DAV\\Migration\\Version1004Date20170924124212' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170924124212.php',
-        'OCA\\DAV\\Migration\\Version1004Date20170926103422' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170926103422.php',
-        'OCA\\DAV\\Migration\\Version1005Date20180413093149' => __DIR__ . '/..' . '/../lib/Migration/Version1005Date20180413093149.php',
-        'OCA\\DAV\\Migration\\Version1005Date20180530124431' => __DIR__ . '/..' . '/../lib/Migration/Version1005Date20180530124431.php',
-        'OCA\\DAV\\Migration\\Version1006Date20180628111625' => __DIR__ . '/..' . '/../lib/Migration/Version1006Date20180628111625.php',
-        'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',
-        'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
-        'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',
-        'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagMappingNode.php',
-        'OCA\\DAV\\SystemTag\\SystemTagNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagNode.php',
-        'OCA\\DAV\\SystemTag\\SystemTagPlugin' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagPlugin.php',
-        'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsByIdCollection.php',
-        'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
-        'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
-        'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsRelationsCollection.php',
-        'OCA\\DAV\\Upload\\AssemblyStream' => __DIR__ . '/..' . '/../lib/Upload/AssemblyStream.php',
-        'OCA\\DAV\\Upload\\ChunkingPlugin' => __DIR__ . '/..' . '/../lib/Upload/ChunkingPlugin.php',
-        'OCA\\DAV\\Upload\\FutureFile' => __DIR__ . '/..' . '/../lib/Upload/FutureFile.php',
-        'OCA\\DAV\\Upload\\RootCollection' => __DIR__ . '/..' . '/../lib/Upload/RootCollection.php',
-        'OCA\\DAV\\Upload\\UploadFolder' => __DIR__ . '/..' . '/../lib/Upload/UploadFolder.php',
-        'OCA\\DAV\\Upload\\UploadHome' => __DIR__ . '/..' . '/../lib/Upload/UploadHome.php',
+    public static $classMap = array(
+        'OCA\\DAV\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\DAV\\AppInfo\\PluginManager' => __DIR__.'/..'.'/../lib/AppInfo/PluginManager.php',
+        'OCA\\DAV\\Avatars\\AvatarHome' => __DIR__.'/..'.'/../lib/Avatars/AvatarHome.php',
+        'OCA\\DAV\\Avatars\\AvatarNode' => __DIR__.'/..'.'/../lib/Avatars/AvatarNode.php',
+        'OCA\\DAV\\Avatars\\RootCollection' => __DIR__.'/..'.'/../lib/Avatars/RootCollection.php',
+        'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupDirectLinksJob.php',
+        'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => __DIR__.'/..'.'/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+        'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => __DIR__.'/..'.'/../lib/BackgroundJob/RefreshWebcalJob.php',
+        'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => __DIR__.'/..'.'/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Backend' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Backend.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Filter/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Filter/Todo.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Provider/Base.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Provider/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Provider/Event.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Provider/Todo.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Setting/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Setting/Event.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => __DIR__.'/..'.'/../lib/CalDAV/Activity/Setting/Todo.php',
+        'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => __DIR__.'/..'.'/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
+        'OCA\\DAV\\CalDAV\\BirthdayService' => __DIR__.'/..'.'/../lib/CalDAV/BirthdayService.php',
+        'OCA\\DAV\\CalDAV\\CachedSubscription' => __DIR__.'/..'.'/../lib/CalDAV/CachedSubscription.php',
+        'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => __DIR__.'/..'.'/../lib/CalDAV/CachedSubscriptionObject.php',
+        'OCA\\DAV\\CalDAV\\CalDavBackend' => __DIR__.'/..'.'/../lib/CalDAV/CalDavBackend.php',
+        'OCA\\DAV\\CalDAV\\Calendar' => __DIR__.'/..'.'/../lib/CalDAV/Calendar.php',
+        'OCA\\DAV\\CalDAV\\CalendarHome' => __DIR__.'/..'.'/../lib/CalDAV/CalendarHome.php',
+        'OCA\\DAV\\CalDAV\\CalendarImpl' => __DIR__.'/..'.'/../lib/CalDAV/CalendarImpl.php',
+        'OCA\\DAV\\CalDAV\\CalendarManager' => __DIR__.'/..'.'/../lib/CalDAV/CalendarManager.php',
+        'OCA\\DAV\\CalDAV\\CalendarObject' => __DIR__.'/..'.'/../lib/CalDAV/CalendarObject.php',
+        'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__.'/..'.'/../lib/CalDAV/CalendarRoot.php',
+        'OCA\\DAV\\CalDAV\\Plugin' => __DIR__.'/..'.'/../lib/CalDAV/Plugin.php',
+        'OCA\\DAV\\CalDAV\\Principal\\Collection' => __DIR__.'/..'.'/../lib/CalDAV/Principal/Collection.php',
+        'OCA\\DAV\\CalDAV\\Principal\\User' => __DIR__.'/..'.'/../lib/CalDAV/Principal/User.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendar' => __DIR__.'/..'.'/../lib/CalDAV/PublicCalendar.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendarObject' => __DIR__.'/..'.'/../lib/CalDAV/PublicCalendarObject.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => __DIR__.'/..'.'/../lib/CalDAV/PublicCalendarRoot.php',
+        'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => __DIR__.'/..'.'/../lib/CalDAV/Publishing/PublishPlugin.php',
+        'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => __DIR__.'/..'.'/../lib/CalDAV/Publishing/Xml/Publisher.php',
+        'OCA\\DAV\\CalDAV\\ResourceBooking\\AbstractPrincipalBackend' => __DIR__.'/..'.'/../lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php',
+        'OCA\\DAV\\CalDAV\\ResourceBooking\\ResourcePrincipalBackend' => __DIR__.'/..'.'/../lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php',
+        'OCA\\DAV\\CalDAV\\ResourceBooking\\RoomPrincipalBackend' => __DIR__.'/..'.'/../lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php',
+        'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => __DIR__.'/..'.'/../lib/CalDAV/Schedule/IMipPlugin.php',
+        'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => __DIR__.'/..'.'/../lib/CalDAV/Schedule/Plugin.php',
+        'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => __DIR__.'/..'.'/../lib/CalDAV/Search/SearchPlugin.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__.'/..'.'/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+        'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => __DIR__.'/..'.'/../lib/CalDAV/WebcalCaching/Plugin.php',
+        'OCA\\DAV\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\DAV\\CardDAV\\AddressBook' => __DIR__.'/..'.'/../lib/CardDAV/AddressBook.php',
+        'OCA\\DAV\\CardDAV\\AddressBookImpl' => __DIR__.'/..'.'/../lib/CardDAV/AddressBookImpl.php',
+        'OCA\\DAV\\CardDAV\\AddressBookRoot' => __DIR__.'/..'.'/../lib/CardDAV/AddressBookRoot.php',
+        'OCA\\DAV\\CardDAV\\CardDavBackend' => __DIR__.'/..'.'/../lib/CardDAV/CardDavBackend.php',
+        'OCA\\DAV\\CardDAV\\ContactsManager' => __DIR__.'/..'.'/../lib/CardDAV/ContactsManager.php',
+        'OCA\\DAV\\CardDAV\\Converter' => __DIR__.'/..'.'/../lib/CardDAV/Converter.php',
+        'OCA\\DAV\\CardDAV\\ImageExportPlugin' => __DIR__.'/..'.'/../lib/CardDAV/ImageExportPlugin.php',
+        'OCA\\DAV\\CardDAV\\PhotoCache' => __DIR__.'/..'.'/../lib/CardDAV/PhotoCache.php',
+        'OCA\\DAV\\CardDAV\\Plugin' => __DIR__.'/..'.'/../lib/CardDAV/Plugin.php',
+        'OCA\\DAV\\CardDAV\\SyncService' => __DIR__.'/..'.'/../lib/CardDAV/SyncService.php',
+        'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__.'/..'.'/../lib/CardDAV/UserAddressBooks.php',
+        'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__.'/..'.'/../lib/CardDAV/Xml/Groups.php',
+        'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__.'/..'.'/../lib/Command/CreateAddressBook.php',
+        'OCA\\DAV\\Command\\CreateCalendar' => __DIR__.'/..'.'/../lib/Command/CreateCalendar.php',
+        'OCA\\DAV\\Command\\RemoveInvalidShares' => __DIR__.'/..'.'/../lib/Command/RemoveInvalidShares.php',
+        'OCA\\DAV\\Command\\SyncBirthdayCalendar' => __DIR__.'/..'.'/../lib/Command/SyncBirthdayCalendar.php',
+        'OCA\\DAV\\Command\\SyncSystemAddressBook' => __DIR__.'/..'.'/../lib/Command/SyncSystemAddressBook.php',
+        'OCA\\DAV\\Comments\\CommentNode' => __DIR__.'/..'.'/../lib/Comments/CommentNode.php',
+        'OCA\\DAV\\Comments\\CommentsPlugin' => __DIR__.'/..'.'/../lib/Comments/CommentsPlugin.php',
+        'OCA\\DAV\\Comments\\EntityCollection' => __DIR__.'/..'.'/../lib/Comments/EntityCollection.php',
+        'OCA\\DAV\\Comments\\EntityTypeCollection' => __DIR__.'/..'.'/../lib/Comments/EntityTypeCollection.php',
+        'OCA\\DAV\\Comments\\RootCollection' => __DIR__.'/..'.'/../lib/Comments/RootCollection.php',
+        'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__.'/..'.'/../lib/Connector/LegacyDAVACL.php',
+        'OCA\\DAV\\Connector\\PublicAuth' => __DIR__.'/..'.'/../lib/Connector/PublicAuth.php',
+        'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/AppEnabledPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__.'/..'.'/../lib/Connector/Sabre/Auth.php',
+        'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => __DIR__.'/..'.'/../lib/Connector/Sabre/BearerAuth.php',
+        'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CachingTree' => __DIR__.'/..'.'/../lib/Connector/Sabre/CachingTree.php',
+        'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => __DIR__.'/..'.'/../lib/Connector/Sabre/ChecksumList.php',
+        'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => __DIR__.'/..'.'/../lib/Connector/Sabre/CustomPropertiesBackend.php',
+        'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/DavAclPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Directory' => __DIR__.'/..'.'/../lib/Connector/Sabre/Directory.php',
+        'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/FileLocked.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/Forbidden.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/InvalidPath.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => __DIR__.'/..'.'/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
+        'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/FakeLockerPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\File' => __DIR__.'/..'.'/../lib/Connector/Sabre/File.php',
+        'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/FilesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/FilesReportPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/LockPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/MaintenancePlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Node' => __DIR__.'/..'.'/../lib/Connector/Sabre/Node.php',
+        'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => __DIR__.'/..'.'/../lib/Connector/Sabre/ObjectTree.php',
+        'OCA\\DAV\\Connector\\Sabre\\Principal' => __DIR__.'/..'.'/../lib/Connector/Sabre/Principal.php',
+        'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/QuotaPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Server' => __DIR__.'/..'.'/../lib/Connector/Sabre/Server.php',
+        'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => __DIR__.'/..'.'/../lib/Connector/Sabre/ServerFactory.php',
+        'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => __DIR__.'/..'.'/../lib/Connector/Sabre/ShareTypeList.php',
+        'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/SharesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__.'/..'.'/../lib/Connector/Sabre/TagList.php',
+        'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__.'/..'.'/../lib/Connector/Sabre/TagsPlugin.php',
+        'OCA\\DAV\\Controller\\BirthdayCalendarController' => __DIR__.'/..'.'/../lib/Controller/BirthdayCalendarController.php',
+        'OCA\\DAV\\Controller\\DirectController' => __DIR__.'/..'.'/../lib/Controller/DirectController.php',
+        'OCA\\DAV\\DAV\\CustomPropertiesBackend' => __DIR__.'/..'.'/../lib/DAV/CustomPropertiesBackend.php',
+        'OCA\\DAV\\DAV\\GroupPrincipalBackend' => __DIR__.'/..'.'/../lib/DAV/GroupPrincipalBackend.php',
+        'OCA\\DAV\\DAV\\PublicAuth' => __DIR__.'/..'.'/../lib/DAV/PublicAuth.php',
+        'OCA\\DAV\\DAV\\Sharing\\Backend' => __DIR__.'/..'.'/../lib/DAV/Sharing/Backend.php',
+        'OCA\\DAV\\DAV\\Sharing\\IShareable' => __DIR__.'/..'.'/../lib/DAV/Sharing/IShareable.php',
+        'OCA\\DAV\\DAV\\Sharing\\Plugin' => __DIR__.'/..'.'/../lib/DAV/Sharing/Plugin.php',
+        'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => __DIR__.'/..'.'/../lib/DAV/Sharing/Xml/Invite.php',
+        'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => __DIR__.'/..'.'/../lib/DAV/Sharing/Xml/ShareRequest.php',
+        'OCA\\DAV\\DAV\\SystemPrincipalBackend' => __DIR__.'/..'.'/../lib/DAV/SystemPrincipalBackend.php',
+        'OCA\\DAV\\Db\\Direct' => __DIR__.'/..'.'/../lib/Db/Direct.php',
+        'OCA\\DAV\\Db\\DirectMapper' => __DIR__.'/..'.'/../lib/Db/DirectMapper.php',
+        'OCA\\DAV\\Direct\\DirectFile' => __DIR__.'/..'.'/../lib/Direct/DirectFile.php',
+        'OCA\\DAV\\Direct\\DirectHome' => __DIR__.'/..'.'/../lib/Direct/DirectHome.php',
+        'OCA\\DAV\\Direct\\Server' => __DIR__.'/..'.'/../lib/Direct/Server.php',
+        'OCA\\DAV\\Direct\\ServerFactory' => __DIR__.'/..'.'/../lib/Direct/ServerFactory.php',
+        'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__.'/..'.'/../lib/Files/BrowserErrorPagePlugin.php',
+        'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__.'/..'.'/../lib/Files/FileSearchBackend.php',
+        'OCA\\DAV\\Files\\FilesHome' => __DIR__.'/..'.'/../lib/Files/FilesHome.php',
+        'OCA\\DAV\\Files\\LazySearchBackend' => __DIR__.'/..'.'/../lib/Files/LazySearchBackend.php',
+        'OCA\\DAV\\Files\\RootCollection' => __DIR__.'/..'.'/../lib/Files/RootCollection.php',
+        'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => __DIR__.'/..'.'/../lib/Files/Sharing/FilesDropPlugin.php',
+        'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__.'/..'.'/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+        'OCA\\DAV\\HookManager' => __DIR__.'/..'.'/../lib/HookManager.php',
+        'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__.'/..'.'/../lib/Migration/BuildCalendarSearchIndex.php',
+        'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__.'/..'.'/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+        'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__.'/..'.'/../lib/Migration/CalDAVRemoveEmptyValue.php',
+        'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__.'/..'.'/../lib/Migration/FixBirthdayCalendarComponent.php',
+        'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => __DIR__.'/..'.'/../lib/Migration/RefreshWebcalJobRegistrar.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__.'/..'.'/../lib/Migration/Version1004Date20170825134824.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__.'/..'.'/../lib/Migration/Version1004Date20170919104507.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170924124212' => __DIR__.'/..'.'/../lib/Migration/Version1004Date20170924124212.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170926103422' => __DIR__.'/..'.'/../lib/Migration/Version1004Date20170926103422.php',
+        'OCA\\DAV\\Migration\\Version1005Date20180413093149' => __DIR__.'/..'.'/../lib/Migration/Version1005Date20180413093149.php',
+        'OCA\\DAV\\Migration\\Version1005Date20180530124431' => __DIR__.'/..'.'/../lib/Migration/Version1005Date20180530124431.php',
+        'OCA\\DAV\\Migration\\Version1006Date20180628111625' => __DIR__.'/..'.'/../lib/Migration/Version1006Date20180628111625.php',
+        'OCA\\DAV\\RootCollection' => __DIR__.'/..'.'/../lib/RootCollection.php',
+        'OCA\\DAV\\Server' => __DIR__.'/..'.'/../lib/Server.php',
+        'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__.'/..'.'/../lib/Settings/CalDAVSettings.php',
+        'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagMappingNode.php',
+        'OCA\\DAV\\SystemTag\\SystemTagNode' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagNode.php',
+        'OCA\\DAV\\SystemTag\\SystemTagPlugin' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagPlugin.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagsByIdCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => __DIR__.'/..'.'/../lib/SystemTag/SystemTagsRelationsCollection.php',
+        'OCA\\DAV\\Upload\\AssemblyStream' => __DIR__.'/..'.'/../lib/Upload/AssemblyStream.php',
+        'OCA\\DAV\\Upload\\ChunkingPlugin' => __DIR__.'/..'.'/../lib/Upload/ChunkingPlugin.php',
+        'OCA\\DAV\\Upload\\FutureFile' => __DIR__.'/..'.'/../lib/Upload/FutureFile.php',
+        'OCA\\DAV\\Upload\\RootCollection' => __DIR__.'/..'.'/../lib/Upload/RootCollection.php',
+        'OCA\\DAV\\Upload\\UploadFolder' => __DIR__.'/..'.'/../lib/Upload/UploadFolder.php',
+        'OCA\\DAV\\Upload\\UploadHome' => __DIR__.'/..'.'/../lib/Upload/UploadHome.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitDAV::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitDAV::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitDAV::$classMap;

apps/dav/composer/composer/autoload_classmap.php

Spacing +166 added lines, -166 removed lines

@@ -6,170 +6,170 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\DAV\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\DAV\\AppInfo\\PluginManager' => $baseDir . '/../lib/AppInfo/PluginManager.php',
-    'OCA\\DAV\\Avatars\\AvatarHome' => $baseDir . '/../lib/Avatars/AvatarHome.php',
-    'OCA\\DAV\\Avatars\\AvatarNode' => $baseDir . '/../lib/Avatars/AvatarNode.php',
-    'OCA\\DAV\\Avatars\\RootCollection' => $baseDir . '/../lib/Avatars/RootCollection.php',
-    'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => $baseDir . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
-    'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => $baseDir . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
-    'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => $baseDir . '/../lib/BackgroundJob/RefreshWebcalJob.php',
-    'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => $baseDir . '/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Backend' => $baseDir . '/../lib/CalDAV/Activity/Backend.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Filter/Calendar.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Filter/Todo.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => $baseDir . '/../lib/CalDAV/Activity/Provider/Base.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Provider/Calendar.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => $baseDir . '/../lib/CalDAV/Activity/Provider/Event.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Provider/Todo.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Setting/Calendar.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => $baseDir . '/../lib/CalDAV/Activity/Setting/Event.php',
-    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Setting/Todo.php',
-    'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => $baseDir . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
-    'OCA\\DAV\\CalDAV\\BirthdayService' => $baseDir . '/../lib/CalDAV/BirthdayService.php',
-    'OCA\\DAV\\CalDAV\\CachedSubscription' => $baseDir . '/../lib/CalDAV/CachedSubscription.php',
-    'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => $baseDir . '/../lib/CalDAV/CachedSubscriptionObject.php',
-    'OCA\\DAV\\CalDAV\\CalDavBackend' => $baseDir . '/../lib/CalDAV/CalDavBackend.php',
-    'OCA\\DAV\\CalDAV\\Calendar' => $baseDir . '/../lib/CalDAV/Calendar.php',
-    'OCA\\DAV\\CalDAV\\CalendarHome' => $baseDir . '/../lib/CalDAV/CalendarHome.php',
-    'OCA\\DAV\\CalDAV\\CalendarImpl' => $baseDir . '/../lib/CalDAV/CalendarImpl.php',
-    'OCA\\DAV\\CalDAV\\CalendarManager' => $baseDir . '/../lib/CalDAV/CalendarManager.php',
-    'OCA\\DAV\\CalDAV\\CalendarObject' => $baseDir . '/../lib/CalDAV/CalendarObject.php',
-    'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir . '/../lib/CalDAV/CalendarRoot.php',
-    'OCA\\DAV\\CalDAV\\Plugin' => $baseDir . '/../lib/CalDAV/Plugin.php',
-    'OCA\\DAV\\CalDAV\\Principal\\Collection' => $baseDir . '/../lib/CalDAV/Principal/Collection.php',
-    'OCA\\DAV\\CalDAV\\Principal\\User' => $baseDir . '/../lib/CalDAV/Principal/User.php',
-    'OCA\\DAV\\CalDAV\\PublicCalendar' => $baseDir . '/../lib/CalDAV/PublicCalendar.php',
-    'OCA\\DAV\\CalDAV\\PublicCalendarObject' => $baseDir . '/../lib/CalDAV/PublicCalendarObject.php',
-    'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => $baseDir . '/../lib/CalDAV/PublicCalendarRoot.php',
-    'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => $baseDir . '/../lib/CalDAV/Publishing/PublishPlugin.php',
-    'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => $baseDir . '/../lib/CalDAV/Publishing/Xml/Publisher.php',
-    'OCA\\DAV\\CalDAV\\ResourceBooking\\AbstractPrincipalBackend' => $baseDir . '/../lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php',
-    'OCA\\DAV\\CalDAV\\ResourceBooking\\ResourcePrincipalBackend' => $baseDir . '/../lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php',
-    'OCA\\DAV\\CalDAV\\ResourceBooking\\RoomPrincipalBackend' => $baseDir . '/../lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php',
-    'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => $baseDir . '/../lib/CalDAV/Schedule/IMipPlugin.php',
-    'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => $baseDir . '/../lib/CalDAV/Schedule/Plugin.php',
-    'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => $baseDir . '/../lib/CalDAV/Search/SearchPlugin.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
-    'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
-    'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => $baseDir . '/../lib/CalDAV/WebcalCaching/Plugin.php',
-    'OCA\\DAV\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\DAV\\CardDAV\\AddressBook' => $baseDir . '/../lib/CardDAV/AddressBook.php',
-    'OCA\\DAV\\CardDAV\\AddressBookImpl' => $baseDir . '/../lib/CardDAV/AddressBookImpl.php',
-    'OCA\\DAV\\CardDAV\\AddressBookRoot' => $baseDir . '/../lib/CardDAV/AddressBookRoot.php',
-    'OCA\\DAV\\CardDAV\\CardDavBackend' => $baseDir . '/../lib/CardDAV/CardDavBackend.php',
-    'OCA\\DAV\\CardDAV\\ContactsManager' => $baseDir . '/../lib/CardDAV/ContactsManager.php',
-    'OCA\\DAV\\CardDAV\\Converter' => $baseDir . '/../lib/CardDAV/Converter.php',
-    'OCA\\DAV\\CardDAV\\ImageExportPlugin' => $baseDir . '/../lib/CardDAV/ImageExportPlugin.php',
-    'OCA\\DAV\\CardDAV\\PhotoCache' => $baseDir . '/../lib/CardDAV/PhotoCache.php',
-    'OCA\\DAV\\CardDAV\\Plugin' => $baseDir . '/../lib/CardDAV/Plugin.php',
-    'OCA\\DAV\\CardDAV\\SyncService' => $baseDir . '/../lib/CardDAV/SyncService.php',
-    'OCA\\DAV\\CardDAV\\UserAddressBooks' => $baseDir . '/../lib/CardDAV/UserAddressBooks.php',
-    'OCA\\DAV\\CardDAV\\Xml\\Groups' => $baseDir . '/../lib/CardDAV/Xml/Groups.php',
-    'OCA\\DAV\\Command\\CreateAddressBook' => $baseDir . '/../lib/Command/CreateAddressBook.php',
-    'OCA\\DAV\\Command\\CreateCalendar' => $baseDir . '/../lib/Command/CreateCalendar.php',
-    'OCA\\DAV\\Command\\RemoveInvalidShares' => $baseDir . '/../lib/Command/RemoveInvalidShares.php',
-    'OCA\\DAV\\Command\\SyncBirthdayCalendar' => $baseDir . '/../lib/Command/SyncBirthdayCalendar.php',
-    'OCA\\DAV\\Command\\SyncSystemAddressBook' => $baseDir . '/../lib/Command/SyncSystemAddressBook.php',
-    'OCA\\DAV\\Comments\\CommentNode' => $baseDir . '/../lib/Comments/CommentNode.php',
-    'OCA\\DAV\\Comments\\CommentsPlugin' => $baseDir . '/../lib/Comments/CommentsPlugin.php',
-    'OCA\\DAV\\Comments\\EntityCollection' => $baseDir . '/../lib/Comments/EntityCollection.php',
-    'OCA\\DAV\\Comments\\EntityTypeCollection' => $baseDir . '/../lib/Comments/EntityTypeCollection.php',
-    'OCA\\DAV\\Comments\\RootCollection' => $baseDir . '/../lib/Comments/RootCollection.php',
-    'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir . '/../lib/Connector/LegacyDAVACL.php',
-    'OCA\\DAV\\Connector\\PublicAuth' => $baseDir . '/../lib/Connector/PublicAuth.php',
-    'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => $baseDir . '/../lib/Connector/Sabre/AppEnabledPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir . '/../lib/Connector/Sabre/Auth.php',
-    'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => $baseDir . '/../lib/Connector/Sabre/BearerAuth.php',
-    'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => $baseDir . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\CachingTree' => $baseDir . '/../lib/Connector/Sabre/CachingTree.php',
-    'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => $baseDir . '/../lib/Connector/Sabre/ChecksumList.php',
-    'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => $baseDir . '/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => $baseDir . '/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => $baseDir . '/../lib/Connector/Sabre/CustomPropertiesBackend.php',
-    'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => $baseDir . '/../lib/Connector/Sabre/DavAclPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\Directory' => $baseDir . '/../lib/Connector/Sabre/Directory.php',
-    'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => $baseDir . '/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => $baseDir . '/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => $baseDir . '/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => $baseDir . '/../lib/Connector/Sabre/Exception/FileLocked.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/Forbidden.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => $baseDir . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
-    'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => $baseDir . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
-    'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => $baseDir . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\File' => $baseDir . '/../lib/Connector/Sabre/File.php',
-    'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => $baseDir . '/../lib/Connector/Sabre/FilesPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => $baseDir . '/../lib/Connector/Sabre/FilesReportPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => $baseDir . '/../lib/Connector/Sabre/LockPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => $baseDir . '/../lib/Connector/Sabre/MaintenancePlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\Node' => $baseDir . '/../lib/Connector/Sabre/Node.php',
-    'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => $baseDir . '/../lib/Connector/Sabre/ObjectTree.php',
-    'OCA\\DAV\\Connector\\Sabre\\Principal' => $baseDir . '/../lib/Connector/Sabre/Principal.php',
-    'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => $baseDir . '/../lib/Connector/Sabre/QuotaPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\Server' => $baseDir . '/../lib/Connector/Sabre/Server.php',
-    'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => $baseDir . '/../lib/Connector/Sabre/ServerFactory.php',
-    'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => $baseDir . '/../lib/Connector/Sabre/ShareTypeList.php',
-    'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => $baseDir . '/../lib/Connector/Sabre/SharesPlugin.php',
-    'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir . '/../lib/Connector/Sabre/TagList.php',
-    'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir . '/../lib/Connector/Sabre/TagsPlugin.php',
-    'OCA\\DAV\\Controller\\BirthdayCalendarController' => $baseDir . '/../lib/Controller/BirthdayCalendarController.php',
-    'OCA\\DAV\\Controller\\DirectController' => $baseDir . '/../lib/Controller/DirectController.php',
-    'OCA\\DAV\\DAV\\CustomPropertiesBackend' => $baseDir . '/../lib/DAV/CustomPropertiesBackend.php',
-    'OCA\\DAV\\DAV\\GroupPrincipalBackend' => $baseDir . '/../lib/DAV/GroupPrincipalBackend.php',
-    'OCA\\DAV\\DAV\\PublicAuth' => $baseDir . '/../lib/DAV/PublicAuth.php',
-    'OCA\\DAV\\DAV\\Sharing\\Backend' => $baseDir . '/../lib/DAV/Sharing/Backend.php',
-    'OCA\\DAV\\DAV\\Sharing\\IShareable' => $baseDir . '/../lib/DAV/Sharing/IShareable.php',
-    'OCA\\DAV\\DAV\\Sharing\\Plugin' => $baseDir . '/../lib/DAV/Sharing/Plugin.php',
-    'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => $baseDir . '/../lib/DAV/Sharing/Xml/Invite.php',
-    'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => $baseDir . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
-    'OCA\\DAV\\DAV\\SystemPrincipalBackend' => $baseDir . '/../lib/DAV/SystemPrincipalBackend.php',
-    'OCA\\DAV\\Db\\Direct' => $baseDir . '/../lib/Db/Direct.php',
-    'OCA\\DAV\\Db\\DirectMapper' => $baseDir . '/../lib/Db/DirectMapper.php',
-    'OCA\\DAV\\Direct\\DirectFile' => $baseDir . '/../lib/Direct/DirectFile.php',
-    'OCA\\DAV\\Direct\\DirectHome' => $baseDir . '/../lib/Direct/DirectHome.php',
-    'OCA\\DAV\\Direct\\Server' => $baseDir . '/../lib/Direct/Server.php',
-    'OCA\\DAV\\Direct\\ServerFactory' => $baseDir . '/../lib/Direct/ServerFactory.php',
-    'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php',
-    'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php',
-    'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php',
-    'OCA\\DAV\\Files\\LazySearchBackend' => $baseDir . '/../lib/Files/LazySearchBackend.php',
-    'OCA\\DAV\\Files\\RootCollection' => $baseDir . '/../lib/Files/RootCollection.php',
-    'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => $baseDir . '/../lib/Files/Sharing/FilesDropPlugin.php',
-    'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
-    'OCA\\DAV\\HookManager' => $baseDir . '/../lib/HookManager.php',
-    'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndex.php',
-    'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
-    'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
-    'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',
-    'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => $baseDir . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
-    'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir . '/../lib/Migration/Version1004Date20170825134824.php',
-    'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir . '/../lib/Migration/Version1004Date20170919104507.php',
-    'OCA\\DAV\\Migration\\Version1004Date20170924124212' => $baseDir . '/../lib/Migration/Version1004Date20170924124212.php',
-    'OCA\\DAV\\Migration\\Version1004Date20170926103422' => $baseDir . '/../lib/Migration/Version1004Date20170926103422.php',
-    'OCA\\DAV\\Migration\\Version1005Date20180413093149' => $baseDir . '/../lib/Migration/Version1005Date20180413093149.php',
-    'OCA\\DAV\\Migration\\Version1005Date20180530124431' => $baseDir . '/../lib/Migration/Version1005Date20180530124431.php',
-    'OCA\\DAV\\Migration\\Version1006Date20180628111625' => $baseDir . '/../lib/Migration/Version1006Date20180628111625.php',
-    'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',
-    'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
-    'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',
-    'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => $baseDir . '/../lib/SystemTag/SystemTagMappingNode.php',
-    'OCA\\DAV\\SystemTag\\SystemTagNode' => $baseDir . '/../lib/SystemTag/SystemTagNode.php',
-    'OCA\\DAV\\SystemTag\\SystemTagPlugin' => $baseDir . '/../lib/SystemTag/SystemTagPlugin.php',
-    'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => $baseDir . '/../lib/SystemTag/SystemTagsByIdCollection.php',
-    'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => $baseDir . '/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
-    'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => $baseDir . '/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
-    'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => $baseDir . '/../lib/SystemTag/SystemTagsRelationsCollection.php',
-    'OCA\\DAV\\Upload\\AssemblyStream' => $baseDir . '/../lib/Upload/AssemblyStream.php',
-    'OCA\\DAV\\Upload\\ChunkingPlugin' => $baseDir . '/../lib/Upload/ChunkingPlugin.php',
-    'OCA\\DAV\\Upload\\FutureFile' => $baseDir . '/../lib/Upload/FutureFile.php',
-    'OCA\\DAV\\Upload\\RootCollection' => $baseDir . '/../lib/Upload/RootCollection.php',
-    'OCA\\DAV\\Upload\\UploadFolder' => $baseDir . '/../lib/Upload/UploadFolder.php',
-    'OCA\\DAV\\Upload\\UploadHome' => $baseDir . '/../lib/Upload/UploadHome.php',
+    'OCA\\DAV\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\DAV\\AppInfo\\PluginManager' => $baseDir.'/../lib/AppInfo/PluginManager.php',
+    'OCA\\DAV\\Avatars\\AvatarHome' => $baseDir.'/../lib/Avatars/AvatarHome.php',
+    'OCA\\DAV\\Avatars\\AvatarNode' => $baseDir.'/../lib/Avatars/AvatarNode.php',
+    'OCA\\DAV\\Avatars\\RootCollection' => $baseDir.'/../lib/Avatars/RootCollection.php',
+    'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => $baseDir.'/../lib/BackgroundJob/CleanupDirectLinksJob.php',
+    'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => $baseDir.'/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+    'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => $baseDir.'/../lib/BackgroundJob/RefreshWebcalJob.php',
+    'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => $baseDir.'/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Backend' => $baseDir.'/../lib/CalDAV/Activity/Backend.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => $baseDir.'/../lib/CalDAV/Activity/Filter/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => $baseDir.'/../lib/CalDAV/Activity/Filter/Todo.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => $baseDir.'/../lib/CalDAV/Activity/Provider/Base.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => $baseDir.'/../lib/CalDAV/Activity/Provider/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => $baseDir.'/../lib/CalDAV/Activity/Provider/Event.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => $baseDir.'/../lib/CalDAV/Activity/Provider/Todo.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => $baseDir.'/../lib/CalDAV/Activity/Setting/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => $baseDir.'/../lib/CalDAV/Activity/Setting/Event.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => $baseDir.'/../lib/CalDAV/Activity/Setting/Todo.php',
+    'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => $baseDir.'/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
+    'OCA\\DAV\\CalDAV\\BirthdayService' => $baseDir.'/../lib/CalDAV/BirthdayService.php',
+    'OCA\\DAV\\CalDAV\\CachedSubscription' => $baseDir.'/../lib/CalDAV/CachedSubscription.php',
+    'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => $baseDir.'/../lib/CalDAV/CachedSubscriptionObject.php',
+    'OCA\\DAV\\CalDAV\\CalDavBackend' => $baseDir.'/../lib/CalDAV/CalDavBackend.php',
+    'OCA\\DAV\\CalDAV\\Calendar' => $baseDir.'/../lib/CalDAV/Calendar.php',
+    'OCA\\DAV\\CalDAV\\CalendarHome' => $baseDir.'/../lib/CalDAV/CalendarHome.php',
+    'OCA\\DAV\\CalDAV\\CalendarImpl' => $baseDir.'/../lib/CalDAV/CalendarImpl.php',
+    'OCA\\DAV\\CalDAV\\CalendarManager' => $baseDir.'/../lib/CalDAV/CalendarManager.php',
+    'OCA\\DAV\\CalDAV\\CalendarObject' => $baseDir.'/../lib/CalDAV/CalendarObject.php',
+    'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir.'/../lib/CalDAV/CalendarRoot.php',
+    'OCA\\DAV\\CalDAV\\Plugin' => $baseDir.'/../lib/CalDAV/Plugin.php',
+    'OCA\\DAV\\CalDAV\\Principal\\Collection' => $baseDir.'/../lib/CalDAV/Principal/Collection.php',
+    'OCA\\DAV\\CalDAV\\Principal\\User' => $baseDir.'/../lib/CalDAV/Principal/User.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendar' => $baseDir.'/../lib/CalDAV/PublicCalendar.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendarObject' => $baseDir.'/../lib/CalDAV/PublicCalendarObject.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => $baseDir.'/../lib/CalDAV/PublicCalendarRoot.php',
+    'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => $baseDir.'/../lib/CalDAV/Publishing/PublishPlugin.php',
+    'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => $baseDir.'/../lib/CalDAV/Publishing/Xml/Publisher.php',
+    'OCA\\DAV\\CalDAV\\ResourceBooking\\AbstractPrincipalBackend' => $baseDir.'/../lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php',
+    'OCA\\DAV\\CalDAV\\ResourceBooking\\ResourcePrincipalBackend' => $baseDir.'/../lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php',
+    'OCA\\DAV\\CalDAV\\ResourceBooking\\RoomPrincipalBackend' => $baseDir.'/../lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php',
+    'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => $baseDir.'/../lib/CalDAV/Schedule/IMipPlugin.php',
+    'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => $baseDir.'/../lib/CalDAV/Schedule/Plugin.php',
+    'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => $baseDir.'/../lib/CalDAV/Search/SearchPlugin.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir.'/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir.'/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+    'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => $baseDir.'/../lib/CalDAV/WebcalCaching/Plugin.php',
+    'OCA\\DAV\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\DAV\\CardDAV\\AddressBook' => $baseDir.'/../lib/CardDAV/AddressBook.php',
+    'OCA\\DAV\\CardDAV\\AddressBookImpl' => $baseDir.'/../lib/CardDAV/AddressBookImpl.php',
+    'OCA\\DAV\\CardDAV\\AddressBookRoot' => $baseDir.'/../lib/CardDAV/AddressBookRoot.php',
+    'OCA\\DAV\\CardDAV\\CardDavBackend' => $baseDir.'/../lib/CardDAV/CardDavBackend.php',
+    'OCA\\DAV\\CardDAV\\ContactsManager' => $baseDir.'/../lib/CardDAV/ContactsManager.php',
+    'OCA\\DAV\\CardDAV\\Converter' => $baseDir.'/../lib/CardDAV/Converter.php',
+    'OCA\\DAV\\CardDAV\\ImageExportPlugin' => $baseDir.'/../lib/CardDAV/ImageExportPlugin.php',
+    'OCA\\DAV\\CardDAV\\PhotoCache' => $baseDir.'/../lib/CardDAV/PhotoCache.php',
+    'OCA\\DAV\\CardDAV\\Plugin' => $baseDir.'/../lib/CardDAV/Plugin.php',
+    'OCA\\DAV\\CardDAV\\SyncService' => $baseDir.'/../lib/CardDAV/SyncService.php',
+    'OCA\\DAV\\CardDAV\\UserAddressBooks' => $baseDir.'/../lib/CardDAV/UserAddressBooks.php',
+    'OCA\\DAV\\CardDAV\\Xml\\Groups' => $baseDir.'/../lib/CardDAV/Xml/Groups.php',
+    'OCA\\DAV\\Command\\CreateAddressBook' => $baseDir.'/../lib/Command/CreateAddressBook.php',
+    'OCA\\DAV\\Command\\CreateCalendar' => $baseDir.'/../lib/Command/CreateCalendar.php',
+    'OCA\\DAV\\Command\\RemoveInvalidShares' => $baseDir.'/../lib/Command/RemoveInvalidShares.php',
+    'OCA\\DAV\\Command\\SyncBirthdayCalendar' => $baseDir.'/../lib/Command/SyncBirthdayCalendar.php',
+    'OCA\\DAV\\Command\\SyncSystemAddressBook' => $baseDir.'/../lib/Command/SyncSystemAddressBook.php',
+    'OCA\\DAV\\Comments\\CommentNode' => $baseDir.'/../lib/Comments/CommentNode.php',
+    'OCA\\DAV\\Comments\\CommentsPlugin' => $baseDir.'/../lib/Comments/CommentsPlugin.php',
+    'OCA\\DAV\\Comments\\EntityCollection' => $baseDir.'/../lib/Comments/EntityCollection.php',
+    'OCA\\DAV\\Comments\\EntityTypeCollection' => $baseDir.'/../lib/Comments/EntityTypeCollection.php',
+    'OCA\\DAV\\Comments\\RootCollection' => $baseDir.'/../lib/Comments/RootCollection.php',
+    'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir.'/../lib/Connector/LegacyDAVACL.php',
+    'OCA\\DAV\\Connector\\PublicAuth' => $baseDir.'/../lib/Connector/PublicAuth.php',
+    'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir.'/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => $baseDir.'/../lib/Connector/Sabre/AppEnabledPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir.'/../lib/Connector/Sabre/Auth.php',
+    'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => $baseDir.'/../lib/Connector/Sabre/BearerAuth.php',
+    'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => $baseDir.'/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CachingTree' => $baseDir.'/../lib/Connector/Sabre/CachingTree.php',
+    'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => $baseDir.'/../lib/Connector/Sabre/ChecksumList.php',
+    'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => $baseDir.'/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => $baseDir.'/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => $baseDir.'/../lib/Connector/Sabre/CustomPropertiesBackend.php',
+    'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => $baseDir.'/../lib/Connector/Sabre/DavAclPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Directory' => $baseDir.'/../lib/Connector/Sabre/Directory.php',
+    'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => $baseDir.'/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => $baseDir.'/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => $baseDir.'/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => $baseDir.'/../lib/Connector/Sabre/Exception/FileLocked.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => $baseDir.'/../lib/Connector/Sabre/Exception/Forbidden.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => $baseDir.'/../lib/Connector/Sabre/Exception/InvalidPath.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => $baseDir.'/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => $baseDir.'/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
+    'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => $baseDir.'/../lib/Connector/Sabre/FakeLockerPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\File' => $baseDir.'/../lib/Connector/Sabre/File.php',
+    'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => $baseDir.'/../lib/Connector/Sabre/FilesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => $baseDir.'/../lib/Connector/Sabre/FilesReportPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => $baseDir.'/../lib/Connector/Sabre/LockPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => $baseDir.'/../lib/Connector/Sabre/MaintenancePlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Node' => $baseDir.'/../lib/Connector/Sabre/Node.php',
+    'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => $baseDir.'/../lib/Connector/Sabre/ObjectTree.php',
+    'OCA\\DAV\\Connector\\Sabre\\Principal' => $baseDir.'/../lib/Connector/Sabre/Principal.php',
+    'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => $baseDir.'/../lib/Connector/Sabre/QuotaPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Server' => $baseDir.'/../lib/Connector/Sabre/Server.php',
+    'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => $baseDir.'/../lib/Connector/Sabre/ServerFactory.php',
+    'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => $baseDir.'/../lib/Connector/Sabre/ShareTypeList.php',
+    'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => $baseDir.'/../lib/Connector/Sabre/SharesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir.'/../lib/Connector/Sabre/TagList.php',
+    'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir.'/../lib/Connector/Sabre/TagsPlugin.php',
+    'OCA\\DAV\\Controller\\BirthdayCalendarController' => $baseDir.'/../lib/Controller/BirthdayCalendarController.php',
+    'OCA\\DAV\\Controller\\DirectController' => $baseDir.'/../lib/Controller/DirectController.php',
+    'OCA\\DAV\\DAV\\CustomPropertiesBackend' => $baseDir.'/../lib/DAV/CustomPropertiesBackend.php',
+    'OCA\\DAV\\DAV\\GroupPrincipalBackend' => $baseDir.'/../lib/DAV/GroupPrincipalBackend.php',
+    'OCA\\DAV\\DAV\\PublicAuth' => $baseDir.'/../lib/DAV/PublicAuth.php',
+    'OCA\\DAV\\DAV\\Sharing\\Backend' => $baseDir.'/../lib/DAV/Sharing/Backend.php',
+    'OCA\\DAV\\DAV\\Sharing\\IShareable' => $baseDir.'/../lib/DAV/Sharing/IShareable.php',
+    'OCA\\DAV\\DAV\\Sharing\\Plugin' => $baseDir.'/../lib/DAV/Sharing/Plugin.php',
+    'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => $baseDir.'/../lib/DAV/Sharing/Xml/Invite.php',
+    'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => $baseDir.'/../lib/DAV/Sharing/Xml/ShareRequest.php',
+    'OCA\\DAV\\DAV\\SystemPrincipalBackend' => $baseDir.'/../lib/DAV/SystemPrincipalBackend.php',
+    'OCA\\DAV\\Db\\Direct' => $baseDir.'/../lib/Db/Direct.php',
+    'OCA\\DAV\\Db\\DirectMapper' => $baseDir.'/../lib/Db/DirectMapper.php',
+    'OCA\\DAV\\Direct\\DirectFile' => $baseDir.'/../lib/Direct/DirectFile.php',
+    'OCA\\DAV\\Direct\\DirectHome' => $baseDir.'/../lib/Direct/DirectHome.php',
+    'OCA\\DAV\\Direct\\Server' => $baseDir.'/../lib/Direct/Server.php',
+    'OCA\\DAV\\Direct\\ServerFactory' => $baseDir.'/../lib/Direct/ServerFactory.php',
+    'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir.'/../lib/Files/BrowserErrorPagePlugin.php',
+    'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir.'/../lib/Files/FileSearchBackend.php',
+    'OCA\\DAV\\Files\\FilesHome' => $baseDir.'/../lib/Files/FilesHome.php',
+    'OCA\\DAV\\Files\\LazySearchBackend' => $baseDir.'/../lib/Files/LazySearchBackend.php',
+    'OCA\\DAV\\Files\\RootCollection' => $baseDir.'/../lib/Files/RootCollection.php',
+    'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => $baseDir.'/../lib/Files/Sharing/FilesDropPlugin.php',
+    'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir.'/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+    'OCA\\DAV\\HookManager' => $baseDir.'/../lib/HookManager.php',
+    'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir.'/../lib/Migration/BuildCalendarSearchIndex.php',
+    'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir.'/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+    'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir.'/../lib/Migration/CalDAVRemoveEmptyValue.php',
+    'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir.'/../lib/Migration/FixBirthdayCalendarComponent.php',
+    'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => $baseDir.'/../lib/Migration/RefreshWebcalJobRegistrar.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir.'/../lib/Migration/Version1004Date20170825134824.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir.'/../lib/Migration/Version1004Date20170919104507.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170924124212' => $baseDir.'/../lib/Migration/Version1004Date20170924124212.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170926103422' => $baseDir.'/../lib/Migration/Version1004Date20170926103422.php',
+    'OCA\\DAV\\Migration\\Version1005Date20180413093149' => $baseDir.'/../lib/Migration/Version1005Date20180413093149.php',
+    'OCA\\DAV\\Migration\\Version1005Date20180530124431' => $baseDir.'/../lib/Migration/Version1005Date20180530124431.php',
+    'OCA\\DAV\\Migration\\Version1006Date20180628111625' => $baseDir.'/../lib/Migration/Version1006Date20180628111625.php',
+    'OCA\\DAV\\RootCollection' => $baseDir.'/../lib/RootCollection.php',
+    'OCA\\DAV\\Server' => $baseDir.'/../lib/Server.php',
+    'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir.'/../lib/Settings/CalDAVSettings.php',
+    'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => $baseDir.'/../lib/SystemTag/SystemTagMappingNode.php',
+    'OCA\\DAV\\SystemTag\\SystemTagNode' => $baseDir.'/../lib/SystemTag/SystemTagNode.php',
+    'OCA\\DAV\\SystemTag\\SystemTagPlugin' => $baseDir.'/../lib/SystemTag/SystemTagPlugin.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => $baseDir.'/../lib/SystemTag/SystemTagsByIdCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => $baseDir.'/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => $baseDir.'/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => $baseDir.'/../lib/SystemTag/SystemTagsRelationsCollection.php',
+    'OCA\\DAV\\Upload\\AssemblyStream' => $baseDir.'/../lib/Upload/AssemblyStream.php',
+    'OCA\\DAV\\Upload\\ChunkingPlugin' => $baseDir.'/../lib/Upload/ChunkingPlugin.php',
+    'OCA\\DAV\\Upload\\FutureFile' => $baseDir.'/../lib/Upload/FutureFile.php',
+    'OCA\\DAV\\Upload\\RootCollection' => $baseDir.'/../lib/Upload/RootCollection.php',
+    'OCA\\DAV\\Upload\\UploadFolder' => $baseDir.'/../lib/Upload/UploadFolder.php',
+    'OCA\\DAV\\Upload\\UploadHome' => $baseDir.'/../lib/Upload/UploadHome.php',
 );

apps/dav/appinfo/app.php

Indentation +46 added lines, -46 removed lines

@@ -31,59 +31,59 @@ 
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
 
-		$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
-	}
+        $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
 
-		$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
+        $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
 
-		/** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
-		$calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
-		$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-	}
+        /** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
+        $calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
+        $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+    }
 );
 
 $eventHandler = function() use ($app) {
-	try {
-		$job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
-		$job->run([]);
-		$app->getContainer()->getServer()->getJobList()->setLastRun($job);
-	} catch(\Exception $ex) {
-		$app->getContainer()->getServer()->getLogger()->logException($ex);
-	}
+    try {
+        $job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
+        $job->run([]);
+        $app->getContainer()->getServer()->getJobList()->setLastRun($job);
+    } catch(\Exception $ex) {
+        $app->getContainer()->getServer()->getLogger()->logException($ex);
+    }
 };
 
 $eventDispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
@@ -91,18 +91,18 @@ 
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	} else {
-		$app->setupSystemContactsProvider($cm);
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    } else {
+        $app->setupSystemContactsProvider($cm);
+    }
 });
 
 $calendarManager = \OC::$server->getCalendarManager();
 $calendarManager->register(function() use ($calendarManager, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if ($user !== null) {
-		$app->setupCalendarProvider($calendarManager, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if ($user !== null) {
+        $app->setupCalendarProvider($calendarManager, $user->getUID());
+    }
 });

apps/dav/lib/CalDAV/CachedSubscription.php

Indentation +136 added lines, -136 removed lines

@@ -36,140 +36,140 @@
  */
 class CachedSubscription extends \Sabre\CalDAV\Calendar {
 
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI():string {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getACL():array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]
-		];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildACL():array {
-		return $this->getACL();
-	}
-
-	/**
-	 * @return null|string
-	 */
-	public function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	/**
-	 *
-	 */
-	public function delete() {
-		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
-	}
-
-	/**
-	 * @param PropPatch $propPatch
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		$this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
-	}
-
-	/**
-	 * @param string $name
-	 * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-		return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildren():array {
-		$objs = $this->caldavBackend->getCachedCalendarObjects($this->calendarInfo['id']);
-
-		$children = [];
-		foreach($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param array $paths
-	 * @return array
-	 */
-	public function getMultipleChildren(array $paths):array {
-		$objs = $this->caldavBackend->getMultipleCachedCalendarObjects($this->calendarInfo['id'], $paths);
-
-		$children = [];
-		foreach($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param string $name
-	 * @param null $calendarData
-	 * @return null|string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function createFile($name, $calendarData = null) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
-
-	/**
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name):bool {
-		$obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param array $filters
-	 * @return array
-	 */
-	public function calendarQuery(array $filters):array {
-		return $this->caldavBackend->cachedCalendarQuery($this->calendarInfo['id'], $filters);
-	}
-
-	/**
-	 * CachedSubscriptions don't support sync-tokens for now
-	 * Clients will have to do a multi get etag for now
-	 *
-	 * @return null
-	 */
-	public function getSyncToken() {
-		return null;
-	}
+    /**
+     * @return string
+     */
+    public function getPrincipalURI():string {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @return array
+     */
+    public function getACL():array {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildACL():array {
+        return $this->getACL();
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    /**
+     *
+     */
+    public function delete() {
+        $this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
+    }
+
+    /**
+     * @param PropPatch $propPatch
+     */
+    public function propPatch(PropPatch $propPatch) {
+        $this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
+    }
+
+    /**
+     * @param string $name
+     * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+        return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildren():array {
+        $objs = $this->caldavBackend->getCachedCalendarObjects($this->calendarInfo['id']);
+
+        $children = [];
+        foreach($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param array $paths
+     * @return array
+     */
+    public function getMultipleChildren(array $paths):array {
+        $objs = $this->caldavBackend->getMultipleCachedCalendarObjects($this->calendarInfo['id'], $paths);
+
+        $children = [];
+        foreach($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param string $name
+     * @param null $calendarData
+     * @return null|string|void
+     * @throws MethodNotAllowed
+     */
+    public function createFile($name, $calendarData = null) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name):bool {
+        $obj = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $filters
+     * @return array
+     */
+    public function calendarQuery(array $filters):array {
+        return $this->caldavBackend->cachedCalendarQuery($this->calendarInfo['id'], $filters);
+    }
+
+    /**
+     * CachedSubscriptions don't support sync-tokens for now
+     * Clients will have to do a multi get etag for now
+     *
+     * @return null
+     */
+    public function getSyncToken() {
+        return null;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 		$objs = $this->caldavBackend->getCachedCalendarObjects($this->calendarInfo['id']);
 
 		$children = [];
-		foreach($objs as $obj) {
+		foreach ($objs as $obj) {
 			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
 		}
 
@@ -125,7 +125,7 @@ 
 		$objs = $this->caldavBackend->getMultipleCachedCalendarObjects($this->calendarInfo['id'], $paths);
 
 		$children = [];
-		foreach($objs as $obj) {
+		foreach ($objs as $obj) {
 			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
 		}
 

apps/dav/lib/CalDAV/CalendarHome.php

Indentation +123 added lines, -123 removed lines

@@ -37,127 +37,127 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var \OCP\IConfig */
-	private $config;
-
-	/** @var bool */
-	private $returnCachedSubscriptions=false;
-
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = \OC::$server->getConfig();
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function createExtendedCollection($name, MkCol $mkCol) {
-		$reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
-
-		if (in_array($name, $reservedNames)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->principalInfo['uri']);
-		}
-
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($this->returnCachedSubscriptions) {
-					$objects[] = new CachedSubscription($this->caldavBackend, $subscription);
-				} else {
-					$objects[] = new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-			}
-		}
-
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					if ($this->returnCachedSubscriptions) {
-						return new CachedSubscription($this->caldavBackend, $subscription);
-					}
-
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	function calendarSearch(array $filters, $limit=null, $offset=null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
-
-	/**
-	 *
-	 */
-	public function enableCachedSubscriptionsForThisRequest() {
-		$this->returnCachedSubscriptions = true;
-	}
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var \OCP\IConfig */
+    private $config;
+
+    /** @var bool */
+    private $returnCachedSubscriptions=false;
+
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = \OC::$server->getConfig();
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function createExtendedCollection($name, MkCol $mkCol) {
+        $reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
+
+        if (in_array($name, $reservedNames)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->principalInfo['uri']);
+        }
+
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($this->returnCachedSubscriptions) {
+                    $objects[] = new CachedSubscription($this->caldavBackend, $subscription);
+                } else {
+                    $objects[] = new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        return $objects;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+            }
+        }
+
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    if ($this->returnCachedSubscriptions) {
+                        return new CachedSubscription($this->caldavBackend, $subscription);
+                    }
+
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    function calendarSearch(array $filters, $limit=null, $offset=null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
+
+    /**
+     *
+     */
+    public function enableCachedSubscriptionsForThisRequest() {
+        $this->returnCachedSubscriptions = true;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 	private $config;
 
 	/** @var bool */
-	private $returnCachedSubscriptions=false;
+	private $returnCachedSubscriptions = false;
 
 	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
 		parent::__construct($caldavBackend, $principalInfo);
@@ -141,7 +141,7 @@ 
 
 		}
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
+		throw new NotFound('Node with name \''.$name.'\' could not be found');
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @param integer|null $limit
 	 * @param integer|null $offset
 	 */
-	function calendarSearch(array $filters, $limit=null, $offset=null) {
+	function calendarSearch(array $filters, $limit = null, $offset = null) {
 		$principalUri = $this->principalInfo['uri'];
 		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
 	}

apps/dav/lib/CalDAV/CachedSubscriptionObject.php

Indentation +25 added lines, -25 removed lines

@@ -33,32 +33,32 @@
  */
 class CachedSubscriptionObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		// Pre-populating the 'calendardata' is optional, if we don't have it
-		// already we fetch it from the backend.
-		if (!isset($this->objectData['calendardata'])) {
-			$this->objectData = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-		}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCachedCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+        }
 
-		return $this->objectData['calendardata'];
-	}
+        return $this->objectData['calendardata'];
+    }
 
-	/**
-	 * @param resource|string $calendarData
-	 * @return string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function put($calendarData) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
+    /**
+     * @param resource|string $calendarData
+     * @return string|void
+     * @throws MethodNotAllowed
+     */
+    public function put($calendarData) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
 
-	/**
-	 * @throws MethodNotAllowed
-	 */
-	public function delete() {
-		throw new MethodNotAllowed('Deleting objects in cached subscription is not allowed');
-	}
+    /**
+     * @throws MethodNotAllowed
+     */
+    public function delete() {
+        throw new MethodNotAllowed('Deleting objects in cached subscription is not allowed');
+    }
 }

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

Indentation +126 added lines, -126 removed lines

@@ -34,133 +34,133 @@
 
 class RefreshWebcalJob extends TimedJob {
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param CalDavBackend $calDavBackend
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 */
-	public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger) {
-		$this->calDavBackend = $calDavBackend;
-		$this->clientService = $clientService;
-		$this->logger = $logger;
-
-		$this->setInterval(60*60*24);
-	}
-
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument) {
-		$principalUri = $argument['principaluri'];
-		$uri = $argument['uri'];
-
-		$subscriptions = array_filter(
-			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function($sub) use ($uri) {
-				return $sub['uri'] === $uri;
-			}
-		);
-
-		if (\count($subscriptions) === 0) {
-			return;
-		}
-		/** @var array $subscription */
-		$subscription = $subscriptions[0];
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param CalDavBackend $calDavBackend
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     */
+    public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger) {
+        $this->calDavBackend = $calDavBackend;
+        $this->clientService = $clientService;
+        $this->logger = $logger;
+
+        $this->setInterval(60*60*24);
+    }
+
+    /**
+     * @param array $argument
+     */
+    protected function run($argument) {
+        $principalUri = $argument['principaluri'];
+        $uri = $argument['uri'];
+
+        $subscriptions = array_filter(
+            $this->calDavBackend->getSubscriptionsForUser($principalUri),
+            function($sub) use ($uri) {
+                return $sub['uri'] === $uri;
+            }
+        );
+
+        if (\count($subscriptions) === 0) {
+            return;
+        }
+        /** @var array $subscription */
+        $subscription = $subscriptions[0];
 
 //		if ($subscription['refreshrate'])
 
-		$webcalData = $this->queryWebcalFeed($subscription);
-		if (!$webcalData) {
-			return;
-		}
-
-		$stripTodos = $subscription['striptodos'];
-		$stripAlarms = $subscription['stripalarms'];
-		$stripAttachments = $subscription['stripattachments'];
-
-		try {
-			$splitter = new ICalendar($webcalData);
-
-			// we wait with deleting all purged events till we parsed the new ones
-			// in case the new calendar is broken and new ICalendar throws a ParseException
-			// the user will still see the old data
-			$this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
-
-			while ($vObject = $splitter->getNext()) {
-				/** @var Component $vObject */
-				$uid = null;
-				$compName = null;
-
-				foreach ($vObject->getComponents() as $component) {
-					if ($component->name === 'VTIMEZONE') {
-						continue;
-					}
-
-					$uid = $component->{'UID'}->getValue();
-					$compName = $component->name;
-
-					if ($stripAlarms) {
-						unset($component->{'VALARM'});
-					}
-					if ($stripAttachments) {
-						unset($component->{'ATTACH'});
-					}
-				}
-
-				if ($stripTodos && $compName === 'VTODO') {
-					continue;
-				}
-
-				$uri = $uid . '.ics';
-				$calendarData = $vObject->serialize();
-				try {
-					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
-					$this->logger->logException($ex);
-				}
-			}
-
-		} catch(ParseException $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
-		}
-	}
-
-	/**
-	 * @param array $subscription
-	 * @return null|resource
-	 */
-	private function queryWebcalFeed(array $subscription) {
-		$client = $this->clientService->newClient();
-		try {
-			$response = $client->get($subscription['source'], [
-				'stream' => true,
-				'allow_redirects' => [
-					'redirects' => 10
-				]
-			]);
-
-			return $response->getBody();
-		} catch(\Exception $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
-
-			return null;
-		}
-	}
+        $webcalData = $this->queryWebcalFeed($subscription);
+        if (!$webcalData) {
+            return;
+        }
+
+        $stripTodos = $subscription['striptodos'];
+        $stripAlarms = $subscription['stripalarms'];
+        $stripAttachments = $subscription['stripattachments'];
+
+        try {
+            $splitter = new ICalendar($webcalData);
+
+            // we wait with deleting all purged events till we parsed the new ones
+            // in case the new calendar is broken and new ICalendar throws a ParseException
+            // the user will still see the old data
+            $this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
+
+            while ($vObject = $splitter->getNext()) {
+                /** @var Component $vObject */
+                $uid = null;
+                $compName = null;
+
+                foreach ($vObject->getComponents() as $component) {
+                    if ($component->name === 'VTIMEZONE') {
+                        continue;
+                    }
+
+                    $uid = $component->{'UID'}->getValue();
+                    $compName = $component->name;
+
+                    if ($stripAlarms) {
+                        unset($component->{'VALARM'});
+                    }
+                    if ($stripAttachments) {
+                        unset($component->{'ATTACH'});
+                    }
+                }
+
+                if ($stripTodos && $compName === 'VTODO') {
+                    continue;
+                }
+
+                $uri = $uid . '.ics';
+                $calendarData = $vObject->serialize();
+                try {
+                    $this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
+                } catch(BadRequest $ex) {
+                    $this->logger->logException($ex);
+                }
+            }
+
+        } catch(ParseException $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
+        }
+    }
+
+    /**
+     * @param array $subscription
+     * @return null|resource
+     */
+    private function queryWebcalFeed(array $subscription) {
+        $client = $this->clientService->newClient();
+        try {
+            $response = $client->get($subscription['source'], [
+                'stream' => true,
+                'allow_redirects' => [
+                    'redirects' => 10
+                ]
+            ]);
+
+            return $response->getBody();
+        } catch(\Exception $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
+
+            return null;
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 		$this->clientService = $clientService;
 		$this->logger = $logger;
 
-		$this->setInterval(60*60*24);
+		$this->setInterval(60 * 60 * 24);
 	}
 
 	/**
@@ -122,16 +122,16 @@ 
 					continue;
 				}
 
-				$uri = $uid . '.ics';
+				$uri = $uid.'.ics';
 				$calendarData = $vObject->serialize();
 				try {
 					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
+				} catch (BadRequest $ex) {
 					$this->logger->logException($ex);
 				}
 			}
 
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -154,7 +154,7 @@ 
 			]);
 
 			return $response->getBody();
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);