Merge branch 'master' of https://github.com/owncloud/core into downstream-160611

1 files changed, 77 insertions, 0 deletions

diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php
index 73b3957a9b0..785bb5699e2 100644
--- a/apps/dav/lib/CalDAV/Calendar.php
+++ b/apps/dav/lib/CalDAV/Calendar.php
@@ -26,6 +26,7 @@ use OCA\DAV\DAV\Sharing\IShareable;
 use OCP\IL10N;
 use Sabre\CalDAV\Backend\BackendInterface;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\PropPatch;
 
 class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
@@ -162,6 +163,78 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 		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;
+	}
+
 	private function canWrite() {
 		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
 			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
@@ -169,4 +242,8 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 		return true;
 	}
 
+	private function isShared() {
+		return isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']);
+	}
+
 }