upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-03 22:06:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

fix(caldav): Test if user object is not null and trim senderName

Browse source 
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
This commit is contained in:
SebastianKrupinski 2024-05-01 19:51:45 -04:00
parent f44b73e2db
commit d25039ec1a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file

@ -206,13 +206,16 @@ class IMipPlugin extends SabreIMipPlugin {
// Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
// If the iTIP message senderName is null or empty use the user session name as the senderName
if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
$senderName = $iTipMessage->senderName->getValue();
$senderName = trim($iTipMessage->senderName->getValue());
}
elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
$senderName = $iTipMessage->senderName;
$senderName = trim($iTipMessage->senderName);
}
elseif ($this->userSession->getUser() !== null) {
$senderName = trim($this->userSession->getUser()->getDisplayName());
}
else {
$senderName = $this->userSession->getUser()->getDisplayName();
$senderName = '';
}
$sender = substr($iTipMessage->sender, 7);