DAV: AppCalendar fix creating events by also query filename

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>

Author: susnux

apps/dav/lib/CalDAV/AppCalendar/AppCalendar.php

@@ -141,8 +141,13 @@ public function childExists($name): bool {
 	}
 
 	public function getChild($name) {
-		$pos = strrpos($name, '.ics');
-		$children = $this->calendar->search(substr($name, 0, $pos === false ? null : $pos), ['UID'], [], 1);
+		// Try to get calendar by filename
+		$children = $this->calendar->search($name, ['X-FILENAME'], [], 1);
+		if (count($children) === 0) {
+			// If nothing found try to get by UID from filename
+			$pos = strrpos($name, '.ics');
+			$children = $this->calendar->search(substr($name, 0, $pos ?: null), ['UID'], [], 1);
+		}
 
 		if (count($children) > 0) {
 			return new CalendarObject($this, $this->calendar, $children[0]);

apps/dav/lib/CalDAV/AppCalendar/CalendarObject.php

@@ -105,6 +105,9 @@ public function getName(): string {
 		if ($base === null) {
 			throw new NotFound('Invalid node');
 		}
+		if (isset($base['X-FILENAME'])) {
+			return (string)$base['X-FILENAME'];
+		}
 		return (string)$base->UID . '.ics';
 	}