upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #48621 from nextcloud/feat/issue-3786-allow-shared-calendars

Browse source 
feat: Allow shared calendars as appointment conflict calendars
This commit is contained in:
Sebastian Krupinski 2024-11-04 13:52:15 -05:00 committed by GitHub
commit 9d49c75bdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/dav/lib/CalDAV/CalendarProvider.php
View file

@ -24,16 +24,14 @@ class CalendarProvider implements ICalendarProvider {
}
public function getCalendars(string $principalUri, array $calendarUris = []): array {
$calendarInfos = [];
if (empty($calendarUris)) {
$calendarInfos = $this->calDavBackend->getCalendarsForUser($principalUri);
} else {
foreach ($calendarUris as $calendarUri) {
$calendarInfos[] = $this->calDavBackend->getCalendarByUri($principalUri, $calendarUri);
}
}
$calendarInfos = array_filter($calendarInfos);
$calendarInfos = $this->calDavBackend->getCalendarsForUser($principalUri) ?? [];
if (!empty($calendarUris)) {
$calendarInfos = array_filter($calendarInfos, function ($calendar) use ($calendarUris) {
return in_array($calendar['uri'], $calendarUris);
});
}
$iCalendars = [];
foreach ($calendarInfos as $calendarInfo) {