nextcloud / server

apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php

Indentation +49 added lines, -49 removed lines

@@ -37,59 +37,59 @@
 
 class SystemTagsRelationsCollection extends SimpleCollection {
 
-	/**
-	 * SystemTagsRelationsCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
-	) {
-		$children = [
-			new SystemTagsObjectTypeCollection(
-				'files',
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				function ($name) {
-					$nodes = \OC::$server->getUserFolder()->getById((int)$name);
-					return !empty($nodes);
-				}
-			),
-		];
+    /**
+     * SystemTagsRelationsCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $children = [
+            new SystemTagsObjectTypeCollection(
+                'files',
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                function ($name) {
+                    $nodes = \OC::$server->getUserFolder()->getById((int)$name);
+                    return !empty($nodes);
+                }
+            ),
+        ];
 
-		$event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
-		$dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
+        $event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
+        $dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
 
-		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
-			$children[] = new SystemTagsObjectTypeCollection(
-				$entity,
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				$entityExistsFunction
-			);
-		}
+        foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
+            $children[] = new SystemTagsObjectTypeCollection(
+                $entity,
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                $entityExistsFunction
+            );
+        }
 
-		parent::__construct('root', $children);
-	}
+        parent::__construct('root', $children);
+    }
 
-	function getName() {
-		return 'systemtags-relations';
-	}
+    function getName() {
+        return 'systemtags-relations';
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
 
 }

apps/dav/lib/Controller/BirthdayCalendarController.php

Indentation +65 added lines, -65 removed lines

@@ -38,80 +38,80 @@
 
 class BirthdayCalendarController extends Controller {
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $db;
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
+    /**
+     * @var IConfig
+     */
+    protected $config;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	/**
-	 * @var CalDavBackend
-	 */
-	protected $caldavBackend;
+    /**
+     * @var CalDavBackend
+     */
+    protected $caldavBackend;
 
-	/**
-	 * @var IJobList
-	 */
-	protected $jobList;
+    /**
+     * @var IJobList
+     */
+    protected $jobList;
 
-	/**
-	 * BirthdayCalendar constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 * @param IJobList $jobList
-	 * @param IUserManager $userManager
-	 * @param CalDavBackend $calDavBackend
-	 */
-	public function __construct($appName, IRequest $request,
-								IDBConnection $db, IConfig $config,
-								IJobList $jobList,
-								IUserManager $userManager,
-								CalDavBackend $calDavBackend) {
-		parent::__construct($appName, $request);
-		$this->db = $db;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->jobList = $jobList;
-		$this->caldavBackend = $calDavBackend;
-	}
+    /**
+     * BirthdayCalendar constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IDBConnection $db
+     * @param IConfig $config
+     * @param IJobList $jobList
+     * @param IUserManager $userManager
+     * @param CalDavBackend $calDavBackend
+     */
+    public function __construct($appName, IRequest $request,
+                                IDBConnection $db, IConfig $config,
+                                IJobList $jobList,
+                                IUserManager $userManager,
+                                CalDavBackend $calDavBackend) {
+        parent::__construct($appName, $request);
+        $this->db = $db;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->jobList = $jobList;
+        $this->caldavBackend = $calDavBackend;
+    }
 
-	/**
-	 * @return Response
-	 */
-	public function enable() {
-		$this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes');
+    /**
+     * @return Response
+     */
+    public function enable() {
+        $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes');
 
-		// add background job for each user
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$this->jobList->add(GenerateBirthdayCalendarBackgroundJob::class, [
-				'userId' => $user->getUID(),
-			]);
-		});
+        // add background job for each user
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $this->jobList->add(GenerateBirthdayCalendarBackgroundJob::class, [
+                'userId' => $user->getUID(),
+            ]);
+        });
 
-		return new JSONResponse([]);
-	}
+        return new JSONResponse([]);
+    }
 
-	/**
-	 * @return Response
-	 */
-	public function disable() {
-		$this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'no');
+    /**
+     * @return Response
+     */
+    public function disable() {
+        $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'no');
 
-		$this->jobList->remove(GenerateBirthdayCalendarBackgroundJob::class);
-		$this->caldavBackend->deleteAllBirthdayCalendars();
+        $this->jobList->remove(GenerateBirthdayCalendarBackgroundJob::class);
+        $this->caldavBackend->deleteAllBirthdayCalendars();
 
-		return new JSONResponse([]);
-	}
+        return new JSONResponse([]);
+    }
 }

apps/dav/lib/Comments/CommentNode.php

Indentation +241 added lines, -241 removed lines

@@ -35,270 +35,270 @@
 use Sabre\DAV\PropPatch;
 
 class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
-	const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
-	const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
-	const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
-	const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
-	const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
-	const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
-	const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
+    const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
+    const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
+    const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
+    const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
+    const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
+    const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
+    const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
 
-	/** @var  IComment */
-	public $comment;
+    /** @var  IComment */
+    public $comment;
 
-	/** @var ICommentsManager */
-	protected $commentsManager;
+    /** @var ICommentsManager */
+    protected $commentsManager;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	/** @var array list of properties with key being their name and value their setter */
-	protected $properties = [];
+    /** @var array list of properties with key being their name and value their setter */
+    protected $properties = [];
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * CommentNode constructor.
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IComment $comment
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		ICommentsManager $commentsManager,
-		IComment $comment,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		$this->commentsManager = $commentsManager;
-		$this->comment = $comment;
-		$this->logger = $logger;
+    /**
+     * CommentNode constructor.
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IComment $comment
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     */
+    public function __construct(
+        ICommentsManager $commentsManager,
+        IComment $comment,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        $this->commentsManager = $commentsManager;
+        $this->comment = $comment;
+        $this->logger = $logger;
 
-		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
-			return strpos($name, 'get') === 0;
-		});
-		foreach($methods as $getter) {
-			if($getter === 'getMentions') {
-				continue;	// special treatment
-			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
-			$this->properties[$name] = $getter;
-		}
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-	}
+        $methods = get_class_methods($this->comment);
+        $methods = array_filter($methods, function ($name) {
+            return strpos($name, 'get') === 0;
+        });
+        foreach($methods as $getter) {
+            if($getter === 'getMentions') {
+                continue;	// special treatment
+            }
+            $name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+            $this->properties[$name] = $getter;
+        }
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * returns a list of all possible property names
-	 *
-	 * @return array
-	 */
-	static public function getPropertyNames() {
-		return [
-			'{http://owncloud.org/ns}id',
-			'{http://owncloud.org/ns}parentId',
-			'{http://owncloud.org/ns}topmostParentId',
-			'{http://owncloud.org/ns}childrenCount',
-			'{http://owncloud.org/ns}verb',
-			'{http://owncloud.org/ns}actorType',
-			'{http://owncloud.org/ns}actorId',
-			'{http://owncloud.org/ns}creationDateTime',
-			'{http://owncloud.org/ns}latestChildDateTime',
-			'{http://owncloud.org/ns}objectType',
-			'{http://owncloud.org/ns}objectId',
-			// re-used property names are defined as constants
-			self::PROPERTY_NAME_MESSAGE,
-			self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
-			self::PROPERTY_NAME_UNREAD,
-			self::PROPERTY_NAME_MENTIONS,
-			self::PROPERTY_NAME_MENTION,
-			self::PROPERTY_NAME_MENTION_TYPE,
-			self::PROPERTY_NAME_MENTION_ID,
-			self::PROPERTY_NAME_MENTION_DISPLAYNAME,
-		];
-	}
+    /**
+     * returns a list of all possible property names
+     *
+     * @return array
+     */
+    static public function getPropertyNames() {
+        return [
+            '{http://owncloud.org/ns}id',
+            '{http://owncloud.org/ns}parentId',
+            '{http://owncloud.org/ns}topmostParentId',
+            '{http://owncloud.org/ns}childrenCount',
+            '{http://owncloud.org/ns}verb',
+            '{http://owncloud.org/ns}actorType',
+            '{http://owncloud.org/ns}actorId',
+            '{http://owncloud.org/ns}creationDateTime',
+            '{http://owncloud.org/ns}latestChildDateTime',
+            '{http://owncloud.org/ns}objectType',
+            '{http://owncloud.org/ns}objectId',
+            // re-used property names are defined as constants
+            self::PROPERTY_NAME_MESSAGE,
+            self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
+            self::PROPERTY_NAME_UNREAD,
+            self::PROPERTY_NAME_MENTIONS,
+            self::PROPERTY_NAME_MENTION,
+            self::PROPERTY_NAME_MENTION_TYPE,
+            self::PROPERTY_NAME_MENTION_ID,
+            self::PROPERTY_NAME_MENTION_DISPLAYNAME,
+        ];
+    }
 
-	protected function checkWriteAccessOnComment() {
-		$user = $this->userSession->getUser();
-		if(    $this->comment->getActorType() !== 'users'
-			|| is_null($user)
-			|| $this->comment->getActorId() !== $user->getUID()
-		) {
-			throw new Forbidden('Only authors are allowed to edit their comment.');
-		}
-	}
+    protected function checkWriteAccessOnComment() {
+        $user = $this->userSession->getUser();
+        if(    $this->comment->getActorType() !== 'users'
+            || is_null($user)
+            || $this->comment->getActorId() !== $user->getUID()
+        ) {
+            throw new Forbidden('Only authors are allowed to edit their comment.');
+        }
+    }
 
-	/**
-	 * Deleted the current node
-	 *
-	 * @return void
-	 */
-	function delete() {
-		$this->checkWriteAccessOnComment();
-		$this->commentsManager->delete($this->comment->getId());
-	}
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    function delete() {
+        $this->checkWriteAccessOnComment();
+        $this->commentsManager->delete($this->comment->getId());
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	function getName() {
-		return $this->comment->getId();
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    function getName() {
+        return $this->comment->getId();
+    }
 
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws MethodNotAllowed
-	 */
-	function setName($name) {
-		throw new MethodNotAllowed();
-	}
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws MethodNotAllowed
+     */
+    function setName($name) {
+        throw new MethodNotAllowed();
+    }
 
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	function getLastModified() {
-		return null;
-	}
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified() {
+        return null;
+    }
 
-	/**
-	 * update the comment's message
-	 *
-	 * @param $propertyValue
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws \Exception
-	 */
-	public function updateComment($propertyValue) {
-		$this->checkWriteAccessOnComment();
-		try {
-			$this->comment->setMessage($propertyValue);
-			$this->commentsManager->save($this->comment);
-			return true;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'dav/comments']);
-			if($e instanceof MessageTooLongException) {
-				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
-			}
-			throw $e;
-		}
-	}
+    /**
+     * update the comment's message
+     *
+     * @param $propertyValue
+     * @return bool
+     * @throws BadRequest
+     * @throws \Exception
+     */
+    public function updateComment($propertyValue) {
+        $this->checkWriteAccessOnComment();
+        try {
+            $this->comment->setMessage($propertyValue);
+            $this->commentsManager->save($this->comment);
+            return true;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'dav/comments']);
+            if($e instanceof MessageTooLongException) {
+                $msg = 'Message exceeds allowed character limit of ';
+                throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+            }
+            throw $e;
+        }
+    }
 
-	/**
-	 * Updates properties on this node.
-	 *
-	 * This method received a PropPatch object, which contains all the
-	 * information about the update.
-	 *
-	 * To update specific properties, call the 'handle' method on this object.
-	 * Read the PropPatch documentation for more information.
-	 *
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	function propPatch(PropPatch $propPatch) {
-		// other properties than 'message' are read only
-		$propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
-	}
+    /**
+     * Updates properties on this node.
+     *
+     * This method received a PropPatch object, which contains all the
+     * information about the update.
+     *
+     * To update specific properties, call the 'handle' method on this object.
+     * Read the PropPatch documentation for more information.
+     *
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    function propPatch(PropPatch $propPatch) {
+        // other properties than 'message' are read only
+        $propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
+    }
 
-	/**
-	 * Returns a list of properties for this nodes.
-	 *
-	 * The properties list is a list of propertynames the client requested,
-	 * encoded in clark-notation {xmlnamespace}tagname
-	 *
-	 * If the array is empty, it means 'all properties' were requested.
-	 *
-	 * Note that it's fine to liberally give properties back, instead of
-	 * conforming to the list of requested properties.
-	 * The Server class will filter out the extra.
-	 *
-	 * @param array $properties
-	 * @return array
-	 */
-	function getProperties($properties) {
-		$properties = array_keys($this->properties);
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * Note that it's fine to liberally give properties back, instead of
+     * conforming to the list of requested properties.
+     * The Server class will filter out the extra.
+     *
+     * @param array $properties
+     * @return array
+     */
+    function getProperties($properties) {
+        $properties = array_keys($this->properties);
 
-		$result = [];
-		foreach($properties as $property) {
-			$getter = $this->properties[$property];
-			if(method_exists($this->comment, $getter)) {
-				$result[$property] = $this->comment->$getter();
-			}
-		}
+        $result = [];
+        foreach($properties as $property) {
+            $getter = $this->properties[$property];
+            if(method_exists($this->comment, $getter)) {
+                $result[$property] = $this->comment->$getter();
+            }
+        }
 
-		if($this->comment->getActorType() === 'users') {
-			$user = $this->userManager->get($this->comment->getActorId());
-			$displayName = is_null($user) ? null : $user->getDisplayName();
-			$result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
-		}
+        if($this->comment->getActorType() === 'users') {
+            $user = $this->userManager->get($this->comment->getActorId());
+            $displayName = is_null($user) ? null : $user->getDisplayName();
+            $result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
+        }
 
-		$result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
+        $result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
 
-		$unread = null;
-		$user =  $this->userSession->getUser();
-		if(!is_null($user)) {
-			$readUntil = $this->commentsManager->getReadMark(
-				$this->comment->getObjectType(),
-				$this->comment->getObjectId(),
-				$user
-			);
-			if(is_null($readUntil)) {
-				$unread = 'true';
-			} else {
-				$unread = $this->comment->getCreationDateTime() > $readUntil;
-				// re-format for output
-				$unread = $unread ? 'true' : 'false';
-			}
-		}
-		$result[self::PROPERTY_NAME_UNREAD] = $unread;
+        $unread = null;
+        $user =  $this->userSession->getUser();
+        if(!is_null($user)) {
+            $readUntil = $this->commentsManager->getReadMark(
+                $this->comment->getObjectType(),
+                $this->comment->getObjectId(),
+                $user
+            );
+            if(is_null($readUntil)) {
+                $unread = 'true';
+            } else {
+                $unread = $this->comment->getCreationDateTime() > $readUntil;
+                // re-format for output
+                $unread = $unread ? 'true' : 'false';
+            }
+        }
+        $result[self::PROPERTY_NAME_UNREAD] = $unread;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * transforms a mentions array as returned from IComment->getMentions to an
-	 * array with DAV-compatible structure that can be assigned to the
-	 * PROPERTY_NAME_MENTION property.
-	 *
-	 * @return array
-	 */
-	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
-			try {
-				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
-			} catch (\OutOfBoundsException $e) {
-				$this->logger->logException($e);
-				// No displayname, upon client's discretion what to display.
-				$displayName = '';
-			}
+    /**
+     * transforms a mentions array as returned from IComment->getMentions to an
+     * array with DAV-compatible structure that can be assigned to the
+     * PROPERTY_NAME_MENTION property.
+     *
+     * @return array
+     */
+    protected function composeMentionsPropertyValue() {
+        return array_map(function ($mention) {
+            try {
+                $displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
+            } catch (\OutOfBoundsException $e) {
+                $this->logger->logException($e);
+                // No displayname, upon client's discretion what to display.
+                $displayName = '';
+            }
 
-			return [
-				self::PROPERTY_NAME_MENTION => [
-					self::PROPERTY_NAME_MENTION_TYPE        => $mention['type'],
-					self::PROPERTY_NAME_MENTION_ID          => $mention['id'],
-					self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
-				]
-			];
-		}, $this->comment->getMentions());
-	}
+            return [
+                self::PROPERTY_NAME_MENTION => [
+                    self::PROPERTY_NAME_MENTION_TYPE        => $mention['type'],
+                    self::PROPERTY_NAME_MENTION_ID          => $mention['id'],
+                    self::PROPERTY_NAME_MENTION_DISPLAYNAME => $displayName,
+                ]
+            ];
+        }, $this->comment->getMentions());
+    }
 }

apps/dav/lib/Comments/CommentsPlugin.php

Indentation +207 added lines, -207 removed lines

@@ -44,213 +44,213 @@
  * Sabre plugin to handle comments:
  */
 class CommentsPlugin extends ServerPlugin {
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-comments';
-	const REPORT_PARAM_LIMIT     = '{http://owncloud.org/ns}limit';
-	const REPORT_PARAM_OFFSET    = '{http://owncloud.org/ns}offset';
-	const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
-
-	/** @var ICommentsManager  */
-	protected $commentsManager;
-
-	/** @var \Sabre\DAV\Server $server */
-	private $server;
-
-	/** @var  \OCP\IUserSession */
-	protected $userSession;
-
-	/**
-	 * Comments plugin
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * 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
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		$this->server = $server;
-		if(strpos($this->server->getRequestUri(), 'comments/') !== 0) {
-			return;
-		}
-
-		$this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
-			$writer->write(\Sabre\HTTP\toDate($value));
-		};
-
-		$this->server->on('report', [$this, 'onReport']);
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * POST operation on Comments collections
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-		if (!$node instanceof EntityCollection) {
-			return null;
-		}
-
-		$data = $request->getBodyAsString();
-		$comment = $this->createComment(
-			$node->getName(),
-			$node->getId(),
-			$data,
-			$request->getHeader('Content-Type')
-		);
-
-		// update read marker for the current user/poster to avoid
-		// having their own comments marked as unread
-		$node->setReadMarker(null);
-
-		$url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
-
-		$response->setHeader('Content-Location', $url);
-
-		// created
-		$response->setStatus(201);
-		return false;
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for comments
-	 *
-	 * @param string $reportName
-	 * @param array $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws NotFound
-	 * @throws ReportNotSupported
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-		if(!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
-			throw new ReportNotSupported();
-		}
-		$args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
-		$acceptableParameters = [
-			$this::REPORT_PARAM_LIMIT,
-			$this::REPORT_PARAM_OFFSET,
-			$this::REPORT_PARAM_TIMESTAMP
-		];
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		foreach($report as $parameter) {
-			if(!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
-				continue;
-			}
-			$args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
-		}
-
-		if(!is_null($args['datetime'])) {
-			$args['datetime'] = new \DateTime($args['datetime']);
-		}
-
-		$results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
-
-		$responses = [];
-		foreach($results as $node) {
-			$nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
-			$resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
-			if(isset($resultSet[0]) && isset($resultSet[0][200])) {
-				$responses[] = new Response(
-					$this->server->getBaseUri() . $nodePath,
-					[200 => $resultSet[0][200]],
-					200
-				);
-			}
-
-		}
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Creates a new comment
-	 *
-	 * @param string $objectType e.g. "files"
-	 * @param string $objectId e.g. the file id
-	 * @param string $data JSON encoded string containing the properties of the tag to create
-	 * @param string $contentType content type of the data
-	 * @return IComment newly created comment
-	 *
-	 * @throws BadRequest if a field was missing
-	 * @throws UnsupportedMediaType if the content type is not supported
-	 */
-	private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
-		if (explode(';', $contentType)[0] === 'application/json') {
-			$data = json_decode($data, true);
-		} else {
-			throw new UnsupportedMediaType();
-		}
-
-		$actorType = $data['actorType'];
-		$actorId = null;
-		if($actorType === 'users') {
-			$user = $this->userSession->getUser();
-			if(!is_null($user)) {
-				$actorId = $user->getUID();
-			}
-		}
-		if(is_null($actorId)) {
-			throw new BadRequest('Invalid actor "' .  $actorType .'"');
-		}
-
-		try {
-			$comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
-			$comment->setMessage($data['message']);
-			$comment->setVerb($data['verb']);
-			$this->commentsManager->save($comment);
-			return $comment;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid input values', 0, $e);
-		} catch (\OCP\Comments\MessageTooLongException $e) {
-			$msg = 'Message exceeds allowed character limit of ';
-			throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
-		}
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+    const REPORT_NAME            = '{http://owncloud.org/ns}filter-comments';
+    const REPORT_PARAM_LIMIT     = '{http://owncloud.org/ns}limit';
+    const REPORT_PARAM_OFFSET    = '{http://owncloud.org/ns}offset';
+    const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
+
+    /** @var ICommentsManager  */
+    protected $commentsManager;
+
+    /** @var \Sabre\DAV\Server $server */
+    private $server;
+
+    /** @var  \OCP\IUserSession */
+    protected $userSession;
+
+    /**
+     * Comments plugin
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * 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
+     * @return void
+     */
+    function initialize(Server $server) {
+        $this->server = $server;
+        if(strpos($this->server->getRequestUri(), 'comments/') !== 0) {
+            return;
+        }
+
+        $this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
+            $writer->write(\Sabre\HTTP\toDate($value));
+        };
+
+        $this->server->on('report', [$this, 'onReport']);
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * POST operation on Comments collections
+     *
+     * @param RequestInterface $request request object
+     * @param ResponseInterface $response response object
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+        if (!$node instanceof EntityCollection) {
+            return null;
+        }
+
+        $data = $request->getBodyAsString();
+        $comment = $this->createComment(
+            $node->getName(),
+            $node->getId(),
+            $data,
+            $request->getHeader('Content-Type')
+        );
+
+        // update read marker for the current user/poster to avoid
+        // having their own comments marked as unread
+        $node->setReadMarker(null);
+
+        $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
+
+        $response->setHeader('Content-Location', $url);
+
+        // created
+        $response->setStatus(201);
+        return false;
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for comments
+     *
+     * @param string $reportName
+     * @param array $report
+     * @param string $uri
+     * @return bool
+     * @throws NotFound
+     * @throws ReportNotSupported
+     */
+    public function onReport($reportName, $report, $uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+        if(!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
+            throw new ReportNotSupported();
+        }
+        $args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
+        $acceptableParameters = [
+            $this::REPORT_PARAM_LIMIT,
+            $this::REPORT_PARAM_OFFSET,
+            $this::REPORT_PARAM_TIMESTAMP
+        ];
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        foreach($report as $parameter) {
+            if(!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
+                continue;
+            }
+            $args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
+        }
+
+        if(!is_null($args['datetime'])) {
+            $args['datetime'] = new \DateTime($args['datetime']);
+        }
+
+        $results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
+
+        $responses = [];
+        foreach($results as $node) {
+            $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
+            $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
+            if(isset($resultSet[0]) && isset($resultSet[0][200])) {
+                $responses[] = new Response(
+                    $this->server->getBaseUri() . $nodePath,
+                    [200 => $resultSet[0][200]],
+                    200
+                );
+            }
+
+        }
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Creates a new comment
+     *
+     * @param string $objectType e.g. "files"
+     * @param string $objectId e.g. the file id
+     * @param string $data JSON encoded string containing the properties of the tag to create
+     * @param string $contentType content type of the data
+     * @return IComment newly created comment
+     *
+     * @throws BadRequest if a field was missing
+     * @throws UnsupportedMediaType if the content type is not supported
+     */
+    private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
+        if (explode(';', $contentType)[0] === 'application/json') {
+            $data = json_decode($data, true);
+        } else {
+            throw new UnsupportedMediaType();
+        }
+
+        $actorType = $data['actorType'];
+        $actorId = null;
+        if($actorType === 'users') {
+            $user = $this->userSession->getUser();
+            if(!is_null($user)) {
+                $actorId = $user->getUID();
+            }
+        }
+        if(is_null($actorId)) {
+            throw new BadRequest('Invalid actor "' .  $actorType .'"');
+        }
+
+        try {
+            $comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
+            $comment->setMessage($data['message']);
+            $comment->setVerb($data['verb']);
+            $this->commentsManager->save($comment);
+            return $comment;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid input values', 0, $e);
+        } catch (\OCP\Comments\MessageTooLongException $e) {
+            $msg = 'Message exceeds allowed character limit of ';
+            throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
+        }
+    }
 
 
 

apps/dav/lib/CalDAV/CalDavBackend.php

Indentation +2560 added lines, -2560 removed lines

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

apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php

Indentation +98 added lines, -98 removed lines

@@ -39,102 +39,102 @@
  * @package OCA\DAV\CalDAV\BirthdayCalendar
  */
 class EnablePlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var BirthdayService
-	 */
-	protected $birthdayService;
-
-	/**
-	 * @var Server
-	 */
-	protected $server;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	public function __construct(IConfig $config, BirthdayService $birthdayService) {
-		$this->config = $config;
-		$this->birthdayService = $birthdayService;
-	}
-
-	/**
-	 * 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() {
-		return ['nc-enable-birthday-calendar'];
-	}
-
-	/**
-	 * 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() {
-		return 'nc-enable-birthday-calendar';
-	}
-
-	/**
-	 * 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;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendar homes.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return bool|void
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		if (!($node instanceof CalendarHome)) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-		if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
-			return;
-		}
-
-		$principalUri = $node->getOwner();
-		$userId = substr($principalUri, 17);
-
-		$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-		$this->birthdayService->syncUser($userId);
-
-		$this->server->httpResponse->setStatus(204);
-
-		return false;
-	}
+    const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var BirthdayService
+     */
+    protected $birthdayService;
+
+    /**
+     * @var Server
+     */
+    protected $server;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    public function __construct(IConfig $config, BirthdayService $birthdayService) {
+        $this->config = $config;
+        $this->birthdayService = $birthdayService;
+    }
+
+    /**
+     * 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() {
+        return ['nc-enable-birthday-calendar'];
+    }
+
+    /**
+     * 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() {
+        return 'nc-enable-birthday-calendar';
+    }
+
+    /**
+     * 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;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendar homes.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return bool|void
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        if (!($node instanceof CalendarHome)) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+        if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
+            return;
+        }
+
+        $principalUri = $node->getOwner();
+        $userId = substr($principalUri, 17);
+
+        $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+        $this->birthdayService->syncUser($userId);
+
+        $this->server->httpResponse->setStatus(204);
+
+        return false;
+    }
 }

apps/dav/lib/CalDAV/Schedule/Plugin.php

Indentation +471 added lines, -471 removed lines

@@ -50,151 +50,151 @@ 
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/** @var ITip\Message[] */
-	private $schedulingResponses = [];
-
-	/** @var string|null */
-	private $pathOfCalendarObjectChange = null;
-
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-		$server->on('afterWriteContent', [$this, 'dispatchSchedulingResponses']);
-		$server->on('afterCreateFile', [$this, 'dispatchSchedulingResponses']);
-	}
-
-	/**
-	 * This method handler is invoked during fetching of properties.
-	 *
-	 * We use this event to add calendar-auto-schedule-specific properties.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			// overwrite Sabre/Dav's implementation
-			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
-				if ($node instanceof IProperties) {
-					$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
-					$props = $node->getProperties([$calendarUserType]);
-
-					if (isset($props[$calendarUserType])) {
-						return $props[$calendarUserType];
-					}
-				}
-
-				return 'INDIVIDUAL';
-			});
-		}
-
-		parent::propFind($propFind, $node);
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
-
-		if ($result === null) {
-			$result = [];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @param VCalendar $vCal
-	 * @param mixed $calendarPath
-	 * @param mixed $modified
-	 * @param mixed $isNew
-	 */
-	public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
-		// Save the first path we get as a calendar-object-change request
-		if (!$this->pathOfCalendarObjectChange) {
-			$this->pathOfCalendarObjectChange = $request->getPath();
-		}
-
-		parent::calendarObjectChange($request, $response, $vCal, $calendarPath, $modified, $isNew);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function scheduleLocalDelivery(ITip\Message $iTipMessage):void {
-		parent::scheduleLocalDelivery($iTipMessage);
-
-		// We only care when the message was successfully delivered locally
-		if ($iTipMessage->scheduleStatus !== '1.2;Message delivered locally') {
-			return;
-		}
-
-		// We only care about request. reply and cancel are properly handled
-		// by parent::scheduleLocalDelivery already
-		if (strcasecmp($iTipMessage->method, 'REQUEST') !== 0) {
-			return;
-		}
-
-		// If parent::scheduleLocalDelivery set scheduleStatus to 1.2,
-		// it means that it was successfully delivered locally.
-		// Meaning that the ACL plugin is loaded and that a principial
-		// exists for the given recipient id, no need to double check
-		/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-		$aclPlugin = $this->server->getPlugin('acl');
-		$principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
-		$calendarUserType = $this->getCalendarUserTypeForPrincipal($principalUri);
-		if (strcasecmp($calendarUserType, 'ROOM') !== 0 && strcasecmp($calendarUserType, 'RESOURCE') !== 0) {
-			return;
-		}
-
-		$attendee = $this->getCurrentAttendee($iTipMessage);
-		if (!$attendee) {
-			return;
-		}
-
-		// We only respond when a response was actually requested
-		$rsvp = $this->getAttendeeRSVP($attendee);
-		if (!$rsvp) {
-			return;
-		}
-
-		if (!isset($iTipMessage->message)) {
-			return;
-		}
-
-		$vcalendar = $iTipMessage->message;
-		if (!isset($vcalendar->VEVENT)) {
-			return;
-		}
-
-		/** @var Component $vevent */
-		$vevent = $vcalendar->VEVENT;
-
-		// We don't support autoresponses for recurrencing events for now
-		if (isset($vevent->RRULE) || isset($vevent->RDATE)) {
-			return;
-		}
-
-		$dtstart = $vevent->DTSTART;
-		$dtend =  $this->getDTEndFromVEvent($vevent);
-		$uid = $vevent->UID->getValue();
-		$sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
-		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
-
-		$message = <<<EOF
+    /** @var ITip\Message[] */
+    private $schedulingResponses = [];
+
+    /** @var string|null */
+    private $pathOfCalendarObjectChange = null;
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+        $server->on('afterWriteContent', [$this, 'dispatchSchedulingResponses']);
+        $server->on('afterCreateFile', [$this, 'dispatchSchedulingResponses']);
+    }
+
+    /**
+     * This method handler is invoked during fetching of properties.
+     *
+     * We use this event to add calendar-auto-schedule-specific properties.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            // overwrite Sabre/Dav's implementation
+            $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
+                if ($node instanceof IProperties) {
+                    $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+                    $props = $node->getProperties([$calendarUserType]);
+
+                    if (isset($props[$calendarUserType])) {
+                        return $props[$calendarUserType];
+                    }
+                }
+
+                return 'INDIVIDUAL';
+            });
+        }
+
+        parent::propFind($propFind, $node);
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
+
+        if ($result === null) {
+            $result = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @param VCalendar $vCal
+     * @param mixed $calendarPath
+     * @param mixed $modified
+     * @param mixed $isNew
+     */
+    public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
+        // Save the first path we get as a calendar-object-change request
+        if (!$this->pathOfCalendarObjectChange) {
+            $this->pathOfCalendarObjectChange = $request->getPath();
+        }
+
+        parent::calendarObjectChange($request, $response, $vCal, $calendarPath, $modified, $isNew);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function scheduleLocalDelivery(ITip\Message $iTipMessage):void {
+        parent::scheduleLocalDelivery($iTipMessage);
+
+        // We only care when the message was successfully delivered locally
+        if ($iTipMessage->scheduleStatus !== '1.2;Message delivered locally') {
+            return;
+        }
+
+        // We only care about request. reply and cancel are properly handled
+        // by parent::scheduleLocalDelivery already
+        if (strcasecmp($iTipMessage->method, 'REQUEST') !== 0) {
+            return;
+        }
+
+        // If parent::scheduleLocalDelivery set scheduleStatus to 1.2,
+        // it means that it was successfully delivered locally.
+        // Meaning that the ACL plugin is loaded and that a principial
+        // exists for the given recipient id, no need to double check
+        /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+        $aclPlugin = $this->server->getPlugin('acl');
+        $principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
+        $calendarUserType = $this->getCalendarUserTypeForPrincipal($principalUri);
+        if (strcasecmp($calendarUserType, 'ROOM') !== 0 && strcasecmp($calendarUserType, 'RESOURCE') !== 0) {
+            return;
+        }
+
+        $attendee = $this->getCurrentAttendee($iTipMessage);
+        if (!$attendee) {
+            return;
+        }
+
+        // We only respond when a response was actually requested
+        $rsvp = $this->getAttendeeRSVP($attendee);
+        if (!$rsvp) {
+            return;
+        }
+
+        if (!isset($iTipMessage->message)) {
+            return;
+        }
+
+        $vcalendar = $iTipMessage->message;
+        if (!isset($vcalendar->VEVENT)) {
+            return;
+        }
+
+        /** @var Component $vevent */
+        $vevent = $vcalendar->VEVENT;
+
+        // We don't support autoresponses for recurrencing events for now
+        if (isset($vevent->RRULE) || isset($vevent->RDATE)) {
+            return;
+        }
+
+        $dtstart = $vevent->DTSTART;
+        $dtend =  $this->getDTEndFromVEvent($vevent);
+        $uid = $vevent->UID->getValue();
+        $sequence = isset($vevent->SEQUENCE) ? $vevent->SEQUENCE->getValue() : 0;
+        $recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->serialize() : '';
+
+        $message = <<<EOF
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
 METHOD:REPLY
@@ -209,330 +209,330 @@ 
 END:VCALENDAR
 EOF;
 
-		if ($this->isAvailableAtTime($attendee->getValue(), $dtstart->getDateTime(), $dtend->getDateTime(), $uid)) {
-			$partStat = 'ACCEPTED';
-		} else {
-			$partStat = 'DECLINED';
-		}
-
-		$vObject = Reader::read(vsprintf($message, [
-			$partStat,
-			$iTipMessage->recipient,
-			$iTipMessage->sender,
-			$uid,
-			$sequence,
-			$recurrenceId
-		]));
-
-		$responseITipMessage = new ITip\Message();
-		$responseITipMessage->uid = $uid;
-		$responseITipMessage->component = 'VEVENT';
-		$responseITipMessage->method = 'REPLY';
-		$responseITipMessage->sequence = $sequence;
-		$responseITipMessage->sender = $iTipMessage->recipient;
-		$responseITipMessage->recipient = $iTipMessage->sender;
-		$responseITipMessage->message = $vObject;
-
-		// We can't dispatch them now already, because the organizers calendar-object
-		// was not yet created. Hence Sabre/DAV won't find a calendar-object, when we
-		// send our reply.
-		$this->schedulingResponses[] = $responseITipMessage;
-	}
-
-	/**
-	 * @param string $uri
-	 */
-	public function dispatchSchedulingResponses(string $uri):void {
-		if ($uri !== $this->pathOfCalendarObjectChange) {
-			return;
-		}
-
-		foreach ($this->schedulingResponses as $schedulingResponse) {
-			$this->scheduleLocalDelivery($schedulingResponse);
-		}
-	}
-
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function () use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
-
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-				if (!$calendarHomePath) {
-					return null;
-				}
-
-				if (strpos($principalUrl, 'principals/users') === 0) {
-					$uri = CalDavBackend::PERSONAL_CALENDAR_URI;
-					$displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
-				} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
-						  strpos($principalUrl, 'principals/calendar-rooms') === 0) {
-					$uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
-					$displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
-				} else {
-					// How did we end up here?
-					// TODO - throw exception or just ignore?
-					return null;
-				}
-
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists($uri)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
-						'{DAV:}displayname' => $displayname,
-					]);
-				}
-
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
-				if (empty($result)) {
-					return null;
-				}
-
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return string?
-	 */
-	protected function getCalendarUserTypeForPrincipal($principal):?string {
-		$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
-		$properties = $this->server->getProperties(
-			$principal,
-			[$calendarUserType]
-		);
-
-		// If we can't find this information, we'll stop processing
-		if (!isset($properties[$calendarUserType])) {
-			return null;
-		}
-
-		return $properties[$calendarUserType];
-	}
-
-	/**
-	 * @param ITip\Message $iTipMessage
-	 * @return null|Property
-	 */
-	private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			/** @var Property $attendee */
-			if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 * @return bool
-	 */
-	private function getAttendeeRSVP(Property $attendee = null):bool {
-		if ($attendee !== null) {
-			$rsvp = $attendee->offsetGet('RSVP');
-			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
-				return true;
-			}
-		}
-		// RFC 5545 3.2.17: default RSVP is false
-		return false;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return Property\ICalendar\DateTime
-	 */
-	private function getDTEndFromVEvent(VEvent $vevent):Property\ICalendar\DateTime {
-		if (isset($vevent->DTEND)) {
-			return $vevent->DTEND;
-		}
-
-		if (isset($vevent->DURATION)) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-			return $end;
-		}
-
-		if (!$vevent->DTSTART->hasTime()) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			/** @var Property\ICalendar\DateTime $end */
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-			return $end;
-		}
-
-		return clone $vevent->DTSTART;
-	}
-
-	/**
-	 * @param string $email
-	 * @param \DateTimeInterface $start
-	 * @param \DateTimeInterface $end
-	 * @param string $ignoreUID
-	 * @return bool
-	 */
-	private function isAvailableAtTime(string $email, \DateTimeInterface $start, \DateTimeInterface $end, string $ignoreUID):bool {
-		// This method is heavily inspired by Sabre\CalDAV\Schedule\Plugin::scheduleLocalDelivery
-		// and Sabre\CalDAV\Schedule\Plugin::getFreeBusyForEmail
-
-		$aclPlugin = $this->server->getPlugin('acl');
-		$this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
-
-		$result = $aclPlugin->principalSearch(
-			['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
-			[
-				'{DAV:}principal-URL',
-				'{' . self::NS_CALDAV . '}calendar-home-set',
-				'{' . self::NS_CALDAV . '}schedule-inbox-URL',
-				'{http://sabredav.org/ns}email-address',
-
-			]
-		);
-		$this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
-
-
-		// Grabbing the calendar list
-		$objects = [];
-		$calendarTimeZone = new DateTimeZone('UTC');
-
-		$homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
-		foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
-			if (!$node instanceof ICalendar) {
-				continue;
-			}
-
-			// Getting the list of object uris within the time-range
-			$urls = $node->calendarQuery([
-				'name' => 'VCALENDAR',
-				'comp-filters' => [
-					[
-						'name' => 'VEVENT',
-						'is-not-defined' => false,
-						'time-range' => [
-							'start' => $start,
-							'end' => $end,
-						],
-						'comp-filters'   => [],
-						'prop-filters'   => [],
-					],
-					[
-						'name' => 'VEVENT',
-						'is-not-defined' => false,
-						'time-range' => null,
-						'comp-filters'   => [],
-						'prop-filters'   => [
-							[
-								'name'           => 'UID',
-								'is-not-defined' => false,
-								'time-range'     => null,
-								'text-match'     => [
-									'value' => $ignoreUID,
-									'negate-condition' => true,
-									'collation' => 'i;octet',
-								],
-								'param-filters' => [],
-							],
-						]
-					],
-				],
-				'prop-filters' => [],
-				'is-not-defined' => false,
-				'time-range' => null,
-			]);
-
-			foreach ($urls as $url) {
-				$objects[] = $node->getChild($url)->get();
-			}
-		}
-
-		$inboxProps = $this->server->getProperties(
-			$result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
-			['{' . self::NS_CALDAV . '}calendar-availability']
-		);
-
-		$vcalendar = new VCalendar();
-		$vcalendar->METHOD = 'REPLY';
-
-		$generator = new FreeBusyGenerator();
-		$generator->setObjects($objects);
-		$generator->setTimeRange($start, $end);
-		$generator->setBaseObject($vcalendar);
-		$generator->setTimeZone($calendarTimeZone);
-
-		if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
-			$generator->setVAvailability(
-				Reader::read(
-					$inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
-				)
-			);
-		}
-
-		$result = $generator->getResult();
-		if (!isset($result->VFREEBUSY)) {
-			return false;
-		}
-
-		/** @var Component $freeBusyComponent */
-		$freeBusyComponent = $result->VFREEBUSY;
-		$freeBusyProperties = $freeBusyComponent->select('FREEBUSY');
-		// If there is no Free-busy property at all, the time-range is empty and available
-		if (count($freeBusyProperties) === 0) {
-			return true;
-		}
-
-		// If more than one Free-Busy property was returned, it means that an event
-		// starts or ends inside this time-range, so it's not availabe and we return false
-		if (count($freeBusyProperties) > 1) {
-			return false;
-		}
-
-		/** @var Property $freeBusyProperty */
-		$freeBusyProperty = $freeBusyProperties[0];
-		if (!$freeBusyProperty->offsetExists('FBTYPE')) {
-			// If there is no FBTYPE, it means it's busy
-			return false;
-		}
-
-		$fbTypeParameter = $freeBusyProperty->offsetGet('FBTYPE');
-		if (!($fbTypeParameter instanceof Parameter)) {
-			return false;
-		}
-
-		return (strcasecmp($fbTypeParameter->getValue(), 'FREE') === 0);
-	}
-
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	private function stripOffMailTo(string $email): string {
-		if (stripos($email, 'mailto:')  === 0) {
-			return substr($email, 7);
-		}
-
-		return $email;
-	}
+        if ($this->isAvailableAtTime($attendee->getValue(), $dtstart->getDateTime(), $dtend->getDateTime(), $uid)) {
+            $partStat = 'ACCEPTED';
+        } else {
+            $partStat = 'DECLINED';
+        }
+
+        $vObject = Reader::read(vsprintf($message, [
+            $partStat,
+            $iTipMessage->recipient,
+            $iTipMessage->sender,
+            $uid,
+            $sequence,
+            $recurrenceId
+        ]));
+
+        $responseITipMessage = new ITip\Message();
+        $responseITipMessage->uid = $uid;
+        $responseITipMessage->component = 'VEVENT';
+        $responseITipMessage->method = 'REPLY';
+        $responseITipMessage->sequence = $sequence;
+        $responseITipMessage->sender = $iTipMessage->recipient;
+        $responseITipMessage->recipient = $iTipMessage->sender;
+        $responseITipMessage->message = $vObject;
+
+        // We can't dispatch them now already, because the organizers calendar-object
+        // was not yet created. Hence Sabre/DAV won't find a calendar-object, when we
+        // send our reply.
+        $this->schedulingResponses[] = $responseITipMessage;
+    }
+
+    /**
+     * @param string $uri
+     */
+    public function dispatchSchedulingResponses(string $uri):void {
+        if ($uri !== $this->pathOfCalendarObjectChange) {
+            return;
+        }
+
+        foreach ($this->schedulingResponses as $schedulingResponse) {
+            $this->scheduleLocalDelivery($schedulingResponse);
+        }
+    }
+
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function () use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
+
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
+                if (strpos($principalUrl, 'principals/users') === 0) {
+                    $uri = CalDavBackend::PERSONAL_CALENDAR_URI;
+                    $displayname = CalDavBackend::PERSONAL_CALENDAR_NAME;
+                } elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
+                          strpos($principalUrl, 'principals/calendar-rooms') === 0) {
+                    $uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
+                    $displayname = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
+                } else {
+                    // How did we end up here?
+                    // TODO - throw exception or just ignore?
+                    return null;
+                }
+
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists($uri)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+                        '{DAV:}displayname' => $displayname,
+                    ]);
+                }
+
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
+
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return string?
+     */
+    protected function getCalendarUserTypeForPrincipal($principal):?string {
+        $calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
+        $properties = $this->server->getProperties(
+            $principal,
+            [$calendarUserType]
+        );
+
+        // If we can't find this information, we'll stop processing
+        if (!isset($properties[$calendarUserType])) {
+            return null;
+        }
+
+        return $properties[$calendarUserType];
+    }
+
+    /**
+     * @param ITip\Message $iTipMessage
+     * @return null|Property
+     */
+    private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            /** @var Property $attendee */
+            if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param Property|null $attendee
+     * @return bool
+     */
+    private function getAttendeeRSVP(Property $attendee = null):bool {
+        if ($attendee !== null) {
+            $rsvp = $attendee->offsetGet('RSVP');
+            if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+                return true;
+            }
+        }
+        // RFC 5545 3.2.17: default RSVP is false
+        return false;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return Property\ICalendar\DateTime
+     */
+    private function getDTEndFromVEvent(VEvent $vevent):Property\ICalendar\DateTime {
+        if (isset($vevent->DTEND)) {
+            return $vevent->DTEND;
+        }
+
+        if (isset($vevent->DURATION)) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+            return $end;
+        }
+
+        if (!$vevent->DTSTART->hasTime()) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            /** @var Property\ICalendar\DateTime $end */
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+            return $end;
+        }
+
+        return clone $vevent->DTSTART;
+    }
+
+    /**
+     * @param string $email
+     * @param \DateTimeInterface $start
+     * @param \DateTimeInterface $end
+     * @param string $ignoreUID
+     * @return bool
+     */
+    private function isAvailableAtTime(string $email, \DateTimeInterface $start, \DateTimeInterface $end, string $ignoreUID):bool {
+        // This method is heavily inspired by Sabre\CalDAV\Schedule\Plugin::scheduleLocalDelivery
+        // and Sabre\CalDAV\Schedule\Plugin::getFreeBusyForEmail
+
+        $aclPlugin = $this->server->getPlugin('acl');
+        $this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
+
+        $result = $aclPlugin->principalSearch(
+            ['{http://sabredav.org/ns}email-address' => $this->stripOffMailTo($email)],
+            [
+                '{DAV:}principal-URL',
+                '{' . self::NS_CALDAV . '}calendar-home-set',
+                '{' . self::NS_CALDAV . '}schedule-inbox-URL',
+                '{http://sabredav.org/ns}email-address',
+
+            ]
+        );
+        $this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
+
+
+        // Grabbing the calendar list
+        $objects = [];
+        $calendarTimeZone = new DateTimeZone('UTC');
+
+        $homePath = $result[0][200]['{' . self::NS_CALDAV . '}calendar-home-set']->getHref();
+        foreach ($this->server->tree->getNodeForPath($homePath)->getChildren() as $node) {
+            if (!$node instanceof ICalendar) {
+                continue;
+            }
+
+            // Getting the list of object uris within the time-range
+            $urls = $node->calendarQuery([
+                'name' => 'VCALENDAR',
+                'comp-filters' => [
+                    [
+                        'name' => 'VEVENT',
+                        'is-not-defined' => false,
+                        'time-range' => [
+                            'start' => $start,
+                            'end' => $end,
+                        ],
+                        'comp-filters'   => [],
+                        'prop-filters'   => [],
+                    ],
+                    [
+                        'name' => 'VEVENT',
+                        'is-not-defined' => false,
+                        'time-range' => null,
+                        'comp-filters'   => [],
+                        'prop-filters'   => [
+                            [
+                                'name'           => 'UID',
+                                'is-not-defined' => false,
+                                'time-range'     => null,
+                                'text-match'     => [
+                                    'value' => $ignoreUID,
+                                    'negate-condition' => true,
+                                    'collation' => 'i;octet',
+                                ],
+                                'param-filters' => [],
+                            ],
+                        ]
+                    ],
+                ],
+                'prop-filters' => [],
+                'is-not-defined' => false,
+                'time-range' => null,
+            ]);
+
+            foreach ($urls as $url) {
+                $objects[] = $node->getChild($url)->get();
+            }
+        }
+
+        $inboxProps = $this->server->getProperties(
+            $result[0][200]['{' . self::NS_CALDAV . '}schedule-inbox-URL']->getHref(),
+            ['{' . self::NS_CALDAV . '}calendar-availability']
+        );
+
+        $vcalendar = new VCalendar();
+        $vcalendar->METHOD = 'REPLY';
+
+        $generator = new FreeBusyGenerator();
+        $generator->setObjects($objects);
+        $generator->setTimeRange($start, $end);
+        $generator->setBaseObject($vcalendar);
+        $generator->setTimeZone($calendarTimeZone);
+
+        if (isset($inboxProps['{' . self::NS_CALDAV . '}calendar-availability'])) {
+            $generator->setVAvailability(
+                Reader::read(
+                    $inboxProps['{' . self::NS_CALDAV . '}calendar-availability']
+                )
+            );
+        }
+
+        $result = $generator->getResult();
+        if (!isset($result->VFREEBUSY)) {
+            return false;
+        }
+
+        /** @var Component $freeBusyComponent */
+        $freeBusyComponent = $result->VFREEBUSY;
+        $freeBusyProperties = $freeBusyComponent->select('FREEBUSY');
+        // If there is no Free-busy property at all, the time-range is empty and available
+        if (count($freeBusyProperties) === 0) {
+            return true;
+        }
+
+        // If more than one Free-Busy property was returned, it means that an event
+        // starts or ends inside this time-range, so it's not availabe and we return false
+        if (count($freeBusyProperties) > 1) {
+            return false;
+        }
+
+        /** @var Property $freeBusyProperty */
+        $freeBusyProperty = $freeBusyProperties[0];
+        if (!$freeBusyProperty->offsetExists('FBTYPE')) {
+            // If there is no FBTYPE, it means it's busy
+            return false;
+        }
+
+        $fbTypeParameter = $freeBusyProperty->offsetGet('FBTYPE');
+        if (!($fbTypeParameter instanceof Parameter)) {
+            return false;
+        }
+
+        return (strcasecmp($fbTypeParameter->getValue(), 'FREE') === 0);
+    }
+
+    /**
+     * @param string $email
+     * @return string
+     */
+    private function stripOffMailTo(string $email): string {
+        if (stripos($email, 'mailto:')  === 0) {
+            return substr($email, 7);
+        }
+
+        return $email;
+    }
 }

apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php

Indentation +369 added lines, -369 removed lines

@@ -50,373 +50,373 @@
 
 class RefreshWebcalService {
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var ILogger */
-	private $logger;
-
-	public const REFRESH_RATE = '{http://apple.com/ns/ical/}refreshrate';
-	public const STRIP_ALARMS = '{http://calendarserver.org/ns/}subscribed-strip-alarms';
-	public const STRIP_ATTACHMENTS = '{http://calendarserver.org/ns/}subscribed-strip-attachments';
-	public const STRIP_TODOS = '{http://calendarserver.org/ns/}subscribed-strip-todos';
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param CalDavBackend $calDavBackend
-	 * @param IClientService $clientService
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, IConfig $config, ILogger $logger) {
-		$this->calDavBackend = $calDavBackend;
-		$this->clientService = $clientService;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $uri
-	 */
-	public function refreshSubscription(string $principalUri, string $uri) {
-		$subscription = $this->getSubscription($principalUri, $uri);
-		$mutations = [];
-		if (!$subscription) {
-			return;
-		}
-
-		$webcalData = $this->queryWebcalFeed($subscription, $mutations);
-		if (!$webcalData) {
-			return;
-		}
-
-		$stripTodos = ($subscription[self::STRIP_TODOS] ?? 1) === 1;
-		$stripAlarms = ($subscription[self::STRIP_ALARMS] ?? 1) === 1;
-		$stripAttachments = ($subscription[self::STRIP_ATTACHMENTS] ?? 1) === 1;
-
-		try {
-			$splitter = new ICalendar($webcalData, Reader::OPTION_FORGIVING);
-
-			// we wait with deleting all outdated 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 */
-				$compName = null;
-
-				foreach ($vObject->getComponents() as $component) {
-					if ($component->name === 'VTIMEZONE') {
-						continue;
-					}
-
-					$compName = $component->name;
-
-					if ($stripAlarms) {
-						unset($component->{'VALARM'});
-					}
-					if ($stripAttachments) {
-						unset($component->{'ATTACH'});
-					}
-				}
-
-				if ($stripTodos && $compName === 'VTODO') {
-					continue;
-				}
-
-				$uri = $this->getRandomCalendarObjectUri();
-				$calendarData = $vObject->serialize();
-				try {
-					$this->calDavBackend->createCalendarObject($subscription['id'], $uri, $calendarData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-				} catch(BadRequest $ex) {
-					$this->logger->logException($ex);
-				}
-			}
-
-			$newRefreshRate = $this->checkWebcalDataForRefreshRate($subscription, $webcalData);
-			if ($newRefreshRate) {
-				$mutations[self::REFRESH_RATE] = $newRefreshRate;
-			}
-
-			$this->updateSubscription($subscription, $mutations);
-		} catch(ParseException $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
-		}
-	}
-
-	/**
-	 * loads subscription from backend
-	 *
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @return array|null
-	 */
-	public function getSubscription(string $principalUri, string $uri) {
-		$subscriptions = array_values(array_filter(
-			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function ($sub) use ($uri) {
-				return $sub['uri'] === $uri;
-			}
-		));
-
-		if (count($subscriptions) === 0) {
-			return null;
-		}
-
-		return $subscriptions[0];
-	}
-
-	/**
-	 * gets webcal feed from remote server
-	 *
-	 * @param array $subscription
-	 * @param array &$mutations
-	 * @return null|string
-	 */
-	private function queryWebcalFeed(array $subscription, array &$mutations) {
-		$client = $this->clientService->newClient();
-
-		$didBreak301Chain = false;
-		$latestLocation = null;
-
-		$handlerStack = HandlerStack::create();
-		$handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
-			return $request
-				->withHeader('Accept', 'text/calendar, application/calendar+json, application/calendar+xml')
-				->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
-		}));
-		$handlerStack->push(Middleware::mapResponse(function (ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
-			if (!$didBreak301Chain) {
-				if ($response->getStatusCode() !== 301) {
-					$didBreak301Chain = true;
-				} else {
-					$latestLocation = $response->getHeader('Location');
-				}
-			}
-			return $response;
-		}));
-
-		$allowLocalAccess = $this->config->getAppValue('dav', 'webcalAllowLocalAccess', 'no');
-		$subscriptionId = $subscription['id'];
-		$url = $this->cleanURL($subscription['source']);
-		if ($url === null) {
-			return null;
-		}
-
-		if ($allowLocalAccess !== 'yes') {
-			$host = strtolower(parse_url($url, PHP_URL_HOST));
-			// remove brackets from IPv6 addresses
-			if (strpos($host, '[') === 0 && substr($host, -1) === ']') {
-				$host = substr($host, 1, -1);
-			}
-
-			// Disallow localhost and local network
-			if ($host === 'localhost' || substr($host, -6) === '.local' || substr($host, -10) === '.localhost') {
-				$this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
-				return null;
-			}
-
-			// Disallow hostname only
-			if (substr_count($host, '.') === 0) {
-				$this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
-				return null;
-			}
-
-			if ((bool)filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
-				$this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
-				return null;
-			}
-
-			// Also check for IPv6 IPv4 nesting, because that's not covered by filter_var
-			if ((bool)filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) {
-				$delimiter = strrpos($host, ':'); // Get last colon
-				$ipv4Address = substr($host, $delimiter + 1);
-
-				if (!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
-					$this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
-					return null;
-				}
-			}
-		}
-
-		try {
-			$params = [
-				'allow_redirects' => [
-					'redirects' => 10
-				],
-				'handler' => $handlerStack,
-			];
-
-			$user = parse_url($subscription['source'], PHP_URL_USER);
-			$pass = parse_url($subscription['source'], PHP_URL_PASS);
-			if ($user !== null && $pass !== null) {
-				$params['auth'] = [$user, $pass];
-			}
-
-			$response = $client->get($url, $params);
-			$body = $response->getBody();
-
-			if ($latestLocation) {
-				$mutations['{http://calendarserver.org/ns/}source'] = new Href($latestLocation);
-			}
-
-			$contentType = $response->getHeader('Content-Type');
-			$contentType = explode(';', $contentType, 2)[0];
-			switch($contentType) {
-				case 'application/calendar+json':
-					try {
-						$jCalendar = Reader::readJson($body, Reader::OPTION_FORGIVING);
-					} catch(Exception $ex) {
-						// In case of a parsing error return null
-						$this->logger->debug("Subscription $subscriptionId could not be parsed");
-						return null;
-					}
-					return $jCalendar->serialize();
-
-				case 'application/calendar+xml':
-					try {
-						$xCalendar = Reader::readXML($body);
-					} catch(Exception $ex) {
-						// In case of a parsing error return null
-						$this->logger->debug("Subscription $subscriptionId could not be parsed");
-						return null;
-					}
-					return $xCalendar->serialize();
-
-				case 'text/calendar':
-				default:
-					try {
-						$vCalendar = Reader::read($body);
-					} catch(Exception $ex) {
-						// In case of a parsing error return null
-						$this->logger->debug("Subscription $subscriptionId could not be parsed");
-						return null;
-					}
-					return $vCalendar->serialize();
-			}
-		} catch(Exception $ex) {
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
-
-			return null;
-		}
-	}
-
-	/**
-	 * check if:
-	 *  - current subscription stores a refreshrate
-	 *  - the webcal feed suggests a refreshrate
-	 *  - return suggested refreshrate if user didn't set a custom one
-	 *
-	 * @param array $subscription
-	 * @param string $webcalData
-	 * @return string|null
-	 */
-	private function checkWebcalDataForRefreshRate($subscription, $webcalData) {
-		// if there is no refreshrate stored in the database, check the webcal feed
-		// whether it suggests any refresh rate and store that in the database
-		if (isset($subscription[self::REFRESH_RATE]) && $subscription[self::REFRESH_RATE] !== null) {
-			return null;
-		}
-
-		/** @var Component\VCalendar $vCalendar */
-		$vCalendar = Reader::read($webcalData);
-
-		$newRefreshRate = null;
-		if (isset($vCalendar->{'X-PUBLISHED-TTL'})) {
-			$newRefreshRate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
-		}
-		if (isset($vCalendar->{'REFRESH-INTERVAL'})) {
-			$newRefreshRate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
-		}
-
-		if (!$newRefreshRate) {
-			return null;
-		}
-
-		// check if new refresh rate is even valid
-		try {
-			DateTimeParser::parseDuration($newRefreshRate);
-		} catch(InvalidDataException $ex) {
-			return null;
-		}
-
-		return $newRefreshRate;
-	}
-
-	/**
-	 * update subscription stored in database
-	 * used to set:
-	 *  - refreshrate
-	 *  - source
-	 *
-	 * @param array $subscription
-	 * @param array $mutations
-	 */
-	private function updateSubscription(array $subscription, array $mutations) {
-		if (empty($mutations)) {
-			return;
-		}
-
-		$propPatch = new PropPatch($mutations);
-		$this->calDavBackend->updateSubscription($subscription['id'], $propPatch);
-		$propPatch->commit();
-	}
-
-	/**
-	 * This method will strip authentication information and replace the
-	 * 'webcal' or 'webcals' protocol scheme
-	 *
-	 * @param string $url
-	 * @return string|null
-	 */
-	private function cleanURL(string $url) {
-		$parsed = parse_url($url);
-		if ($parsed === false) {
-			return null;
-		}
-
-		if (isset($parsed['scheme']) && $parsed['scheme'] === 'http') {
-			$scheme = 'http';
-		} else {
-			$scheme = 'https';
-		}
-
-		$host = $parsed['host'] ?? '';
-		$port = isset($parsed['port']) ? ':' . $parsed['port'] : '';
-		$path = $parsed['path'] ?? '';
-		$query = isset($parsed['query']) ? '?' . $parsed['query'] : '';
-		$fragment = isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
-
-		$cleanURL = "$scheme://$host$port$path$query$fragment";
-		// parse_url is giving some weird results if no url and no :// is given,
-		// so let's test the url again
-		$parsedClean = parse_url($cleanURL);
-		if ($parsedClean === false || !isset($parsedClean['host'])) {
-			return null;
-		}
-
-		return $cleanURL;
-	}
-
-	/**
-	 * Returns a random uri for a calendar-object
-	 *
-	 * @return string
-	 */
-	public function getRandomCalendarObjectUri():string {
-		return UUIDUtil::getUUID() . '.ics';
-	}
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var ILogger */
+    private $logger;
+
+    public const REFRESH_RATE = '{http://apple.com/ns/ical/}refreshrate';
+    public const STRIP_ALARMS = '{http://calendarserver.org/ns/}subscribed-strip-alarms';
+    public const STRIP_ATTACHMENTS = '{http://calendarserver.org/ns/}subscribed-strip-attachments';
+    public const STRIP_TODOS = '{http://calendarserver.org/ns/}subscribed-strip-todos';
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param CalDavBackend $calDavBackend
+     * @param IClientService $clientService
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, IConfig $config, ILogger $logger) {
+        $this->calDavBackend = $calDavBackend;
+        $this->clientService = $clientService;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $uri
+     */
+    public function refreshSubscription(string $principalUri, string $uri) {
+        $subscription = $this->getSubscription($principalUri, $uri);
+        $mutations = [];
+        if (!$subscription) {
+            return;
+        }
+
+        $webcalData = $this->queryWebcalFeed($subscription, $mutations);
+        if (!$webcalData) {
+            return;
+        }
+
+        $stripTodos = ($subscription[self::STRIP_TODOS] ?? 1) === 1;
+        $stripAlarms = ($subscription[self::STRIP_ALARMS] ?? 1) === 1;
+        $stripAttachments = ($subscription[self::STRIP_ATTACHMENTS] ?? 1) === 1;
+
+        try {
+            $splitter = new ICalendar($webcalData, Reader::OPTION_FORGIVING);
+
+            // we wait with deleting all outdated 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 */
+                $compName = null;
+
+                foreach ($vObject->getComponents() as $component) {
+                    if ($component->name === 'VTIMEZONE') {
+                        continue;
+                    }
+
+                    $compName = $component->name;
+
+                    if ($stripAlarms) {
+                        unset($component->{'VALARM'});
+                    }
+                    if ($stripAttachments) {
+                        unset($component->{'ATTACH'});
+                    }
+                }
+
+                if ($stripTodos && $compName === 'VTODO') {
+                    continue;
+                }
+
+                $uri = $this->getRandomCalendarObjectUri();
+                $calendarData = $vObject->serialize();
+                try {
+                    $this->calDavBackend->createCalendarObject($subscription['id'], $uri, $calendarData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+                } catch(BadRequest $ex) {
+                    $this->logger->logException($ex);
+                }
+            }
+
+            $newRefreshRate = $this->checkWebcalDataForRefreshRate($subscription, $webcalData);
+            if ($newRefreshRate) {
+                $mutations[self::REFRESH_RATE] = $newRefreshRate;
+            }
+
+            $this->updateSubscription($subscription, $mutations);
+        } catch(ParseException $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
+        }
+    }
+
+    /**
+     * loads subscription from backend
+     *
+     * @param string $principalUri
+     * @param string $uri
+     * @return array|null
+     */
+    public function getSubscription(string $principalUri, string $uri) {
+        $subscriptions = array_values(array_filter(
+            $this->calDavBackend->getSubscriptionsForUser($principalUri),
+            function ($sub) use ($uri) {
+                return $sub['uri'] === $uri;
+            }
+        ));
+
+        if (count($subscriptions) === 0) {
+            return null;
+        }
+
+        return $subscriptions[0];
+    }
+
+    /**
+     * gets webcal feed from remote server
+     *
+     * @param array $subscription
+     * @param array &$mutations
+     * @return null|string
+     */
+    private function queryWebcalFeed(array $subscription, array &$mutations) {
+        $client = $this->clientService->newClient();
+
+        $didBreak301Chain = false;
+        $latestLocation = null;
+
+        $handlerStack = HandlerStack::create();
+        $handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
+            return $request
+                ->withHeader('Accept', 'text/calendar, application/calendar+json, application/calendar+xml')
+                ->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
+        }));
+        $handlerStack->push(Middleware::mapResponse(function (ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
+            if (!$didBreak301Chain) {
+                if ($response->getStatusCode() !== 301) {
+                    $didBreak301Chain = true;
+                } else {
+                    $latestLocation = $response->getHeader('Location');
+                }
+            }
+            return $response;
+        }));
+
+        $allowLocalAccess = $this->config->getAppValue('dav', 'webcalAllowLocalAccess', 'no');
+        $subscriptionId = $subscription['id'];
+        $url = $this->cleanURL($subscription['source']);
+        if ($url === null) {
+            return null;
+        }
+
+        if ($allowLocalAccess !== 'yes') {
+            $host = strtolower(parse_url($url, PHP_URL_HOST));
+            // remove brackets from IPv6 addresses
+            if (strpos($host, '[') === 0 && substr($host, -1) === ']') {
+                $host = substr($host, 1, -1);
+            }
+
+            // Disallow localhost and local network
+            if ($host === 'localhost' || substr($host, -6) === '.local' || substr($host, -10) === '.localhost') {
+                $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
+                return null;
+            }
+
+            // Disallow hostname only
+            if (substr_count($host, '.') === 0) {
+                $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
+                return null;
+            }
+
+            if ((bool)filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+                $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
+                return null;
+            }
+
+            // Also check for IPv6 IPv4 nesting, because that's not covered by filter_var
+            if ((bool)filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) {
+                $delimiter = strrpos($host, ':'); // Get last colon
+                $ipv4Address = substr($host, $delimiter + 1);
+
+                if (!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+                    $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules");
+                    return null;
+                }
+            }
+        }
+
+        try {
+            $params = [
+                'allow_redirects' => [
+                    'redirects' => 10
+                ],
+                'handler' => $handlerStack,
+            ];
+
+            $user = parse_url($subscription['source'], PHP_URL_USER);
+            $pass = parse_url($subscription['source'], PHP_URL_PASS);
+            if ($user !== null && $pass !== null) {
+                $params['auth'] = [$user, $pass];
+            }
+
+            $response = $client->get($url, $params);
+            $body = $response->getBody();
+
+            if ($latestLocation) {
+                $mutations['{http://calendarserver.org/ns/}source'] = new Href($latestLocation);
+            }
+
+            $contentType = $response->getHeader('Content-Type');
+            $contentType = explode(';', $contentType, 2)[0];
+            switch($contentType) {
+                case 'application/calendar+json':
+                    try {
+                        $jCalendar = Reader::readJson($body, Reader::OPTION_FORGIVING);
+                    } catch(Exception $ex) {
+                        // In case of a parsing error return null
+                        $this->logger->debug("Subscription $subscriptionId could not be parsed");
+                        return null;
+                    }
+                    return $jCalendar->serialize();
+
+                case 'application/calendar+xml':
+                    try {
+                        $xCalendar = Reader::readXML($body);
+                    } catch(Exception $ex) {
+                        // In case of a parsing error return null
+                        $this->logger->debug("Subscription $subscriptionId could not be parsed");
+                        return null;
+                    }
+                    return $xCalendar->serialize();
+
+                case 'text/calendar':
+                default:
+                    try {
+                        $vCalendar = Reader::read($body);
+                    } catch(Exception $ex) {
+                        // In case of a parsing error return null
+                        $this->logger->debug("Subscription $subscriptionId could not be parsed");
+                        return null;
+                    }
+                    return $vCalendar->serialize();
+            }
+        } catch(Exception $ex) {
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
+
+            return null;
+        }
+    }
+
+    /**
+     * check if:
+     *  - current subscription stores a refreshrate
+     *  - the webcal feed suggests a refreshrate
+     *  - return suggested refreshrate if user didn't set a custom one
+     *
+     * @param array $subscription
+     * @param string $webcalData
+     * @return string|null
+     */
+    private function checkWebcalDataForRefreshRate($subscription, $webcalData) {
+        // if there is no refreshrate stored in the database, check the webcal feed
+        // whether it suggests any refresh rate and store that in the database
+        if (isset($subscription[self::REFRESH_RATE]) && $subscription[self::REFRESH_RATE] !== null) {
+            return null;
+        }
+
+        /** @var Component\VCalendar $vCalendar */
+        $vCalendar = Reader::read($webcalData);
+
+        $newRefreshRate = null;
+        if (isset($vCalendar->{'X-PUBLISHED-TTL'})) {
+            $newRefreshRate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
+        }
+        if (isset($vCalendar->{'REFRESH-INTERVAL'})) {
+            $newRefreshRate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
+        }
+
+        if (!$newRefreshRate) {
+            return null;
+        }
+
+        // check if new refresh rate is even valid
+        try {
+            DateTimeParser::parseDuration($newRefreshRate);
+        } catch(InvalidDataException $ex) {
+            return null;
+        }
+
+        return $newRefreshRate;
+    }
+
+    /**
+     * update subscription stored in database
+     * used to set:
+     *  - refreshrate
+     *  - source
+     *
+     * @param array $subscription
+     * @param array $mutations
+     */
+    private function updateSubscription(array $subscription, array $mutations) {
+        if (empty($mutations)) {
+            return;
+        }
+
+        $propPatch = new PropPatch($mutations);
+        $this->calDavBackend->updateSubscription($subscription['id'], $propPatch);
+        $propPatch->commit();
+    }
+
+    /**
+     * This method will strip authentication information and replace the
+     * 'webcal' or 'webcals' protocol scheme
+     *
+     * @param string $url
+     * @return string|null
+     */
+    private function cleanURL(string $url) {
+        $parsed = parse_url($url);
+        if ($parsed === false) {
+            return null;
+        }
+
+        if (isset($parsed['scheme']) && $parsed['scheme'] === 'http') {
+            $scheme = 'http';
+        } else {
+            $scheme = 'https';
+        }
+
+        $host = $parsed['host'] ?? '';
+        $port = isset($parsed['port']) ? ':' . $parsed['port'] : '';
+        $path = $parsed['path'] ?? '';
+        $query = isset($parsed['query']) ? '?' . $parsed['query'] : '';
+        $fragment = isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
+
+        $cleanURL = "$scheme://$host$port$path$query$fragment";
+        // parse_url is giving some weird results if no url and no :// is given,
+        // so let's test the url again
+        $parsedClean = parse_url($cleanURL);
+        if ($parsedClean === false || !isset($parsedClean['host'])) {
+            return null;
+        }
+
+        return $cleanURL;
+    }
+
+    /**
+     * Returns a random uri for a calendar-object
+     *
+     * @return string
+     */
+    public function getRandomCalendarObjectUri():string {
+        return UUIDUtil::getUUID() . '.ics';
+    }
 }

apps/dav/lib/CalDAV/Calendar.php

Indentation +360 added lines, -360 removed lines

@@ -45,364 +45,364 @@
  */
 class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IL10N */
-	protected $l10n;
-
-	/**
-	 * Calendar constructor.
-	 *
-	 * @param BackendInterface $caldavBackend
-	 * @param $calendarInfo
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 */
-	public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
-		parent::__construct($caldavBackend, $calendarInfo);
-
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
-		}
-		if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
-		}
-
-		$this->config = $config;
-		$this->l10n = $l10n;
-	}
-
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 * @throws Forbidden
-	 */
-	public function updateShares(array $add, array $remove) {
-		if ($this->isShared()) {
-			throw new Forbidden();
-		}
-		$this->caldavBackend->updateShares($this, $add, $remove);
-	}
-
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @return array
-	 */
-	public function getShares() {
-		if ($this->isShared()) {
-			return [];
-		}
-		return $this->caldavBackend->getShares($this->getResourceId());
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getResourceId() {
-		return $this->calendarInfo['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI() {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getACL() {
-		$acl =  [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-		];
-
-		if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-			$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			];
-		} else {
-			$acl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-			$acl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			];
-		}
-
-		$acl[] = [
-			'privilege' => '{DAV:}write-properties',
-			'principal' => $this->getOwner() . '/calendar-proxy-read',
-			'protected' => true,
-		];
-
-		if (!$this->isShared()) {
-			return $acl;
-		}
-
-		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
-				'privilege' => '{DAV:}read',
-				'principal' => parent::getOwner(),
-				'protected' => true,
-			];
-			if ($this->canWrite()) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			} else {
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			}
-		}
-		if ($this->isPublic()) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => 'principals/system/public',
-				'protected' => true,
-			];
-		}
-
-		$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
-		$allowedPrincipals = [
-			$this->getOwner(),
-			$this->getOwner(). '/calendar-proxy-read',
-			$this->getOwner(). '/calendar-proxy-write',
-			parent::getOwner(),
-			'principals/system/public'
-		];
-		return array_filter($acl, function ($rule) use ($allowedPrincipals) {
-			return \in_array($rule['principal'], $allowedPrincipals, true);
-		});
-	}
-
-	public function getChildACL() {
-		return $this->getACL();
-	}
-
-	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() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
-			$this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
-			$principal = 'principal:' . parent::getOwner();
-			$shares = $this->caldavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function ($share) use ($principal) {
-				return $share['href'] === $principal;
-			});
-			if (empty($shares)) {
-				throw new Forbidden();
-			}
-
-			$this->caldavBackend->updateShares($this, [], [
-				$principal
-			]);
-			return;
-		}
-
-		// Remember when a user deleted their birthday calendar
-		// in order to not regenerate it on the next contacts change
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$principalURI = $this->getPrincipalURI();
-			$userId = substr($principalURI, 17);
-
-			$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
-		}
-
-		parent::delete();
-	}
-
-	public function propPatch(PropPatch $propPatch) {
-		// parent::propPatch will only update calendars table
-		// if calendar is shared, changes have to be made to the properties table
-		if (!$this->isShared()) {
-			parent::propPatch($propPatch);
-		}
-	}
-
-	public function getChild($name) {
-
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-
-		return new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-
-	}
-
-	public function getChildren() {
-
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function getMultipleChildren(array $paths) {
-
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function childExists($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function calendarQuery(array $filters) {
-
-		$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
-		if ($this->isShared()) {
-			return array_filter($uris, function ($uri) {
-				return $this->childExists($uri);
-			});
-		}
-
-		return $uris;
-	}
-
-	/**
-	 * @param boolean $value
-	 * @return string|null
-	 */
-	public function setPublishStatus($value) {
-		$publicUri = $this->caldavBackend->setPublishStatus($value, $this);
-		$this->calendarInfo['publicuri'] = $publicUri;
-		return $publicUri;
-	}
-
-	/**
-	 * @return mixed $value
-	 */
-	public function getPublishStatus() {
-		return $this->caldavBackend->getPublishStatus($this);
-	}
-
-	public function canWrite() {
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			return false;
-		}
-
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
-
-	private function isPublic() {
-		return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
-	}
-
-	protected function isShared() {
-		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
-
-		return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
-	}
-
-	public function isSubscription() {
-		return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChanges($syncToken, $syncLevel, $limit = null) {
-		if (!$syncToken && $limit) {
-			throw new UnsupportedLimitOnInitialSyncException();
-		}
-
-		return parent::getChanges($syncToken, $syncLevel, $limit);
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IL10N */
+    protected $l10n;
+
+    /**
+     * Calendar constructor.
+     *
+     * @param BackendInterface $caldavBackend
+     * @param $calendarInfo
+     * @param IL10N $l10n
+     * @param IConfig $config
+     */
+    public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
+        parent::__construct($caldavBackend, $calendarInfo);
+
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
+        }
+        if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
+        }
+
+        $this->config = $config;
+        $this->l10n = $l10n;
+    }
+
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     * @throws Forbidden
+     */
+    public function updateShares(array $add, array $remove) {
+        if ($this->isShared()) {
+            throw new Forbidden();
+        }
+        $this->caldavBackend->updateShares($this, $add, $remove);
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @return array
+     */
+    public function getShares() {
+        if ($this->isShared()) {
+            return [];
+        }
+        return $this->caldavBackend->getShares($this->getResourceId());
+    }
+
+    /**
+     * @return int
+     */
+    public function getResourceId() {
+        return $this->calendarInfo['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrincipalURI() {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @return array
+     */
+    public function getACL() {
+        $acl =  [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+        ];
+
+        if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+            $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ];
+        } else {
+            $acl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+            $acl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ];
+        }
+
+        $acl[] = [
+            'privilege' => '{DAV:}write-properties',
+            'principal' => $this->getOwner() . '/calendar-proxy-read',
+            'protected' => true,
+        ];
+
+        if (!$this->isShared()) {
+            return $acl;
+        }
+
+        if ($this->getOwner() !== parent::getOwner()) {
+            $acl[] =  [
+                'privilege' => '{DAV:}read',
+                'principal' => parent::getOwner(),
+                'protected' => true,
+            ];
+            if ($this->canWrite()) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            } else {
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            }
+        }
+        if ($this->isPublic()) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/system/public',
+                'protected' => true,
+            ];
+        }
+
+        $acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
+        $allowedPrincipals = [
+            $this->getOwner(),
+            $this->getOwner(). '/calendar-proxy-read',
+            $this->getOwner(). '/calendar-proxy-write',
+            parent::getOwner(),
+            'principals/system/public'
+        ];
+        return array_filter($acl, function ($rule) use ($allowedPrincipals) {
+            return \in_array($rule['principal'], $allowedPrincipals, true);
+        });
+    }
+
+    public function getChildACL() {
+        return $this->getACL();
+    }
+
+    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() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
+            $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
+            $principal = 'principal:' . parent::getOwner();
+            $shares = $this->caldavBackend->getShares($this->getResourceId());
+            $shares = array_filter($shares, function ($share) use ($principal) {
+                return $share['href'] === $principal;
+            });
+            if (empty($shares)) {
+                throw new Forbidden();
+            }
+
+            $this->caldavBackend->updateShares($this, [], [
+                $principal
+            ]);
+            return;
+        }
+
+        // Remember when a user deleted their birthday calendar
+        // in order to not regenerate it on the next contacts change
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $principalURI = $this->getPrincipalURI();
+            $userId = substr($principalURI, 17);
+
+            $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
+        }
+
+        parent::delete();
+    }
+
+    public function propPatch(PropPatch $propPatch) {
+        // parent::propPatch will only update calendars table
+        // if calendar is shared, changes have to be made to the properties table
+        if (!$this->isShared()) {
+            parent::propPatch($propPatch);
+        }
+    }
+
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+
+        return new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+
+    }
+
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function getMultipleChildren(array $paths) {
+
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function childExists($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function calendarQuery(array $filters) {
+
+        $uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
+        if ($this->isShared()) {
+            return array_filter($uris, function ($uri) {
+                return $this->childExists($uri);
+            });
+        }
+
+        return $uris;
+    }
+
+    /**
+     * @param boolean $value
+     * @return string|null
+     */
+    public function setPublishStatus($value) {
+        $publicUri = $this->caldavBackend->setPublishStatus($value, $this);
+        $this->calendarInfo['publicuri'] = $publicUri;
+        return $publicUri;
+    }
+
+    /**
+     * @return mixed $value
+     */
+    public function getPublishStatus() {
+        return $this->caldavBackend->getPublishStatus($this);
+    }
+
+    public function canWrite() {
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            return false;
+        }
+
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
+
+    private function isPublic() {
+        return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
+    }
+
+    protected function isShared() {
+        if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return false;
+        }
+
+        return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
+    }
+
+    public function isSubscription() {
+        return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChanges($syncToken, $syncLevel, $limit = null) {
+        if (!$syncToken && $limit) {
+            throw new UnsupportedLimitOnInitialSyncException();
+        }
+
+        return parent::getChanges($syncToken, $syncLevel, $limit);
+    }
 }