From 5b7281ed5cffc4dcefe461165967cde6a73368a9 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 28 May 2019 16:25:11 +0200 Subject: [PATCH] Revert "some chars also require encoding for iCal 2+ or vCard 3+" This reverts commit f75b9e93f4c82d42b43960bed71a685e8e890f84. --- addressbook/inc/class.addressbook_vcal.inc.php | 5 ----- calendar/inc/class.calendar_ical.inc.php | 12 ++++++++---- infolog/inc/class.infolog_ical.inc.php | 5 ----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php index 2aec1ccfe1..24dac95dba 100644 --- a/addressbook/inc/class.addressbook_vcal.inc.php +++ b/addressbook/inc/class.addressbook_vcal.inc.php @@ -476,11 +476,6 @@ class addressbook_vcal extends addressbook_bo unset($options['ENCODING']); } } - // some chars also require encoding for vCard 3+ - elseif (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value)) - { - $options['ENCODING'] = 'QUOTED-PRINTABLE'; - } if ($vcardField == 'TEL' && $entry['tel_prefer'] && ($databaseField == $entry['tel_prefer'])) { diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index a2f46c9c41..61e7764f17 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -1048,12 +1048,16 @@ class calendar_ical extends calendar_boupdate $paramData['ENCODING'] = 'FUNAMBOL-QP'; } } - // some chars also require encoding for iCal 2+ - elseif (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $valueData)) + /* + if (preg_match('/([\000-\012])/', $valueData)) { - $paramData['ENCODING'] = 'QUOTED-PRINTABLE'; + if ($this->log) + { + error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . + "() Has invalid XML data: $valueData",3,$this->logfile); + } } - + */ $vevent->setAttribute($key, $valueData, $paramData, true, $valuesData); } } diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php index 8c555de287..6cce3cf524 100644 --- a/infolog/inc/class.infolog_ical.inc.php +++ b/infolog/inc/class.infolog_ical.inc.php @@ -323,11 +323,6 @@ class infolog_ical extends infolog_bo $options['ENCODING'] = 'FUNAMBOL-QP'; } } - // some chars also require encoding for iCal 2+ - elseif (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value)) - { - $options['ENCODING'] = 'QUOTED-PRINTABLE'; - } $vevent->setAttribute($field, $value, $options); }