Skip to content

Commit e8ef4ca

Browse files
max65482come-nc
authored andcommitted
delete birthday calendar events permanently
Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
1 parent bab0881 commit e8ef4ca

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

apps/dav/lib/CalDAV/BirthdayService.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function onCardDeleted(int $addressBookId,
150150
$calendar = $this->ensureCalendarExists($principalUri);
151151
foreach (['', '-death', '-anniversary'] as $tag) {
152152
$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
153-
$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
153+
$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
154154
}
155155
}
156156
}
@@ -306,7 +306,7 @@ public function resetForUser(string $user):void {
306306
$calendarObjects = $this->calDavBackEnd->getCalendarObjects($calendar['id'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
307307

308308
foreach ($calendarObjects as $calendarObject) {
309-
$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
309+
$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
310310
}
311311
}
312312

@@ -384,7 +384,7 @@ private function updateCalendar(string $cardUri,
384384
$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
385385
if ($calendarData === null) {
386386
if ($existing !== null) {
387-
$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
387+
$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
388388
}
389389
} else {
390390
if ($existing === null) {
@@ -398,7 +398,7 @@ private function updateCalendar(string $cardUri,
398398
if ($existing2path !== null && array_key_exists('uri', $calendarInfo)) {
399399
// delete the old birthday entry first so that we do not get duplicate UIDs
400400
$existing2objectUri = substr($existing2path, strlen($calendarInfo['uri']) + 1);
401-
$this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri);
401+
$this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
402402
}
403403
}
404404

0 commit comments

Comments
 (0)