From c768c9cbf74b6e61db77a04a3fcb4bf9844d5043 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 11 Nov 2019 18:01:38 +0100
Subject: [PATCH] * CalDAV/Calendar: Lightning 68 no longer allowed to
 accept/reject invitations Caused by calendar-user-address-set in principal
 had url encoded @ in email --> now using a minimal url-encoding for
 Lightning, to not encode @

---
 api/src/WebDAV/Server.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/api/src/WebDAV/Server.php b/api/src/WebDAV/Server.php
index 83781a175a..290193b990 100644
--- a/api/src/WebDAV/Server.php
+++ b/api/src/WebDAV/Server.php
@@ -2706,6 +2706,19 @@ class HTTP_WebDAV_Server
      */
     public static function _urlencode($url)
     {
+		// Thunderbird Lightning 68+ does not recognice participants,
+		// if EMail in principal (calendar-user-address-set) is encoded
+		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false)
+		{
+			return strtr($url, array(
+				' '	=>	'%20',
+				'%'	=>	'%25',
+				'&'	=>	'%26',
+				'<'	=>	'%3C',
+				'>'	=>	'%3E',
+				'+'	=>	'%2B',
+			));
+		}
 		return strtr(rawurlencode($url),array(
 			'%2F' => '/',
 			'%3A' => ':',