mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26306 from nextcloud/backport/22201/stable19 

[stable19] Delete old birthday calendar object when moving contact to another ad…
This commit is contained in:
Morris Jobke 2021-03-26 11:11:59 +01:00 committed by GitHub
parent 5c737b73af 0e88470b75
commit d2049abae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/dav/lib/CalDAV/BirthdayService.php
View File

@ -380,12 +380,26 @@ class BirthdayService {
$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics'; $objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix']); $calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix']);
$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri); $existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
if (is_null($calendarData)) { if ($calendarData === null) {
if (!is_null($existing)) { if ($existing !== null) {
$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri); $this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
} }
} else { } else {
if (is_null($existing)) { if ($existing === null) {
// not found by URI, but maybe by UID
// happens when a contact with birthday is moved to a different address book
$calendarInfo = $this->calDavBackEnd->getCalendarById($calendarId);
$extraData = $this->calDavBackEnd->getDenormalizedData($calendarData->serialize());
if ($calendarInfo && array_key_exists('principaluri', $calendarInfo)) {
$existing2path = $this->calDavBackEnd->getCalendarObjectByUID($calendarInfo['principaluri'], $extraData['uid']);
if ($existing2path !== null && array_key_exists('uri', $calendarInfo)) {
// delete the old birthday entry first so that we do not get duplicate UIDs
$existing2objectUri = substr($existing2path, strlen($calendarInfo['uri']) + 1);
$this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri);
}
}
$this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize()); $this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
} else { } else {
if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) { if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {