nextcloud / server

apps/dav/lib/CalDAV/Activity/Setting/Todo.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Todo implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'calendar_todo';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'calendar_todo';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A calendar <strong>todo</strong> was modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A calendar <strong>todo</strong> was modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/dav/lib/CalDAV/Activity/Backend.php

Indentation +429 added lines, -429 removed lines

@@ -39,433 +39,433 @@
  */
 class Backend {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param IActivityManager $activityManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * Creates activities when a calendar was creates
-	 *
-	 * @param array $calendarData
-	 */
-	public function onCalendarAdd(array $calendarData) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
-	}
-
-	/**
-	 * Creates activities when a calendar was updated
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $properties
-	 */
-	public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
-	}
-
-	/**
-	 * Creates activities when a calendar was deleted
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 */
-	public function onCalendarDelete(array $calendarData, array $shares) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was touched
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $changedProperties
-	 */
-	protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		$changedVisibleInformation = array_intersect([
-			'{DAV:}displayname',
-			'{http://apple.com/ns/ical/}calendar-color'
-		], array_keys($changedProperties));
-
-		if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
-			$users = [$owner];
-		} else {
-			$users = $this->getUsersForShares($shares);
-			$users[] = $owner;
-		}
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						$currentUser,
-						$calendarData['{DAV:}displayname'],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was (un-)shared
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = $principal[2];
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		foreach ($remove as $principal) {
-			// principal:principals/users/test
-			$parts = explode(':', $principal, 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser(
-					$principal[2],
-					$event,
-					$calendarData,
-					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
-				);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						$principal[2],
-						$calendarData['{DAV:}displayname'],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
-					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
-						$parameters[] = $event->getAuthor();
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
-
-				$parameters = [
-					$principal[2],
-					$calendarData['{DAV:}displayname'],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
-					$parameters[] = $event->getAuthor();
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-
-		foreach ($add as $share) {
-			if ($this->isAlreadyShared($share['href'], $shares)) {
-				continue;
-			}
-
-			// principal:principals/users/test
-			$parts = explode(':', $share['href'], 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						$principal[2],
-						$calendarData['{DAV:}displayname'],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
-						$parameters[] = $event->getAuthor();
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} else if ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				$parameters = [
-					$principal[2],
-					$calendarData['{DAV:}displayname'],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
-					$parameters[] = $event->getAuthor();
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-	}
-
-	/**
-	 * Checks if a calendar is already shared with a principal
-	 *
-	 * @param string $principal
-	 * @param array[] $shares
-	 * @return bool
-	 */
-	protected function isAlreadyShared($principal, $shares) {
-		foreach ($shares as $share) {
-			if ($principal === $share['href']) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates the given activity for all members of the given group
-	 *
-	 * @param string $gid
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 */
-	protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
-		$group = $this->groupManager->get($gid);
-
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				// Exclude current user
-				if ($user->getUID() !== $event->getAuthor()) {
-					$this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates the given activity for the given user
-	 *
-	 * @param string $user
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 * @param string $subjectSelf
-	 */
-	protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
-		$event->setAffectedUser($user)
-			->setSubject(
-				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
-				[
-					$event->getAuthor(),
-					$properties['{DAV:}displayname'],
-				]
-			);
-
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * Creates activities when a calendar object was created/updated/deleted
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 */
-	public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
-
-		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
-			$action .= '_completed';
-		} else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
-			$action .= '_needs_action';
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
-			->setAuthor($currentUser);
-
-		$users = $this->getUsersForShares($shares);
-		$users[] = $owner;
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						$currentUser,
-						$calendarData['{DAV:}displayname'],
-						[
-							'id' => $object['id'],
-							'name' => $object['name'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 * @return string[]|bool
-	 */
-	protected function getObjectNameAndType(array $objectData) {
-		$vObject = Reader::read($objectData['calendardata']);
-		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
-			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
-				$componentType = $component->name;
-				break;
-			}
-		}
-
-		if (!$componentType) {
-			// Calendar objects must have a VEVENT or VTODO component
-			return false;
-		}
-
-		if ($componentType === 'VEVENT') {
-			return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
-		}
-		return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
-	}
-
-	/**
-	 * Get all users that have access to a given calendar
-	 *
-	 * @param array $shares
-	 * @return string[]
-	 */
-	protected function getUsersForShares(array $shares) {
-		$users = $groups = [];
-		foreach ($shares as $share) {
-			$prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($prinical[1] === 'users') {
-				$users[] = $prinical[2];
-			} else if ($prinical[1] === 'groups') {
-				$groups[] = $prinical[2];
-			}
-		}
-
-		if (!empty($groups)) {
-			foreach ($groups as $gid) {
-				$group = $this->groupManager->get($gid);
-				if ($group instanceof IGroup) {
-					foreach ($group->getUsers() as $user) {
-						$users[] = $user->getUID();
-					}
-				}
-			}
-		}
-
-		return array_unique($users);
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /**
+     * @param IActivityManager $activityManager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * Creates activities when a calendar was creates
+     *
+     * @param array $calendarData
+     */
+    public function onCalendarAdd(array $calendarData) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
+    }
+
+    /**
+     * Creates activities when a calendar was updated
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $properties
+     */
+    public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
+    }
+
+    /**
+     * Creates activities when a calendar was deleted
+     *
+     * @param array $calendarData
+     * @param array $shares
+     */
+    public function onCalendarDelete(array $calendarData, array $shares) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was touched
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $changedProperties
+     */
+    protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        $changedVisibleInformation = array_intersect([
+            '{DAV:}displayname',
+            '{http://apple.com/ns/ical/}calendar-color'
+        ], array_keys($changedProperties));
+
+        if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
+            $users = [$owner];
+        } else {
+            $users = $this->getUsersForShares($shares);
+            $users[] = $owner;
+        }
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        $currentUser,
+                        $calendarData['{DAV:}displayname'],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was (un-)shared
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $add
+     * @param array $remove
+     */
+    public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = $principal[2];
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        foreach ($remove as $principal) {
+            // principal:principals/users/test
+            $parts = explode(':', $principal, 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser(
+                    $principal[2],
+                    $event,
+                    $calendarData,
+                    Calendar::SUBJECT_UNSHARE_USER,
+                    Calendar::SUBJECT_DELETE . '_self'
+                );
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        $principal[2],
+                        $calendarData['{DAV:}displayname'],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+                    } else if ($principal[2] === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+                        $parameters[] = $event->getAuthor();
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
+
+                $parameters = [
+                    $principal[2],
+                    $calendarData['{DAV:}displayname'],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+                    $parameters[] = $event->getAuthor();
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+
+        foreach ($add as $share) {
+            if ($this->isAlreadyShared($share['href'], $shares)) {
+                continue;
+            }
+
+            // principal:principals/users/test
+            $parts = explode(':', $share['href'], 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        $principal[2],
+                        $calendarData['{DAV:}displayname'],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_you';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_by';
+                        $parameters[] = $event->getAuthor();
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } else if ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                $parameters = [
+                    $principal[2],
+                    $calendarData['{DAV:}displayname'],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+                    $parameters[] = $event->getAuthor();
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+    }
+
+    /**
+     * Checks if a calendar is already shared with a principal
+     *
+     * @param string $principal
+     * @param array[] $shares
+     * @return bool
+     */
+    protected function isAlreadyShared($principal, $shares) {
+        foreach ($shares as $share) {
+            if ($principal === $share['href']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Creates the given activity for all members of the given group
+     *
+     * @param string $gid
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     */
+    protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
+        $group = $this->groupManager->get($gid);
+
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                // Exclude current user
+                if ($user->getUID() !== $event->getAuthor()) {
+                    $this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
+                }
+            }
+        }
+    }
+
+    /**
+     * Creates the given activity for the given user
+     *
+     * @param string $user
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     * @param string $subjectSelf
+     */
+    protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
+        $event->setAffectedUser($user)
+            ->setSubject(
+                $user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
+                [
+                    $event->getAuthor(),
+                    $properties['{DAV:}displayname'],
+                ]
+            );
+
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * Creates activities when a calendar object was created/updated/deleted
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     */
+    public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $object = $this->getObjectNameAndType($objectData);
+        $action = $action . '_' . $object['type'];
+
+        if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
+            $action .= '_completed';
+        } else if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
+            $action .= '_needs_action';
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
+            ->setAuthor($currentUser);
+
+        $users = $this->getUsersForShares($shares);
+        $users[] = $owner;
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        $currentUser,
+                        $calendarData['{DAV:}displayname'],
+                        [
+                            'id' => $object['id'],
+                            'name' => $object['name'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * @param array $objectData
+     * @return string[]|bool
+     */
+    protected function getObjectNameAndType(array $objectData) {
+        $vObject = Reader::read($objectData['calendardata']);
+        $component = $componentType = null;
+        foreach($vObject->getComponents() as $component) {
+            if (in_array($component->name, ['VEVENT', 'VTODO'])) {
+                $componentType = $component->name;
+                break;
+            }
+        }
+
+        if (!$componentType) {
+            // Calendar objects must have a VEVENT or VTODO component
+            return false;
+        }
+
+        if ($componentType === 'VEVENT') {
+            return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
+        }
+        return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
+    }
+
+    /**
+     * Get all users that have access to a given calendar
+     *
+     * @param array $shares
+     * @return string[]
+     */
+    protected function getUsersForShares(array $shares) {
+        $users = $groups = [];
+        foreach ($shares as $share) {
+            $prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($prinical[1] === 'users') {
+                $users[] = $prinical[2];
+            } else if ($prinical[1] === 'groups') {
+                $groups[] = $prinical[2];
+            }
+        }
+
+        if (!empty($groups)) {
+            foreach ($groups as $gid) {
+                $group = $this->groupManager->get($gid);
+                if ($group instanceof IGroup) {
+                    foreach ($group->getUsers() as $user) {
+                        $users[] = $user->getUID();
+                    }
+                }
+            }
+        }
+
+        return array_unique($users);
+    }
 }

apps/dav/lib/CalDAV/Calendar.php

Indentation +262 added lines, -262 removed lines

@@ -32,267 +32,267 @@
 
 class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 
-	public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n) {
-		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');
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	function updateShares(array $add, array $remove) {
-		/** @var CalDavBackend $calDavBackend */
-		$calDavBackend = $this->caldavBackend;
-		$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
-	 */
-	function getShares() {
-		/** @var CalDavBackend $calDavBackend */
-		$calDavBackend = $this->caldavBackend;
-		return $calDavBackend->getShares($this->getResourceId());
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getResourceId() {
-		return $this->calendarInfo['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI() {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	function getACL() {
-		$acl =  [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]];
-		if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		}
-		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,
-				];
-			}
-		}
-		if ($this->isPublic()) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => 'principals/system/public',
-				'protected' => true,
-			];
-		}
-
-		/** @var CalDavBackend $calDavBackend */
-		$calDavBackend = $this->caldavBackend;
-		return $calDavBackend->applyShareAcl($this->getResourceId(), $acl);
-	}
-
-	function getChildACL() {
-		return $this->getACL();
-	}
-
-	function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	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->getShares();
-			$shares = array_filter($shares, function($share) use ($principal){
-				return $share['href'] === $principal;
-			});
-			if (empty($shares)) {
-				throw new Forbidden();
-			}
-
-			/** @var CalDavBackend $calDavBackend */
-			$calDavBackend = $this->caldavBackend;
-			$calDavBackend->updateShares($this, [], [
-				'href' => $principal
-			]);
-			return;
-		}
-		parent::delete();
-	}
-
-	function propPatch(PropPatch $propPatch) {
-		$mutations = $propPatch->getMutations();
-		// If this is a shared calendar, the user can only change the enabled property, to hide it.
-		if ($this->isShared() && (sizeof($mutations) !== 1 || !isset($mutations['{http://owncloud.org/ns}calendar-enabled']))) {
-			throw new Forbidden();
-		}
-		parent::propPatch($propPatch);
-	}
-
-	function getChild($name) {
-
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-
-		return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	function getChildren() {
-
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	function getMultipleChildren(array $paths) {
-
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	function childExists($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-		if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-			return false;
-		}
-
-		return true;
-	}
-
-	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
-	 */
-	function setPublishStatus($value) {
-		$publicUri = $this->caldavBackend->setPublishStatus($value, $this);
-		$this->calendarInfo['publicuri'] = $publicUri;
-		return $publicUri;
-	}
-
-	/**
-	 * @return mixed $value
-	 */
-	function getPublishStatus() {
-		return $this->caldavBackend->getPublishStatus($this);
-	}
-
-	private function canWrite() {
-		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']);
-	}
-
-	private 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']);
-	}
+    public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n) {
+        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');
+        }
+    }
+
+    /**
+     * 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
+     */
+    function updateShares(array $add, array $remove) {
+        /** @var CalDavBackend $calDavBackend */
+        $calDavBackend = $this->caldavBackend;
+        $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
+     */
+    function getShares() {
+        /** @var CalDavBackend $calDavBackend */
+        $calDavBackend = $this->caldavBackend;
+        return $calDavBackend->getShares($this->getResourceId());
+    }
+
+    /**
+     * @return int
+     */
+    public function getResourceId() {
+        return $this->calendarInfo['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrincipalURI() {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    function getACL() {
+        $acl =  [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]];
+        if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        }
+        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,
+                ];
+            }
+        }
+        if ($this->isPublic()) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/system/public',
+                'protected' => true,
+            ];
+        }
+
+        /** @var CalDavBackend $calDavBackend */
+        $calDavBackend = $this->caldavBackend;
+        return $calDavBackend->applyShareAcl($this->getResourceId(), $acl);
+    }
+
+    function getChildACL() {
+        return $this->getACL();
+    }
+
+    function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    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->getShares();
+            $shares = array_filter($shares, function($share) use ($principal){
+                return $share['href'] === $principal;
+            });
+            if (empty($shares)) {
+                throw new Forbidden();
+            }
+
+            /** @var CalDavBackend $calDavBackend */
+            $calDavBackend = $this->caldavBackend;
+            $calDavBackend->updateShares($this, [], [
+                'href' => $principal
+            ]);
+            return;
+        }
+        parent::delete();
+    }
+
+    function propPatch(PropPatch $propPatch) {
+        $mutations = $propPatch->getMutations();
+        // If this is a shared calendar, the user can only change the enabled property, to hide it.
+        if ($this->isShared() && (sizeof($mutations) !== 1 || !isset($mutations['{http://owncloud.org/ns}calendar-enabled']))) {
+            throw new Forbidden();
+        }
+        parent::propPatch($propPatch);
+    }
+
+    function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+
+        return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    function getMultipleChildren(array $paths) {
+
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    function childExists($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+        if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+            return false;
+        }
+
+        return true;
+    }
+
+    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
+     */
+    function setPublishStatus($value) {
+        $publicUri = $this->caldavBackend->setPublishStatus($value, $this);
+        $this->calendarInfo['publicuri'] = $publicUri;
+        return $publicUri;
+    }
+
+    /**
+     * @return mixed $value
+     */
+    function getPublishStatus() {
+        return $this->caldavBackend->getPublishStatus($this);
+    }
+
+    private function canWrite() {
+        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']);
+    }
+
+    private 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']);
+    }
 
 }

apps/dav/lib/CalDAV/CalendarHome.php

Indentation +66 added lines, -66 removed lines

@@ -33,82 +33,82 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
+    /** @var \OCP\IL10N */
+    private $l10n;
 
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-	}
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+    }
 
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
-		}
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
+        }
 
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->principalInfo['uri']);
-		}
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->principalInfo['uri']);
+        }
 
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
 
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				$objects[] = new Subscription($this->caldavBackend, $subscription);
-			}
-		}
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                $objects[] = new Subscription($this->caldavBackend, $subscription);
+            }
+        }
 
-		return $objects;
-	}
+        return $objects;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
 
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n);
-			}
-		}
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n);
+            }
+        }
 
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
 
-		}
+        }
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarRoot.php

Indentation +33 added lines, -33 removed lines

@@ -25,43 +25,43 @@
 
 class PublicCalendarRoot extends Collection {
 
-	/** @var CalDavBackend */
-	protected $caldavBackend;
+    /** @var CalDavBackend */
+    protected $caldavBackend;
 
-	/** @var \OCP\IL10N */
-	protected $l10n;
+    /** @var \OCP\IL10N */
+    protected $l10n;
 
-	function __construct(CalDavBackend $caldavBackend) {
-		$this->caldavBackend = $caldavBackend;
-		$this->l10n = \OC::$server->getL10N('dav');
-	}
+    function __construct(CalDavBackend $caldavBackend) {
+        $this->caldavBackend = $caldavBackend;
+        $this->l10n = \OC::$server->getL10N('dav');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return 'public-calendars';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return 'public-calendars';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		$calendar = $this->caldavBackend->getPublicCalendar($name);
-		return new Calendar($this->caldavBackend, $calendar, $this->l10n);
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        $calendar = $this->caldavBackend->getPublicCalendar($name);
+        return new Calendar($this->caldavBackend, $calendar, $this->l10n);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getPublicCalendars();
-		$children = [];
-		foreach ($calendars as $calendar) {
-			// TODO: maybe implement a new class PublicCalendar ???
-			$children[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
-		}
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getPublicCalendars();
+        $children = [];
+        foreach ($calendars as $calendar) {
+            // TODO: maybe implement a new class PublicCalendar ???
+            $children[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
+        }
 
-		return $children;
-	}
+        return $children;
+    }
 }

apps/dav/lib/CalDAV/CalDavBackend.php

Indentation +1739 added lines, -1739 removed lines

@@ -59,1744 +59,1744 @@
  */
 class CalDavBackend extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
 
-	const PERSONAL_CALENDAR_URI = 'personal';
-	const PERSONAL_CALENDAR_NAME = 'Personal';
-
-	/**
-	 * 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 string[] Map of uid => display name
-	 */
-	protected $userDisplayNames;
-
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var Backend */
-	private $sharingBackend;
-
-	/** @var Principal */
-	private $principalBackend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var bool */
-	private $legacyEndpoint;
-
-	/**
-	 * CalDavBackend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param Principal $principalBackend
-	 * @param IUserManager $userManager
-	 * @param ISecureRandom $random
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param bool $legacyEndpoint
-	 */
-	public function __construct(IDBConnection $db,
-								Principal $principalBackend,
-								IUserManager $userManager,
-								ISecureRandom $random,
-								EventDispatcherInterface $dispatcher,
-								$legacyEndpoint = false) {
-		$this->db = $db;
-		$this->principalBackend = $principalBackend;
-		$this->userManager = $userManager;
-		$this->sharingBackend = new Backend($this->db, $principalBackend, 'calendar');
-		$this->random = $random;
-		$this->dispatcher = $dispatcher;
-		$this->legacyEndpoint = $legacyEndpoint;
-	}
-
-	/**
-	 * Return the number of calendars for a principal
-	 *
-	 * By default this excludes the automatically generated birthday calendar
-	 *
-	 * @param $principalUri
-	 * @param bool $excludeBirthday
-	 * @return int
-	 */
-	public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->createFunction('COUNT(*)'))
-			->from('calendars')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		if ($excludeBirthday) {
-			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
-		}
-
-		return (int)$query->execute()->fetchColumn();
-	}
-
-	/**
-	 * Returns a list of calendars for a principal.
-	 *
-	 * Every project is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    calendar. This can be the same as the uri or a database key.
-	 *  * uri, which the basename of the uri with which the calendar is
-	 *    accessed.
-	 *  * principaluri. The owner of the calendar. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore it can contain webdav properties in clark notation. A very
-	 * common one is '{DAV:}displayname'.
-	 *
-	 * Many clients also require:
-	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 * For this property, you can just return an instance of
-	 * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-	 *
-	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-	 * ACL will automatically be put in read-only mode.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getCalendarsForUser($principalUri) {
-		$principalUriOriginal = $principalUri;
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->orderBy('calendarorder', 'ASC');
-		$stmt = $query->execute();
-
-		$calendars = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-			];
-
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-
-		$stmt->closeCursor();
-
-		// query for shared calendars
-		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
-		$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();
-
-		while($row = $result->fetch()) {
-			list(, $name) = URLUtil::splitPath($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($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,
-			];
-
-			foreach($this->propertyMap as $xmlName=>$dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$result->closeCursor();
-
-		return array_values($calendars);
-	}
-
-	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];
-			}
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$stmt->closeCursor();
-		return array_values($calendars);
-	}
-
-
-	private function getUserDisplayName($uid) {
-		if (!isset($this->userDisplayNames[$uid])) {
-			$user = $this->userManager->get($uid);
-
-			if ($user instanceof IUser) {
-				$this->userDisplayNames[$uid] = $user->getDisplayName();
-			} else {
-				$this->userDisplayNames[$uid] = $uid;
-			}
-		}
-
-		return $this->userDisplayNames[$uid];
-	}
+    const PERSONAL_CALENDAR_URI = 'personal';
+    const PERSONAL_CALENDAR_NAME = 'Personal';
+
+    /**
+     * 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 string[] Map of uid => display name
+     */
+    protected $userDisplayNames;
+
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var Backend */
+    private $sharingBackend;
+
+    /** @var Principal */
+    private $principalBackend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var bool */
+    private $legacyEndpoint;
+
+    /**
+     * CalDavBackend constructor.
+     *
+     * @param IDBConnection $db
+     * @param Principal $principalBackend
+     * @param IUserManager $userManager
+     * @param ISecureRandom $random
+     * @param EventDispatcherInterface $dispatcher
+     * @param bool $legacyEndpoint
+     */
+    public function __construct(IDBConnection $db,
+                                Principal $principalBackend,
+                                IUserManager $userManager,
+                                ISecureRandom $random,
+                                EventDispatcherInterface $dispatcher,
+                                $legacyEndpoint = false) {
+        $this->db = $db;
+        $this->principalBackend = $principalBackend;
+        $this->userManager = $userManager;
+        $this->sharingBackend = new Backend($this->db, $principalBackend, 'calendar');
+        $this->random = $random;
+        $this->dispatcher = $dispatcher;
+        $this->legacyEndpoint = $legacyEndpoint;
+    }
+
+    /**
+     * Return the number of calendars for a principal
+     *
+     * By default this excludes the automatically generated birthday calendar
+     *
+     * @param $principalUri
+     * @param bool $excludeBirthday
+     * @return int
+     */
+    public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->createFunction('COUNT(*)'))
+            ->from('calendars')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        if ($excludeBirthday) {
+            $query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
+        }
+
+        return (int)$query->execute()->fetchColumn();
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * Many clients also require:
+     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     * For this property, you can just return an instance of
+     * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+     *
+     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+     * ACL will automatically be put in read-only mode.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getCalendarsForUser($principalUri) {
+        $principalUriOriginal = $principalUri;
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->orderBy('calendarorder', 'ASC');
+        $stmt = $query->execute();
+
+        $calendars = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+            ];
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+
+        $stmt->closeCursor();
+
+        // query for shared calendars
+        $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+        $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();
+
+        while($row = $result->fetch()) {
+            list(, $name) = URLUtil::splitPath($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($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,
+            ];
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $result->closeCursor();
+
+        return array_values($calendars);
+    }
+
+    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];
+            }
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $stmt->closeCursor();
+        return array_values($calendars);
+    }
+
+
+    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) = URLUtil::splitPath($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];
-			}
-
-			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) = URLUtil::splitPath($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];
-		}
-
-		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];
-		}
-
-		return $calendar;
-	}
-
-	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];
-		}
-
-		return $calendar;
-	}
-
-	/**
-	 * 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
-	 */
-	function createCalendar($principalUri, $calendarUri, array $properties) {
-		$values = [
-			'principaluri' => $this->convertPrincipal($principalUri, true),
-			'uri'          => $calendarUri,
-			'synctoken'    => 1,
-			'transparent'  => 0,
-			'components'   => 'VEVENT,VTODO',
-			'displayname'  => $calendarUri
-		];
-
-		// Default value
-		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-		if (isset($properties[$sccs])) {
-			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
-			}
-			$values['components'] = implode(',',$properties[$sccs]->getValue());
-		}
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-		if (isset($properties[$transp])) {
-			$values['transparent'] = $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 PropPatch $propPatch
-	 * @return void
-	 */
-	function updateCalendar($calendarId, PropPatch $propPatch) {
-		$supportedProperties = array_keys($this->propertyMap);
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-
-		$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] = $propertyValue->getValue() === 'transparent';
-						break;
-					default :
-						$fieldName = $this->propertyMap[$propertyName];
-						$newValues[$fieldName] = $propertyValue;
-						break;
-				}
-
-			}
-			$query = $this->db->getQueryBuilder();
-			$query->update('calendars');
-			foreach ($newValues as $fieldName => $value) {
-				$query->set($fieldName, $query->createNamedParameter($value));
-			}
-			$query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-			$query->execute();
-
-			$this->addChange($calendarId, "", 2);
-
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'propertyMutations' => $mutations,
-			]));
-
-			return true;
-		});
-	}
-
-	/**
-	 * Delete a calendar and all it's objects
-	 *
-	 * @param mixed $calendarId
-	 * @return void
-	 */
-	function deleteCalendar($calendarId) {
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'shares' => $this->getShares($calendarId),
-		]));
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ?');
-		$stmt->execute([$calendarId]);
-
-		$this->sharingBackend->deleteAllShares($calendarId);
-	}
-
-	/**
-	 * Delete all of an user's shares
-	 *
-	 * @param string $principaluri
-	 * @return void
-	 */
-	function deleteAllSharesByUser($principaluri) {
-		$this->sharingBackend->deleteAllSharesByUser($principaluri);
-	}
-
-	/**
-	 * Returns all calendar objects within a calendar.
-	 *
-	 * Every item contains an array with the following keys:
-	 *   * calendardata - The iCalendar-compatible calendar data
-	 *   * uri - a unique key which will be used to construct the uri. This can
-	 *     be any arbitrary string, but making sure it ends with '.ics' is a
-	 *     good idea. This is only the basename, or filename, not the full
-	 *     path.
-	 *   * lastmodified - a timestamp of the last modification time
-	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-	 *   '"abcdef"')
-	 *   * size - The size of the calendar objects, in bytes.
-	 *   * component - optional, a string containing the type of object, such
-	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-	 *     the Content-Type header.
-	 *
-	 * Note that the etag is optional, but it's highly encouraged to return for
-	 * speed reasons.
-	 *
-	 * The calendardata is also optional. If it's not returned
-	 * 'getCalendarObject' will be called later, which *is* expected to return
-	 * calendardata.
-	 *
-	 * If neither etag or size are specified, the calendardata will be
-	 * used/fetched to determine these numbers. If both are specified the
-	 * amount of times this is needed is reduced by a great degree.
-	 *
-	 * @param mixed $calendarId
-	 * @return array
-	 */
-	function getCalendarObjects($calendarId) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
-		$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 $calendarId
-	 * @param string $objectUri
-	 * @return array|null
-	 */
-	function getCalendarObject($calendarId, $objectUri) {
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
-				->from('calendarobjects')
-				->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) return null;
-
-		return [
-				'id'            => $row['id'],
-				'uri'           => $row['uri'],
-				'lastmodified'  => $row['lastmodified'],
-				'etag'          => '"' . $row['etag'] . '"',
-				'calendarid'    => $row['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
-	 * @return array
-	 */
-	function getMultipleCalendarObjects($calendarId, array $uris) {
-		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($calendarId)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
-
-		foreach ($chunks as $uris) {
-			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->execute();
-
-			while ($row = $result->fetch()) {
-				$objects[] = [
-					'id'           => $row['id'],
-					'uri'          => $row['uri'],
-					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
-					'calendarid'   => $row['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
-	 * @return string
-	 */
-	function createCalendarObject($calendarId, $objectUri, $calendarData) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'calendarid' => $query->createNamedParameter($calendarId),
-				'uri' => $query->createNamedParameter($objectUri),
-				'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter($extraData['etag']),
-				'size' => $query->createNamedParameter($extraData['size']),
-				'componenttype' => $query->createNamedParameter($extraData['componentType']),
-				'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
-				'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
-				'classification' => $query->createNamedParameter($extraData['classification']),
-				'uid' => $query->createNamedParameter($extraData['uid']),
-			])
-			->execute();
-
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'shares' => $this->getShares($calendarId),
-				'objectData' => $this->getCalendarObject($calendarId, $objectUri),
-			]
-		));
-		$this->addChange($calendarId, $objectUri, 1);
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * Updates an existing calendarobject, based on it's uri.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * It is possible return an etag from this function, which will be used in
-	 * the response to this PUT request. Note that the ETag must be surrounded
-	 * by double-quotes.
-	 *
-	 * However, you should only really return this ETag if you don't mangle the
-	 * calendar-data. If the result of a subsequent GET to this object is not
-	 * the exact same as this request body, you should omit the ETag.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @return string
-	 */
-	function updateCalendarObject($calendarId, $objectUri, $calendarData) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-				->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
-				->set('etag', $query->createNamedParameter($extraData['etag']))
-				->set('size', $query->createNamedParameter($extraData['size']))
-				->set('componenttype', $query->createNamedParameter($extraData['componentType']))
-				->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
-				->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
-				->set('classification', $query->createNamedParameter($extraData['classification']))
-				->set('uid', $query->createNamedParameter($extraData['uid']))
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->execute();
-
-		$data = $this->getCalendarObject($calendarId, $objectUri);
-		if (is_array($data)) {
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'objectData' => $data,
-				]
-			));
-		}
-		$this->addChange($calendarId, $objectUri, 2);
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * @param int $calendarObjectId
-	 * @param int $classification
-	 */
-	public function setClassification($calendarObjectId, $classification) {
-		if (!in_array($classification, [
-			self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
-		])) {
-			throw new \InvalidArgumentException();
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-			->set('classification', $query->createNamedParameter($classification))
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
-			->execute();
-	}
-
-	/**
-	 * Deletes an existing calendar object.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @return void
-	 */
-	function deleteCalendarObject($calendarId, $objectUri) {
-		$data = $this->getCalendarObject($calendarId, $objectUri);
-		if (is_array($data)) {
-			$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $this->getCalendarById($calendarId),
-					'shares' => $this->getShares($calendarId),
-					'objectData' => $data,
-				]
-			));
-		}
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ?');
-		$stmt->execute([$calendarId, $objectUri]);
-
-		$this->addChange($calendarId, $objectUri, 3);
-	}
-
-	/**
-	 * Performs a calendar-query on the contents of this calendar.
-	 *
-	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
-	 * calendar-query it is possible for a client to request a specific set of
-	 * object, based on contents of iCalendar properties, date-ranges and
-	 * iCalendar component types (VTODO, VEVENT).
-	 *
-	 * This method should just return a list of (relative) urls that match this
-	 * query.
-	 *
-	 * The list of filters are specified as an array. The exact array is
-	 * documented by Sabre\CalDAV\CalendarQueryParser.
-	 *
-	 * Note that it is extremely likely that getCalendarObject for every path
-	 * returned from this method will be called almost immediately after. You
-	 * may want to anticipate this to speed up these requests.
-	 *
-	 * This method provides a default implementation, which parses *all* the
-	 * iCalendar objects in the specified calendar.
-	 *
-	 * This default may well be good enough for personal use, and calendars
-	 * that aren't very large. But if you anticipate high usage, big calendars
-	 * or high loads, you are strongly advised to optimize certain paths.
-	 *
-	 * The best way to do so is override this method and to optimize
-	 * specifically for 'common filters'.
-	 *
-	 * Requests that are extremely common are:
-	 *   * requests for just VEVENTS
-	 *   * requests for just VTODO
-	 *   * requests with a time-range-filter on either VEVENT or VTODO.
-	 *
-	 * ..and combinations of these requests. It may not be worth it to try to
-	 * handle every possible situation and just rely on the (relatively
-	 * easy to use) CalendarQueryValidator to handle the rest.
-	 *
-	 * Note that especially time-range-filters may be difficult to parse. A
-	 * time-range filter specified on a VEVENT must for instance also handle
-	 * recurrence rules correctly.
-	 * A good example of how to interprete all these filters can also simply
-	 * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-	 * as possible, so it gives you a good idea on what type of stuff you need
-	 * to think of.
-	 *
-	 * @param mixed $calendarId
-	 * @param array $filters
-	 * @return array
-	 */
-	function calendarQuery($calendarId, array $filters) {
-		$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($calendarId)));
-
-		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) {
-				if (!$this->validateFilterForObject($row, $filters)) {
-					continue;
-				}
-			}
-			$result[] = $row['uri'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Searches through all of a users calendars and calendar objects to find
-	 * an object with a specific UID.
-	 *
-	 * This method should return the path to this object, relative to the
-	 * calendar home, so this path usually only contains two parts:
-	 *
-	 * calendarpath/objectpath.ics
-	 *
-	 * If the uid is not found, return null.
-	 *
-	 * This method should only consider * objects that the principal owns, so
-	 * any calendars owned by other principals that also appear in this
-	 * collection should be ignored.
-	 *
-	 * @param string $principalUri
-	 * @param string $uid
-	 * @return string|null
-	 */
-	function getCalendarObjectByUID($principalUri, $uid) {
-
-		$query = $this->db->getQueryBuilder();
-		$query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
-			->from('calendarobjects', 'co')
-			->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
-			->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
-
-		$stmt = $query->execute();
-
-		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * The getChanges method returns all the changes that have happened, since
-	 * the specified syncToken in the specified calendar.
-	 *
-	 * This function should return an array, such as the following:
-	 *
-	 * [
-	 *   'syncToken' => 'The current synctoken',
-	 *   'added'   => [
-	 *      'new.txt',
-	 *   ],
-	 *   'modified'   => [
-	 *      'modified.txt',
-	 *   ],
-	 *   'deleted' => [
-	 *      'foo.php.bak',
-	 *      'old.txt'
-	 *   ]
-	 * );
-	 *
-	 * The returned syncToken property should reflect the *current* syncToken
-	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-	 * property This is * needed here too, to ensure the operation is atomic.
-	 *
-	 * If the $syncToken argument is specified as null, this is an initial
-	 * sync, and all members should be reported.
-	 *
-	 * The modified property is an array of nodenames that have changed since
-	 * the last token.
-	 *
-	 * The deleted property is an array with nodenames, that have been deleted
-	 * from collection.
-	 *
-	 * The $syncLevel argument is basically the 'depth' of the report. If it's
-	 * 1, you only have to report changes that happened only directly in
-	 * immediate descendants. If it's 2, it should also include changes from
-	 * the nodes below the child collections. (grandchildren)
-	 *
-	 * The $limit argument allows a client to specify how many results should
-	 * be returned at most. If the limit is not specified, it should be treated
-	 * as infinite.
-	 *
-	 * If the limit (infinite or not) is higher than you're willing to return,
-	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-	 *
-	 * If the syncToken is expired (due to data cleanup) or unknown, you must
-	 * return null.
-	 *
-	 * The limit is 'suggestive'. You are free to ignore it.
-	 *
-	 * @param string $calendarId
-	 * @param string $syncToken
-	 * @param int $syncLevel
-	 * @param int $limit
-	 * @return array
-	 */
-	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
-		// Current synctoken
-		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([ $calendarId ]);
-		$currentToken = $stmt->fetchColumn(0);
-
-		if (is_null($currentToken)) {
-			return null;
-		}
-
-		$result = [
-			'syncToken' => $currentToken,
-			'added'     => [],
-			'modified'  => [],
-			'deleted'   => [],
-		];
-
-		if ($syncToken) {
-
-			$query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? ORDER BY `synctoken`";
-			if ($limit>0) {
-				$query.= " `LIMIT` " . (int)$limit;
-			}
-
-			// Fetching all changes
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$syncToken, $currentToken, $calendarId]);
-
-			$changes = [];
-
-			// This loop ensures that any duplicates are overwritten, only the
-			// last change on a node is relevant.
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-				$changes[$row['uri']] = $row['operation'];
-
-			}
-
-			foreach($changes as $uri => $operation) {
-
-				switch($operation) {
-					case 1 :
-						$result['added'][] = $uri;
-						break;
-					case 2 :
-						$result['modified'][] = $uri;
-						break;
-					case 3 :
-						$result['deleted'][] = $uri;
-						break;
-				}
-
-			}
-		} else {
-			// No synctoken supplied, this is the initial sync.
-			$query = "SELECT `uri` FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ?";
-			$stmt = $this->db->prepare($query);
-			$stmt->execute([$calendarId]);
-
-			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-		}
-		return $result;
-
-	}
-
-	/**
-	 * Returns a list of subscriptions for a principal.
-	 *
-	 * Every subscription is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    subscription. This can be the same as the uri or a database key.
-	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-	 *  * principaluri. The owner of the subscription. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore, all the subscription info must be returned too:
-	 *
-	 * 1. {DAV:}displayname
-	 * 2. {http://apple.com/ns/ical/}refreshrate
-	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-	 *    should not be stripped).
-	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-	 *    should not be stripped).
-	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-	 *    attachments should not be stripped).
-	 * 6. {http://calendarserver.org/ns/}source (Must be a
-	 *     Sabre\DAV\Property\Href).
-	 * 7. {http://apple.com/ns/ical/}calendar-color
-	 * 8. {http://apple.com/ns/ical/}calendar-order
-	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 *    (should just be an instance of
-	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-	 *    default components).
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getSubscriptionsForUser($principalUri) {
-		$fields = array_values($this->subscriptionPropertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'source';
-		$fields[] = 'principaluri';
-		$fields[] = 'lastmodified';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendarsubscriptions')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->orderBy('calendarorder', 'asc');
-		$stmt =$query->execute();
-
-		$subscriptions = [];
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-			$subscription = [
-				'id'           => $row['id'],
-				'uri'          => $row['uri'],
-				'principaluri' => $row['principaluri'],
-				'source'       => $row['source'],
-				'lastmodified' => $row['lastmodified'],
-
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-			];
-
-			foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-				if (!is_null($row[$dbName])) {
-					$subscription[$xmlName] = $row[$dbName];
-				}
-			}
-
-			$subscriptions[] = $subscription;
-
-		}
-
-		return $subscriptions;
-	}
-
-	/**
-	 * Creates a new subscription for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this subscription in other methods, such as updateSubscription.
-	 *
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @param array $properties
-	 * @return mixed
-	 */
-	function createSubscription($principalUri, $uri, array $properties) {
-
-		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
-			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
-		}
-
-		$values = [
-			'principaluri' => $principalUri,
-			'uri'          => $uri,
-			'source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
-			'lastmodified' => time(),
-		];
-
-		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
-
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (array_key_exists($xmlName, $properties)) {
-					$values[$dbName] = $properties[$xmlName];
-					if (in_array($dbName, $propertiesBoolean)) {
-						$values[$dbName] = true;
-				}
-			}
-		}
-
-		$valuesToInsert = array();
-
-		$query = $this->db->getQueryBuilder();
-
-		foreach (array_keys($values) as $name) {
-			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
-		}
-
-		$query->insert('calendarsubscriptions')
-			->values($valuesToInsert)
-			->execute();
-
-		return $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
-	}
-
-	/**
-	 * 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';
-
-		$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();
-
-			return true;
-
-		});
-	}
-
-	/**
-	 * Deletes a subscription.
-	 *
-	 * @param mixed $subscriptionId
-	 * @return void
-	 */
-	function deleteSubscription($subscriptionId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarsubscriptions')
-			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-			->execute();
-	}
-
-	/**
-	 * Returns a single scheduling object for the inbox collection.
-	 *
-	 * The returned array should contain the following elements:
-	 *   * uri - A unique basename for the object. This will be used to
-	 *           construct a full uri.
-	 *   * calendardata - The iCalendar object
-	 *   * lastmodified - The last modification date. Can be an int for a unix
-	 *                    timestamp, or a PHP DateTime object.
-	 *   * etag - A unique token that must change if the object changed.
-	 *   * size - The size of the object, in bytes.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return array
-	 */
-	function getSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-			->from('schedulingobjects')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->execute();
-
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		return [
-				'uri'          => $row['uri'],
-				'calendardata' => $row['calendardata'],
-				'lastmodified' => $row['lastmodified'],
-				'etag'         => '"' . $row['etag'] . '"',
-				'size'         => (int)$row['size'],
-		];
-	}
-
-	/**
-	 * Returns all scheduling objects for the inbox collection.
-	 *
-	 * These objects should be returned as an array. Every item in the array
-	 * should follow the same structure as returned from getSchedulingObject.
-	 *
-	 * The main difference is that 'calendardata' is optional.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	function getSchedulingObjects($principalUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-				->from('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->execute();
-
-		$result = [];
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-			$result[] = [
-					'calendardata' => $row['calendardata'],
-					'uri'          => $row['uri'],
-					'lastmodified' => $row['lastmodified'],
-					'etag'         => '"' . $row['etag'] . '"',
-					'size'         => (int)$row['size'],
-			];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Deletes a scheduling object from the inbox collection.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return void
-	 */
-	function deleteSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-				->execute();
-	}
-
-	/**
-	 * Creates a new scheduling object. This should land in a users' inbox.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @param string $objectData
-	 * @return void
-	 */
-	function createSchedulingObject($principalUri, $objectUri, $objectData) {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('schedulingobjects')
-			->values([
-				'principaluri' => $query->createNamedParameter($principalUri),
-				'calendardata' => $query->createNamedParameter($objectData),
-				'uri' => $query->createNamedParameter($objectUri),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter(md5($objectData)),
-				'size' => $query->createNamedParameter(strlen($objectData))
-			])
-			->execute();
-	}
-
-	/**
-	 * Adds a change record to the calendarchanges table.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $operation 1 = add, 2 = modify, 3 = delete.
-	 * @return void
-	 */
-	protected function addChange($calendarId, $objectUri, $operation) {
-
-		$stmt = $this->db->prepare('INSERT INTO `*PREFIX*calendarchanges` (`uri`, `synctoken`, `calendarid`, `operation`) SELECT ?, `synctoken`, ?, ? FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([
-			$objectUri,
-			$calendarId,
-			$operation,
-			$calendarId
-		]);
-		$stmt = $this->db->prepare('UPDATE `*PREFIX*calendars` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?');
-		$stmt->execute([
-			$calendarId
-		]);
-
-	}
-
-	/**
-	 * Parses some information from calendar objects, used for optimized
-	 * calendar-queries.
-	 *
-	 * Returns an array with the following keys:
-	 *   * etag - An md5 checksum of the object without the quotes.
-	 *   * size - Size of the object in bytes
-	 *   * componentType - VEVENT, VTODO or VJOURNAL
-	 *   * firstOccurence
-	 *   * lastOccurence
-	 *   * uid - value of the UID property
-	 *
-	 * @param string $calendarData
-	 * @return array
-	 */
-	public function getDenormalizedData($calendarData) {
-
-		$vObject = Reader::read($calendarData);
-		$componentType = null;
-		$component = null;
-		$firstOccurrence = null;
-		$lastOccurrence = null;
-		$uid = null;
-		$classification = self::CLASSIFICATION_PUBLIC;
-		foreach($vObject->getComponents() as $component) {
-			if ($component->name!=='VTIMEZONE') {
-				$componentType = $component->name;
-				$uid = (string)$component->UID;
-				break;
-			}
-		}
-		if (!$componentType) {
-			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-		}
-		if ($componentType === 'VEVENT' && $component->DTSTART) {
-			$firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
-			// Finding the last occurrence is a bit harder
-			if (!isset($component->RRULE)) {
-				if (isset($component->DTEND)) {
-					$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
-				} elseif (isset($component->DURATION)) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-					$lastOccurrence = $endDate->getTimeStamp();
-				} elseif (!$component->DTSTART->hasTime()) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->modify('+1 day');
-					$lastOccurrence = $endDate->getTimeStamp();
-				} else {
-					$lastOccurrence = $firstOccurrence;
-				}
-			} else {
-				$it = new EventIterator($vObject, (string)$component->UID);
-				$maxDate = new \DateTime(self::MAX_DATE);
-				if ($it->isInfinite()) {
-					$lastOccurrence = $maxDate->getTimestamp();
-				} else {
-					$end = $it->getDtEnd();
-					while($it->valid() && $end < $maxDate) {
-						$end = $it->getDtEnd();
-						$it->next();
-
-					}
-					$lastOccurrence = $end->getTimestamp();
-				}
-
-			}
-		}
-
-		if ($component->CLASS) {
-			$classification = CalDavBackend::CLASSIFICATION_PRIVATE;
-			switch ($component->CLASS->getValue()) {
-				case 'PUBLIC':
-					$classification = CalDavBackend::CLASSIFICATION_PUBLIC;
-					break;
-				case 'CONFIDENTIAL':
-					$classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
-					break;
-			}
-		}
-		return [
-			'etag' => md5($calendarData),
-			'size' => strlen($calendarData),
-			'componentType' => $componentType,
-			'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
-			'lastOccurence'  => $lastOccurrence,
-			'uid' => $uid,
-			'classification' => $classification
-		];
-
-	}
-
-	private function readBlob($cardData) {
-		if (is_resource($cardData)) {
-			return stream_get_contents($cardData);
-		}
-
-		return $cardData;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function updateShares($shareable, $add, $remove) {
-		$calendarId = $shareable->getResourceId();
-		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::updateShares',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $this->getCalendarById($calendarId),
-				'shares' => $this->getShares($calendarId),
-				'add' => $add,
-				'remove' => $remove,
-			]));
-		$this->sharingBackend->updateShares($shareable, $add, $remove);
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @return array
-	 */
-	public function getShares($resourceId) {
-		return $this->sharingBackend->getShares($resourceId);
-	}
-
-	/**
-	 * @param boolean $value
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return string|null
-	 */
-	public function setPublishStatus($value, $calendar) {
-		$query = $this->db->getQueryBuilder();
-		if ($value) {
-			$publicUri = $this->random->generate(16, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
-			$query->insert('dav_shares')
-				->values([
-					'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
-					'type' => $query->createNamedParameter('calendar'),
-					'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
-					'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
-					'publicuri' => $query->createNamedParameter($publicUri)
-				]);
-			$query->execute();
-			return $publicUri;
-		}
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
-		$query->execute();
-		return null;
-	}
-
-	/**
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return mixed
-	 */
-	public function getPublishStatus($calendar) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select('publicuri')
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->execute();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		return $row ? reset($row) : false;
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		return $this->sharingBackend->applyShareAcl($resourceId, $acl);
-	}
-
-	private function convertPrincipal($principalUri, $toV2) {
-		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			list(, $name) = URLUtil::splitPath($principalUri);
-			if ($toV2 === true) {
-				return "principals/users/$name";
-			}
-			return "principals/$name";
-		}
-		return $principalUri;
-	}
+    /**
+     * @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) = URLUtil::splitPath($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];
+            }
+
+            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) = URLUtil::splitPath($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];
+        }
+
+        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];
+        }
+
+        return $calendar;
+    }
+
+    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];
+        }
+
+        return $calendar;
+    }
+
+    /**
+     * 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
+     */
+    function createCalendar($principalUri, $calendarUri, array $properties) {
+        $values = [
+            'principaluri' => $this->convertPrincipal($principalUri, true),
+            'uri'          => $calendarUri,
+            'synctoken'    => 1,
+            'transparent'  => 0,
+            'components'   => 'VEVENT,VTODO',
+            'displayname'  => $calendarUri
+        ];
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        if (isset($properties[$sccs])) {
+            if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
+                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+            }
+            $values['components'] = implode(',',$properties[$sccs]->getValue());
+        }
+        $transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+        if (isset($properties[$transp])) {
+            $values['transparent'] = $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 PropPatch $propPatch
+     * @return void
+     */
+    function updateCalendar($calendarId, PropPatch $propPatch) {
+        $supportedProperties = array_keys($this->propertyMap);
+        $supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+
+        $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] = $propertyValue->getValue() === 'transparent';
+                        break;
+                    default :
+                        $fieldName = $this->propertyMap[$propertyName];
+                        $newValues[$fieldName] = $propertyValue;
+                        break;
+                }
+
+            }
+            $query = $this->db->getQueryBuilder();
+            $query->update('calendars');
+            foreach ($newValues as $fieldName => $value) {
+                $query->set($fieldName, $query->createNamedParameter($value));
+            }
+            $query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
+            $query->execute();
+
+            $this->addChange($calendarId, "", 2);
+
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'propertyMutations' => $mutations,
+            ]));
+
+            return true;
+        });
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param mixed $calendarId
+     * @return void
+     */
+    function deleteCalendar($calendarId) {
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'shares' => $this->getShares($calendarId),
+        ]));
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ?');
+        $stmt->execute([$calendarId]);
+
+        $this->sharingBackend->deleteAllShares($calendarId);
+    }
+
+    /**
+     * Delete all of an user's shares
+     *
+     * @param string $principaluri
+     * @return void
+     */
+    function deleteAllSharesByUser($principaluri) {
+        $this->sharingBackend->deleteAllSharesByUser($principaluri);
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can
+     *     be any arbitrary string, but making sure it ends with '.ics' is a
+     *     good idea. This is only the basename, or filename, not the full
+     *     path.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '"abcdef"')
+     *   * size - The size of the calendar objects, in bytes.
+     *   * component - optional, a string containing the type of object, such
+     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+     *     the Content-Type header.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param mixed $calendarId
+     * @return array
+     */
+    function getCalendarObjects($calendarId) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
+        $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 $calendarId
+     * @param string $objectUri
+     * @return array|null
+     */
+    function getCalendarObject($calendarId, $objectUri) {
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
+                ->from('calendarobjects')
+                ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) return null;
+
+        return [
+                'id'            => $row['id'],
+                'uri'           => $row['uri'],
+                'lastmodified'  => $row['lastmodified'],
+                'etag'          => '"' . $row['etag'] . '"',
+                'calendarid'    => $row['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
+     * @return array
+     */
+    function getMultipleCalendarObjects($calendarId, array $uris) {
+        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($calendarId)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
+
+        foreach ($chunks as $uris) {
+            $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->execute();
+
+            while ($row = $result->fetch()) {
+                $objects[] = [
+                    'id'           => $row['id'],
+                    'uri'          => $row['uri'],
+                    'lastmodified' => $row['lastmodified'],
+                    'etag'         => '"' . $row['etag'] . '"',
+                    'calendarid'   => $row['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
+     * @return string
+     */
+    function createCalendarObject($calendarId, $objectUri, $calendarData) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'calendarid' => $query->createNamedParameter($calendarId),
+                'uri' => $query->createNamedParameter($objectUri),
+                'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter($extraData['etag']),
+                'size' => $query->createNamedParameter($extraData['size']),
+                'componenttype' => $query->createNamedParameter($extraData['componentType']),
+                'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
+                'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
+                'classification' => $query->createNamedParameter($extraData['classification']),
+                'uid' => $query->createNamedParameter($extraData['uid']),
+            ])
+            ->execute();
+
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'shares' => $this->getShares($calendarId),
+                'objectData' => $this->getCalendarObject($calendarId, $objectUri),
+            ]
+        ));
+        $this->addChange($calendarId, $objectUri, 1);
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return string
+     */
+    function updateCalendarObject($calendarId, $objectUri, $calendarData) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+                ->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
+                ->set('lastmodified', $query->createNamedParameter(time()))
+                ->set('etag', $query->createNamedParameter($extraData['etag']))
+                ->set('size', $query->createNamedParameter($extraData['size']))
+                ->set('componenttype', $query->createNamedParameter($extraData['componentType']))
+                ->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
+                ->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
+                ->set('classification', $query->createNamedParameter($extraData['classification']))
+                ->set('uid', $query->createNamedParameter($extraData['uid']))
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->execute();
+
+        $data = $this->getCalendarObject($calendarId, $objectUri);
+        if (is_array($data)) {
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'objectData' => $data,
+                ]
+            ));
+        }
+        $this->addChange($calendarId, $objectUri, 2);
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * @param int $calendarObjectId
+     * @param int $classification
+     */
+    public function setClassification($calendarObjectId, $classification) {
+        if (!in_array($classification, [
+            self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
+        ])) {
+            throw new \InvalidArgumentException();
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+            ->set('classification', $query->createNamedParameter($classification))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
+            ->execute();
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    function deleteCalendarObject($calendarId, $objectUri) {
+        $data = $this->getCalendarObject($calendarId, $objectUri);
+        if (is_array($data)) {
+            $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $this->getCalendarById($calendarId),
+                    'shares' => $this->getShares($calendarId),
+                    'objectData' => $data,
+                ]
+            ));
+        }
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ?');
+        $stmt->execute([$calendarId, $objectUri]);
+
+        $this->addChange($calendarId, $objectUri, 3);
+    }
+
+    /**
+     * Performs a calendar-query on the contents of this calendar.
+     *
+     * The calendar-query is defined in RFC4791 : CalDAV. Using the
+     * calendar-query it is possible for a client to request a specific set of
+     * object, based on contents of iCalendar properties, date-ranges and
+     * iCalendar component types (VTODO, VEVENT).
+     *
+     * This method should just return a list of (relative) urls that match this
+     * query.
+     *
+     * The list of filters are specified as an array. The exact array is
+     * documented by Sabre\CalDAV\CalendarQueryParser.
+     *
+     * Note that it is extremely likely that getCalendarObject for every path
+     * returned from this method will be called almost immediately after. You
+     * may want to anticipate this to speed up these requests.
+     *
+     * This method provides a default implementation, which parses *all* the
+     * iCalendar objects in the specified calendar.
+     *
+     * This default may well be good enough for personal use, and calendars
+     * that aren't very large. But if you anticipate high usage, big calendars
+     * or high loads, you are strongly advised to optimize certain paths.
+     *
+     * The best way to do so is override this method and to optimize
+     * specifically for 'common filters'.
+     *
+     * Requests that are extremely common are:
+     *   * requests for just VEVENTS
+     *   * requests for just VTODO
+     *   * requests with a time-range-filter on either VEVENT or VTODO.
+     *
+     * ..and combinations of these requests. It may not be worth it to try to
+     * handle every possible situation and just rely on the (relatively
+     * easy to use) CalendarQueryValidator to handle the rest.
+     *
+     * Note that especially time-range-filters may be difficult to parse. A
+     * time-range filter specified on a VEVENT must for instance also handle
+     * recurrence rules correctly.
+     * A good example of how to interprete all these filters can also simply
+     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * as possible, so it gives you a good idea on what type of stuff you need
+     * to think of.
+     *
+     * @param mixed $calendarId
+     * @param array $filters
+     * @return array
+     */
+    function calendarQuery($calendarId, array $filters) {
+        $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($calendarId)));
+
+        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) {
+                if (!$this->validateFilterForObject($row, $filters)) {
+                    continue;
+                }
+            }
+            $result[] = $row['uri'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Searches through all of a users calendars and calendar objects to find
+     * an object with a specific UID.
+     *
+     * This method should return the path to this object, relative to the
+     * calendar home, so this path usually only contains two parts:
+     *
+     * calendarpath/objectpath.ics
+     *
+     * If the uid is not found, return null.
+     *
+     * This method should only consider * objects that the principal owns, so
+     * any calendars owned by other principals that also appear in this
+     * collection should be ignored.
+     *
+     * @param string $principalUri
+     * @param string $uid
+     * @return string|null
+     */
+    function getCalendarObjectByUID($principalUri, $uid) {
+
+        $query = $this->db->getQueryBuilder();
+        $query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
+            ->from('calendarobjects', 'co')
+            ->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
+            ->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
+
+        $stmt = $query->execute();
+
+        if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            return $row['calendaruri'] . '/' . $row['objecturi'];
+        }
+
+        return null;
+    }
+
+    /**
+     * The getChanges method returns all the changes that have happened, since
+     * the specified syncToken in the specified calendar.
+     *
+     * This function should return an array, such as the following:
+     *
+     * [
+     *   'syncToken' => 'The current synctoken',
+     *   'added'   => [
+     *      'new.txt',
+     *   ],
+     *   'modified'   => [
+     *      'modified.txt',
+     *   ],
+     *   'deleted' => [
+     *      'foo.php.bak',
+     *      'old.txt'
+     *   ]
+     * );
+     *
+     * The returned syncToken property should reflect the *current* syncToken
+     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+     * property This is * needed here too, to ensure the operation is atomic.
+     *
+     * If the $syncToken argument is specified as null, this is an initial
+     * sync, and all members should be reported.
+     *
+     * The modified property is an array of nodenames that have changed since
+     * the last token.
+     *
+     * The deleted property is an array with nodenames, that have been deleted
+     * from collection.
+     *
+     * The $syncLevel argument is basically the 'depth' of the report. If it's
+     * 1, you only have to report changes that happened only directly in
+     * immediate descendants. If it's 2, it should also include changes from
+     * the nodes below the child collections. (grandchildren)
+     *
+     * The $limit argument allows a client to specify how many results should
+     * be returned at most. If the limit is not specified, it should be treated
+     * as infinite.
+     *
+     * If the limit (infinite or not) is higher than you're willing to return,
+     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+     *
+     * If the syncToken is expired (due to data cleanup) or unknown, you must
+     * return null.
+     *
+     * The limit is 'suggestive'. You are free to ignore it.
+     *
+     * @param string $calendarId
+     * @param string $syncToken
+     * @param int $syncLevel
+     * @param int $limit
+     * @return array
+     */
+    function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
+        // Current synctoken
+        $stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([ $calendarId ]);
+        $currentToken = $stmt->fetchColumn(0);
+
+        if (is_null($currentToken)) {
+            return null;
+        }
+
+        $result = [
+            'syncToken' => $currentToken,
+            'added'     => [],
+            'modified'  => [],
+            'deleted'   => [],
+        ];
+
+        if ($syncToken) {
+
+            $query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? ORDER BY `synctoken`";
+            if ($limit>0) {
+                $query.= " `LIMIT` " . (int)$limit;
+            }
+
+            // Fetching all changes
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$syncToken, $currentToken, $calendarId]);
+
+            $changes = [];
+
+            // This loop ensures that any duplicates are overwritten, only the
+            // last change on a node is relevant.
+            while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+                $changes[$row['uri']] = $row['operation'];
+
+            }
+
+            foreach($changes as $uri => $operation) {
+
+                switch($operation) {
+                    case 1 :
+                        $result['added'][] = $uri;
+                        break;
+                    case 2 :
+                        $result['modified'][] = $uri;
+                        break;
+                    case 3 :
+                        $result['deleted'][] = $uri;
+                        break;
+                }
+
+            }
+        } else {
+            // No synctoken supplied, this is the initial sync.
+            $query = "SELECT `uri` FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ?";
+            $stmt = $this->db->prepare($query);
+            $stmt->execute([$calendarId]);
+
+            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        }
+        return $result;
+
+    }
+
+    /**
+     * Returns a list of subscriptions for a principal.
+     *
+     * Every subscription is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    subscription. This can be the same as the uri or a database key.
+     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+     *  * principaluri. The owner of the subscription. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore, all the subscription info must be returned too:
+     *
+     * 1. {DAV:}displayname
+     * 2. {http://apple.com/ns/ical/}refreshrate
+     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+     *    should not be stripped).
+     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+     *    should not be stripped).
+     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+     *    attachments should not be stripped).
+     * 6. {http://calendarserver.org/ns/}source (Must be a
+     *     Sabre\DAV\Property\Href).
+     * 7. {http://apple.com/ns/ical/}calendar-color
+     * 8. {http://apple.com/ns/ical/}calendar-order
+     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     *    (should just be an instance of
+     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+     *    default components).
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getSubscriptionsForUser($principalUri) {
+        $fields = array_values($this->subscriptionPropertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'source';
+        $fields[] = 'principaluri';
+        $fields[] = 'lastmodified';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendarsubscriptions')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->orderBy('calendarorder', 'asc');
+        $stmt =$query->execute();
+
+        $subscriptions = [];
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $subscription = [
+                'id'           => $row['id'],
+                'uri'          => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                'source'       => $row['source'],
+                'lastmodified' => $row['lastmodified'],
+
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+            ];
+
+            foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+                if (!is_null($row[$dbName])) {
+                    $subscription[$xmlName] = $row[$dbName];
+                }
+            }
+
+            $subscriptions[] = $subscription;
+
+        }
+
+        return $subscriptions;
+    }
+
+    /**
+     * Creates a new subscription for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this subscription in other methods, such as updateSubscription.
+     *
+     * @param string $principalUri
+     * @param string $uri
+     * @param array $properties
+     * @return mixed
+     */
+    function createSubscription($principalUri, $uri, array $properties) {
+
+        if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
+            throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
+        }
+
+        $values = [
+            'principaluri' => $principalUri,
+            'uri'          => $uri,
+            'source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
+            'lastmodified' => time(),
+        ];
+
+        $propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
+
+        foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+            if (array_key_exists($xmlName, $properties)) {
+                    $values[$dbName] = $properties[$xmlName];
+                    if (in_array($dbName, $propertiesBoolean)) {
+                        $values[$dbName] = true;
+                }
+            }
+        }
+
+        $valuesToInsert = array();
+
+        $query = $this->db->getQueryBuilder();
+
+        foreach (array_keys($values) as $name) {
+            $valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
+        }
+
+        $query->insert('calendarsubscriptions')
+            ->values($valuesToInsert)
+            ->execute();
+
+        return $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
+    }
+
+    /**
+     * 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';
+
+        $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();
+
+            return true;
+
+        });
+    }
+
+    /**
+     * Deletes a subscription.
+     *
+     * @param mixed $subscriptionId
+     * @return void
+     */
+    function deleteSubscription($subscriptionId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarsubscriptions')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+            ->execute();
+    }
+
+    /**
+     * Returns a single scheduling object for the inbox collection.
+     *
+     * The returned array should contain the following elements:
+     *   * uri - A unique basename for the object. This will be used to
+     *           construct a full uri.
+     *   * calendardata - The iCalendar object
+     *   * lastmodified - The last modification date. Can be an int for a unix
+     *                    timestamp, or a PHP DateTime object.
+     *   * etag - A unique token that must change if the object changed.
+     *   * size - The size of the object, in bytes.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return array
+     */
+    function getSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+            ->from('schedulingobjects')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->execute();
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        return [
+                'uri'          => $row['uri'],
+                'calendardata' => $row['calendardata'],
+                'lastmodified' => $row['lastmodified'],
+                'etag'         => '"' . $row['etag'] . '"',
+                'size'         => (int)$row['size'],
+        ];
+    }
+
+    /**
+     * Returns all scheduling objects for the inbox collection.
+     *
+     * These objects should be returned as an array. Every item in the array
+     * should follow the same structure as returned from getSchedulingObject.
+     *
+     * The main difference is that 'calendardata' is optional.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getSchedulingObjects($principalUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+                ->from('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->execute();
+
+        $result = [];
+        foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $result[] = [
+                    'calendardata' => $row['calendardata'],
+                    'uri'          => $row['uri'],
+                    'lastmodified' => $row['lastmodified'],
+                    'etag'         => '"' . $row['etag'] . '"',
+                    'size'         => (int)$row['size'],
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes a scheduling object from the inbox collection.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return void
+     */
+    function deleteSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+                ->execute();
+    }
+
+    /**
+     * Creates a new scheduling object. This should land in a users' inbox.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @param string $objectData
+     * @return void
+     */
+    function createSchedulingObject($principalUri, $objectUri, $objectData) {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('schedulingobjects')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principalUri),
+                'calendardata' => $query->createNamedParameter($objectData),
+                'uri' => $query->createNamedParameter($objectUri),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter(md5($objectData)),
+                'size' => $query->createNamedParameter(strlen($objectData))
+            ])
+            ->execute();
+    }
+
+    /**
+     * Adds a change record to the calendarchanges table.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $operation 1 = add, 2 = modify, 3 = delete.
+     * @return void
+     */
+    protected function addChange($calendarId, $objectUri, $operation) {
+
+        $stmt = $this->db->prepare('INSERT INTO `*PREFIX*calendarchanges` (`uri`, `synctoken`, `calendarid`, `operation`) SELECT ?, `synctoken`, ?, ? FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([
+            $objectUri,
+            $calendarId,
+            $operation,
+            $calendarId
+        ]);
+        $stmt = $this->db->prepare('UPDATE `*PREFIX*calendars` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?');
+        $stmt->execute([
+            $calendarId
+        ]);
+
+    }
+
+    /**
+     * Parses some information from calendar objects, used for optimized
+     * calendar-queries.
+     *
+     * Returns an array with the following keys:
+     *   * etag - An md5 checksum of the object without the quotes.
+     *   * size - Size of the object in bytes
+     *   * componentType - VEVENT, VTODO or VJOURNAL
+     *   * firstOccurence
+     *   * lastOccurence
+     *   * uid - value of the UID property
+     *
+     * @param string $calendarData
+     * @return array
+     */
+    public function getDenormalizedData($calendarData) {
+
+        $vObject = Reader::read($calendarData);
+        $componentType = null;
+        $component = null;
+        $firstOccurrence = null;
+        $lastOccurrence = null;
+        $uid = null;
+        $classification = self::CLASSIFICATION_PUBLIC;
+        foreach($vObject->getComponents() as $component) {
+            if ($component->name!=='VTIMEZONE') {
+                $componentType = $component->name;
+                $uid = (string)$component->UID;
+                break;
+            }
+        }
+        if (!$componentType) {
+            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+        }
+        if ($componentType === 'VEVENT' && $component->DTSTART) {
+            $firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
+            // Finding the last occurrence is a bit harder
+            if (!isset($component->RRULE)) {
+                if (isset($component->DTEND)) {
+                    $lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
+                } elseif (isset($component->DURATION)) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } elseif (!$component->DTSTART->hasTime()) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->modify('+1 day');
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } else {
+                    $lastOccurrence = $firstOccurrence;
+                }
+            } else {
+                $it = new EventIterator($vObject, (string)$component->UID);
+                $maxDate = new \DateTime(self::MAX_DATE);
+                if ($it->isInfinite()) {
+                    $lastOccurrence = $maxDate->getTimestamp();
+                } else {
+                    $end = $it->getDtEnd();
+                    while($it->valid() && $end < $maxDate) {
+                        $end = $it->getDtEnd();
+                        $it->next();
+
+                    }
+                    $lastOccurrence = $end->getTimestamp();
+                }
+
+            }
+        }
+
+        if ($component->CLASS) {
+            $classification = CalDavBackend::CLASSIFICATION_PRIVATE;
+            switch ($component->CLASS->getValue()) {
+                case 'PUBLIC':
+                    $classification = CalDavBackend::CLASSIFICATION_PUBLIC;
+                    break;
+                case 'CONFIDENTIAL':
+                    $classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
+                    break;
+            }
+        }
+        return [
+            'etag' => md5($calendarData),
+            'size' => strlen($calendarData),
+            'componentType' => $componentType,
+            'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
+            'lastOccurence'  => $lastOccurrence,
+            'uid' => $uid,
+            'classification' => $classification
+        ];
+
+    }
+
+    private function readBlob($cardData) {
+        if (is_resource($cardData)) {
+            return stream_get_contents($cardData);
+        }
+
+        return $cardData;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param array $add
+     * @param array $remove
+     */
+    public function updateShares($shareable, $add, $remove) {
+        $calendarId = $shareable->getResourceId();
+        $this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::updateShares',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $this->getCalendarById($calendarId),
+                'shares' => $this->getShares($calendarId),
+                'add' => $add,
+                'remove' => $remove,
+            ]));
+        $this->sharingBackend->updateShares($shareable, $add, $remove);
+    }
+
+    /**
+     * @param int $resourceId
+     * @return array
+     */
+    public function getShares($resourceId) {
+        return $this->sharingBackend->getShares($resourceId);
+    }
+
+    /**
+     * @param boolean $value
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return string|null
+     */
+    public function setPublishStatus($value, $calendar) {
+        $query = $this->db->getQueryBuilder();
+        if ($value) {
+            $publicUri = $this->random->generate(16, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
+            $query->insert('dav_shares')
+                ->values([
+                    'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
+                    'type' => $query->createNamedParameter('calendar'),
+                    'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
+                    'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
+                    'publicuri' => $query->createNamedParameter($publicUri)
+                ]);
+            $query->execute();
+            return $publicUri;
+        }
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
+        $query->execute();
+        return null;
+    }
+
+    /**
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return mixed
+     */
+    public function getPublishStatus($calendar) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select('publicuri')
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->execute();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        return $row ? reset($row) : false;
+    }
+
+    /**
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        return $this->sharingBackend->applyShareAcl($resourceId, $acl);
+    }
+
+    private function convertPrincipal($principalUri, $toV2) {
+        if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+            list(, $name) = URLUtil::splitPath($principalUri);
+            if ($toV2 === true) {
+                return "principals/users/$name";
+            }
+            return "principals/$name";
+        }
+        return $principalUri;
+    }
 }

apps/dav/lib/CalDAV/Plugin.php

Indentation +10 added lines, -10 removed lines

@@ -25,17 +25,17 @@
 
 class Plugin extends \Sabre\CalDAV\Plugin {
 
-	/**
-	 * @inheritdoc
-	 */
-	function getCalendarHomeForPrincipal($principalUrl) {
+    /**
+     * @inheritdoc
+     */
+    function getCalendarHomeForPrincipal($principalUrl) {
 
-		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principalUrl);
-			return self::CALENDAR_ROOT .'/' . $principalId;
-		}
+        if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+            list(, $principalId) = URLUtil::splitPath($principalUrl);
+            return self::CALENDAR_ROOT .'/' . $principalId;
+        }
 
-		return;
-	}
+        return;
+    }
 
 }

apps/dav/lib/CalDAV/CalendarObject.php

Indentation +57 added lines, -57 removed lines

@@ -32,68 +32,68 @@
 
 class CalendarObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * @inheritdoc
-	 */
-	function get() {
-		$data = parent::get();
-		if ($this->isShared() && $this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
-			return $this->createConfidentialObject($data);
-		}
-		return $data;
-	}
+    /**
+     * @inheritdoc
+     */
+    function get() {
+        $data = parent::get();
+        if ($this->isShared() && $this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
+            return $this->createConfidentialObject($data);
+        }
+        return $data;
+    }
 
-	private function isShared() {
-		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
+    private 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'];
-	}
+        return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
+    }
 
-	/**
-	 * @param string $calData
-	 * @return string
-	 */
-	private static function createConfidentialObject($calData) {
+    /**
+     * @param string $calData
+     * @return string
+     */
+    private static function createConfidentialObject($calData) {
 
-		$vObject = Reader::read($calData);
+        $vObject = Reader::read($calData);
 
-		/** @var Component $vElement */
-		$vElement = null;
-		if(isset($vObject->VEVENT)) {
-			$vElement = $vObject->VEVENT;
-		}
-		if(isset($vObject->VJOURNAL)) {
-			$vElement = $vObject->VJOURNAL;
-		}
-		if(isset($vObject->VTODO)) {
-			$vElement = $vObject->VTODO;
-		}
-		if(!is_null($vElement)) {
-			foreach ($vElement->children() as &$property) {
-				/** @var Property $property */
-				switch($property->name) {
-					case 'CREATED':
-					case 'DTSTART':
-					case 'RRULE':
-					case 'DURATION':
-					case 'DTEND':
-					case 'CLASS':
-					case 'UID':
-						break;
-					case 'SUMMARY':
-						$property->setValue('Busy');
-						break;
-					default:
-						$vElement->__unset($property->name);
-						unset($property);
-						break;
-				}
-			}
-		}
+        /** @var Component $vElement */
+        $vElement = null;
+        if(isset($vObject->VEVENT)) {
+            $vElement = $vObject->VEVENT;
+        }
+        if(isset($vObject->VJOURNAL)) {
+            $vElement = $vObject->VJOURNAL;
+        }
+        if(isset($vObject->VTODO)) {
+            $vElement = $vObject->VTODO;
+        }
+        if(!is_null($vElement)) {
+            foreach ($vElement->children() as &$property) {
+                /** @var Property $property */
+                switch($property->name) {
+                    case 'CREATED':
+                    case 'DTSTART':
+                    case 'RRULE':
+                    case 'DURATION':
+                    case 'DTEND':
+                    case 'CLASS':
+                    case 'UID':
+                        break;
+                    case 'SUMMARY':
+                        $property->setValue('Busy');
+                        break;
+                    default:
+                        $vElement->__unset($property->name);
+                        unset($property);
+                        break;
+                }
+            }
+        }
 		
-		return $vObject->serialize();
-	}
+        return $vObject->serialize();
+    }
 
 }

apps/dav/lib/CalDAV/BirthdayService.php

Indentation +232 added lines, -232 removed lines

@@ -39,256 +39,256 @@
 
 class BirthdayService {
 
-	const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
+    const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
 
-	/** @var GroupPrincipalBackend */
-	private $principalBackend;
+    /** @var GroupPrincipalBackend */
+    private $principalBackend;
 
-	/** @var CalDavBackend  */
-	private $calDavBackEnd;
+    /** @var CalDavBackend  */
+    private $calDavBackEnd;
 
-	/** @var CardDavBackend  */
-	private $cardDavBackEnd;
+    /** @var CardDavBackend  */
+    private $cardDavBackEnd;
 
-	/**
-	 * BirthdayService constructor.
-	 *
-	 * @param CalDavBackend $calDavBackEnd
-	 * @param CardDavBackend $cardDavBackEnd
-	 * @param GroupPrincipalBackend $principalBackend
-	 */
-	public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend) {
-		$this->calDavBackEnd = $calDavBackEnd;
-		$this->cardDavBackEnd = $cardDavBackEnd;
-		$this->principalBackend = $principalBackend;
-	}
+    /**
+     * BirthdayService constructor.
+     *
+     * @param CalDavBackend $calDavBackEnd
+     * @param CardDavBackend $cardDavBackEnd
+     * @param GroupPrincipalBackend $principalBackend
+     */
+    public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend) {
+        $this->calDavBackEnd = $calDavBackEnd;
+        $this->cardDavBackEnd = $cardDavBackEnd;
+        $this->principalBackend = $principalBackend;
+    }
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 */
-	public function onCardChanged($addressBookId, $cardUri, $cardData) {
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     */
+    public function onCardChanged($addressBookId, $cardUri, $cardData) {
+        $targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
 		
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		$datesToSync = [
-			['postfix' => '', 'field' => 'BDAY', 'symbol' => '*'],
-			['postfix' => '-death', 'field' => 'DEATHDATE', 'symbol' => "†"],
-			['postfix' => '-anniversary', 'field' => 'ANNIVERSARY', 'symbol' => "⚭"],
-		];
-		foreach ($targetPrincipals as $principalUri) {
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach ($datesToSync as $type) {
-				$this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
-			}
-		}
-	}
+        $book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
+        $targetPrincipals[] = $book['principaluri'];
+        $datesToSync = [
+            ['postfix' => '', 'field' => 'BDAY', 'symbol' => '*'],
+            ['postfix' => '-death', 'field' => 'DEATHDATE', 'symbol' => "†"],
+            ['postfix' => '-anniversary', 'field' => 'ANNIVERSARY', 'symbol' => "⚭"],
+        ];
+        foreach ($targetPrincipals as $principalUri) {
+            $calendar = $this->ensureCalendarExists($principalUri);
+            foreach ($datesToSync as $type) {
+                $this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
+            }
+        }
+    }
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function onCardDeleted($addressBookId, $cardUri) {
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		foreach ($targetPrincipals as $principalUri) {
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
-				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
-			}
-		}
-	}
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function onCardDeleted($addressBookId, $cardUri) {
+        $targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
+        $book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
+        $targetPrincipals[] = $book['principaluri'];
+        foreach ($targetPrincipals as $principalUri) {
+            $calendar = $this->ensureCalendarExists($principalUri);
+            foreach (['', '-death', '-anniversary'] as $tag) {
+                $objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+                $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
+            }
+        }
+    }
 
-	/**
-	 * @param string $principal
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureCalendarExists($principal) {
-		$book = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
-			'{DAV:}displayname' => 'Contact birthdays',
-			'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
-			'components'   => 'VEVENT',
-		]);
+    /**
+     * @param string $principal
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureCalendarExists($principal) {
+        $book = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
+            '{DAV:}displayname' => 'Contact birthdays',
+            '{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+            'components'   => 'VEVENT',
+        ]);
 
-		return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-	}
+        return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
+    }
 
-	/**
-	 * @param string $cardData
-	 * @param string $dateField
-	 * @param string $summarySymbol
-	 * @return null|VCalendar
-	 */
-	public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
-		if (empty($cardData)) {
-			return null;
-		}
-		try {
-			$doc = Reader::read($cardData);
-			// We're always converting to vCard 4.0 so we can rely on the
-			// VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
-			if (!$doc instanceof VCard) {
-				return null;
-			}
-			$doc = $doc->convert(Document::VCARD40);
-		} catch (Exception $e) {
-			return null;
-		}
+    /**
+     * @param string $cardData
+     * @param string $dateField
+     * @param string $summarySymbol
+     * @return null|VCalendar
+     */
+    public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
+        if (empty($cardData)) {
+            return null;
+        }
+        try {
+            $doc = Reader::read($cardData);
+            // We're always converting to vCard 4.0 so we can rely on the
+            // VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
+            if (!$doc instanceof VCard) {
+                return null;
+            }
+            $doc = $doc->convert(Document::VCARD40);
+        } catch (Exception $e) {
+            return null;
+        }
 
-		if (!isset($doc->{$dateField})) {
-			return null;
-		}
-		if (!isset($doc->FN)) {
-			return null;
-		}
-		$birthday = $doc->{$dateField};
-		if (!(string)$birthday) {
-			return null;
-		}
-		// Skip if the BDAY property is not of the right type.
-		if (!$birthday instanceof DateAndOrTime) {
-			return null;
-		}
+        if (!isset($doc->{$dateField})) {
+            return null;
+        }
+        if (!isset($doc->FN)) {
+            return null;
+        }
+        $birthday = $doc->{$dateField};
+        if (!(string)$birthday) {
+            return null;
+        }
+        // Skip if the BDAY property is not of the right type.
+        if (!$birthday instanceof DateAndOrTime) {
+            return null;
+        }
 
-		// Skip if we can't parse the BDAY value.
-		try {
-			$dateParts = DateTimeParser::parseVCardDateTime($birthday->getValue());
-		} catch (InvalidDataException $e) {
-			return null;
-		}
+        // Skip if we can't parse the BDAY value.
+        try {
+            $dateParts = DateTimeParser::parseVCardDateTime($birthday->getValue());
+        } catch (InvalidDataException $e) {
+            return null;
+        }
 
-		$unknownYear = false;
-		if (!$dateParts['year']) {
-			$birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
+        $unknownYear = false;
+        if (!$dateParts['year']) {
+            $birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
 
-			$unknownYear = true;
-		}
+            $unknownYear = true;
+        }
 
-		try {
-			$date = new \DateTime($birthday);
-		} catch (Exception $e) {
-			return null;
-		}
-		if ($unknownYear) {
-			$summary = $doc->FN->getValue() . ' ' . $summarySymbol;
-		} else {
-			$year = (int)$date->format('Y');
-			$summary = $doc->FN->getValue() . " ($summarySymbol$year)";
-		}
-		$vCal = new VCalendar();
-		$vCal->VERSION = '2.0';
-		$vEvent = $vCal->createComponent('VEVENT');
-		$vEvent->add('DTSTART');
-		$vEvent->DTSTART->setDateTime(
-			$date
-		);
-		$vEvent->DTSTART['VALUE'] = 'DATE';
-		$vEvent->add('DTEND');
-		$date->add(new \DateInterval('P1D'));
-		$vEvent->DTEND->setDateTime(
-			$date
-		);
-		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID;
-		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
-		$vEvent->{'SUMMARY'} = $summary;
-		$vEvent->{'TRANSP'} = 'TRANSPARENT';
-		$alarm = $vCal->createComponent('VALARM');
-		$alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
-		$alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));
-		$alarm->add($vCal->createProperty('DESCRIPTION', $vEvent->{'SUMMARY'}));
-		$vEvent->add($alarm);
-		$vCal->add($vEvent);
-		return $vCal;
-	}
+        try {
+            $date = new \DateTime($birthday);
+        } catch (Exception $e) {
+            return null;
+        }
+        if ($unknownYear) {
+            $summary = $doc->FN->getValue() . ' ' . $summarySymbol;
+        } else {
+            $year = (int)$date->format('Y');
+            $summary = $doc->FN->getValue() . " ($summarySymbol$year)";
+        }
+        $vCal = new VCalendar();
+        $vCal->VERSION = '2.0';
+        $vEvent = $vCal->createComponent('VEVENT');
+        $vEvent->add('DTSTART');
+        $vEvent->DTSTART->setDateTime(
+            $date
+        );
+        $vEvent->DTSTART['VALUE'] = 'DATE';
+        $vEvent->add('DTEND');
+        $date->add(new \DateInterval('P1D'));
+        $vEvent->DTEND->setDateTime(
+            $date
+        );
+        $vEvent->DTEND['VALUE'] = 'DATE';
+        $vEvent->{'UID'} = $doc->UID;
+        $vEvent->{'RRULE'} = 'FREQ=YEARLY';
+        $vEvent->{'SUMMARY'} = $summary;
+        $vEvent->{'TRANSP'} = 'TRANSPARENT';
+        $alarm = $vCal->createComponent('VALARM');
+        $alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
+        $alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));
+        $alarm->add($vCal->createProperty('DESCRIPTION', $vEvent->{'SUMMARY'}));
+        $vEvent->add($alarm);
+        $vCal->add($vEvent);
+        return $vCal;
+    }
 
-	/**
-	 * @param string $user
-	 */
-	public function syncUser($user) {
-		$principal = 'principals/users/'.$user;
-		$this->ensureCalendarExists($principal);
-		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
-		foreach($books as $book) {
-			$cards = $this->cardDavBackEnd->getCards($book['id']);
-			foreach($cards as $card) {
-				$this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
-			}
-		}
-	}
+    /**
+     * @param string $user
+     */
+    public function syncUser($user) {
+        $principal = 'principals/users/'.$user;
+        $this->ensureCalendarExists($principal);
+        $books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
+        foreach($books as $book) {
+            $cards = $this->cardDavBackEnd->getCards($book['id']);
+            foreach($cards as $card) {
+                $this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
+            }
+        }
+    }
 
-	/**
-	 * @param string $existingCalendarData
-	 * @param VCalendar $newCalendarData
-	 * @return bool
-	 */
-	public function birthdayEvenChanged($existingCalendarData, $newCalendarData) {
-		try {
-			$existingBirthday = Reader::read($existingCalendarData);
-		} catch (Exception $ex) {
-			return true;
-		}
-		if ($newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
-		) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $existingCalendarData
+     * @param VCalendar $newCalendarData
+     * @return bool
+     */
+    public function birthdayEvenChanged($existingCalendarData, $newCalendarData) {
+        try {
+            $existingBirthday = Reader::read($existingCalendarData);
+        } catch (Exception $ex) {
+            return true;
+        }
+        if ($newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
+            $newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+        ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param integer $addressBookId
-	 * @return mixed
-	 */
-	protected function getAllAffectedPrincipals($addressBookId) {
-		$targetPrincipals = [];
-		$shares = $this->cardDavBackEnd->getShares($addressBookId);
-		foreach ($shares as $share) {
-			if ($share['{http://owncloud.org/ns}group-share']) {
-				$users = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
-				foreach ($users as $user) {
-					$targetPrincipals[] = $user['uri'];
-				}
-			} else {
-				$targetPrincipals[] = $share['{http://owncloud.org/ns}principal'];
-			}
-		}
-		return array_values(array_unique($targetPrincipals, SORT_STRING));
-	}
+    /**
+     * @param integer $addressBookId
+     * @return mixed
+     */
+    protected function getAllAffectedPrincipals($addressBookId) {
+        $targetPrincipals = [];
+        $shares = $this->cardDavBackEnd->getShares($addressBookId);
+        foreach ($shares as $share) {
+            if ($share['{http://owncloud.org/ns}group-share']) {
+                $users = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
+                foreach ($users as $user) {
+                    $targetPrincipals[] = $user['uri'];
+                }
+            } else {
+                $targetPrincipals[] = $share['{http://owncloud.org/ns}principal'];
+            }
+        }
+        return array_values(array_unique($targetPrincipals, SORT_STRING));
+    }
 
-	/**
-	 * @param string $cardUri
-	 * @param string  $cardData
-	 * @param array $book
-	 * @param int $calendarId
-	 * @param string $type
-	 */
-	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
-		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
-		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
-		if (is_null($calendarData)) {
-			if (!is_null($existing)) {
-				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
-			}
-		} else {
-			if (is_null($existing)) {
-				$this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-			} else {
-				if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
-					$this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-				}
-			}
-		}
-	}
+    /**
+     * @param string $cardUri
+     * @param string  $cardData
+     * @param array $book
+     * @param int $calendarId
+     * @param string $type
+     */
+    private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
+        $objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
+        $calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
+        $existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
+        if (is_null($calendarData)) {
+            if (!is_null($existing)) {
+                $this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
+            }
+        } else {
+            if (is_null($existing)) {
+                $this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+            } else {
+                if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
+                    $this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+                }
+            }
+        }
+    }
 
 }