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

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
index 472f745fefe..d27dcf55206 100644
--- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -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);