Skip to content

Commit 1650417

Browse files
feat: Allow shared calendars as appointment conflict calendars
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
1 parent 6fa18c9 commit 1650417

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

apps/dav/lib/CalDAV/CalendarProvider.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ public function __construct(
2424
}
2525

2626
public function getCalendars(string $principalUri, array $calendarUris = []): array {
27-
$calendarInfos = [];
28-
if (empty($calendarUris)) {
29-
$calendarInfos = $this->calDavBackend->getCalendarsForUser($principalUri);
30-
} else {
31-
foreach ($calendarUris as $calendarUri) {
32-
$calendarInfos[] = $this->calDavBackend->getCalendarByUri($principalUri, $calendarUri);
33-
}
34-
}
3527

36-
$calendarInfos = array_filter($calendarInfos);
28+
$calendarInfos = $this->calDavBackend->getCalendarsForUser($principalUri) ?? [];
29+
30+
if (!empty($calendarUris)) {
31+
$calendarInfos = array_filter($calendarInfos, function ($calendar) use ($calendarUris) {
32+
return in_array($calendar['uri'], $calendarUris);
33+
});
34+
}
3735

3836
$iCalendars = [];
3937
foreach ($calendarInfos as $calendarInfo) {

0 commit comments

Comments
 (0)