Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: KolabAddressBook UID

Browse source
This commit is contained in:
the-djmaze 2022-05-21 23:26:23 +02:00
parent ce6810129a
commit 73896ae64b
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/kolab/KolabAddressBook.php
View file

@ -96,7 +96,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
// Fetch xCard attachment and populate $oContact with it // Fetch xCard attachment and populate $oContact with it
$xCard = $this->fetchXCardFromMessage($oMessage); $xCard = $this->fetchXCardFromMessage($oMessage);
if ($xCard instanceof \Sabre\VObject\Component\VCard) { if ($xCard) {
$oContact->PopulateByVCard($xCard); $oContact->PopulateByVCard($xCard);
} }
@ -150,7 +150,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
foreach ($oMessageList as $oMessage) { foreach ($oMessageList as $oMessage) {
if ($bVcf) { if ($bVcf) {
$xCard = $this->fetchXCardFromMessage($oMessage); $xCard = $this->fetchXCardFromMessage($oMessage);
if ($xCard instanceof \Sabre\VObject\Component\VCard) { if ($xCard) {
echo $xCard->serialize(); echo $xCard->serialize();
} }
} else { } else {
@ -176,21 +176,21 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
return false; return false;
} }
$oContact->PopulateDisplayAndFullNameValue(); $id = $oContact->IdContact;
$iUID = $oContact->IdContact; $oPrevMessage = $this->MailClient()->Message($this->sFolderName, $id);
$oPrevMessage = $this->MailClient()->Message($this->sFolderName, $iUID);
if ($oPrevMessage) { if ($oPrevMessage) {
$oVCard = $this->fetchXCardFromMessage($oPrevMessage); $oVCard = $this->fetchXCardFromMessage($oPrevMessage);
} else { } else {
$oVCard = null; $oVCard = null;
$iUID = 0; $id = 0;
} }
$oVCard = $oVCard ?: new \Sabre\VObject\Component\VCard(); $oVCard = $oVCard ?: new \Sabre\VObject\Component\VCard();
$sUid = (string) $oVCard->UID;
$oContact->PopulateDisplayAndFullNameValue();
$oContact->UpdateDependentValues(); $oContact->UpdateDependentValues();
$oContact->fillVCard($oVCard); $oContact->fillVCard($oVCard);
$sUid = (string) $oVCard->UID;
$sUid = \str_replace('urn:uuid:', '', $sUid ?: $oContact->GetUID()); $sUid = \str_replace('urn:uuid:', '', $sUid ?: $oContact->GetUID());
if (!\SnappyMail\UUID::isValid($sUid)) { if (!\SnappyMail\UUID::isValid($sUid)) {
$sUid = \SnappyMail\UUID::generate(); $sUid = \SnappyMail\UUID::generate();
@ -241,7 +241,9 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/vcard+xml; name="kolab.xml"'); $oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/vcard+xml; name="kolab.xml"');
$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable'); $oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment; filename="kolab.xml"'); $oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment; filename="kolab.xml"');
$oPart->Body = \quoted_printable_encode(\preg_replace('/\r?\n/s', "\r\n", \Sabre\VObject\Writer::writeXml($oVCard))); $oPart->Body = \quoted_printable_encode(\preg_replace('/\r?\n/s', "\r\n",
\str_replace('encoding="UTF-8"', 'encoding="UTF-8" standalone="no" ', \Sabre\VObject\Writer::writeXml($oVCard))
));
$oMessage->SubParts->append($oPart); $oMessage->SubParts->append($oPart);
// Store Message // Store Message
@ -250,7 +252,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
$oMessage->ToStream(false), array($rMessageStream), 8192, true, true); $oMessage->ToStream(false), array($rMessageStream), 8192, true, true);
if (false !== $iMessageStreamSize) { if (false !== $iMessageStreamSize) {
\rewind($rMessageStream); \rewind($rMessageStream);
$this->ImapClient()->MessageReplaceStream($this->sFolderName, $iUID, $rMessageStream, $iMessageStreamSize); $this->ImapClient()->MessageReplaceStream($this->sFolderName, $id, $rMessageStream, $iMessageStreamSize);
} }
return true; return true;