extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "some chars also require encoding for iCal 2+ or vCard 3+"

Browse Source 
This reverts commit f75b9e93f4.
This commit is contained in:
Ralf Becker 2019-05-28 16:25:11 +02:00
parent 372d024720
commit 5b7281ed5c
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -476,11 +476,6 @@ class addressbook_vcal extends addressbook_bo
unset($options['ENCODING']); 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'] && if ($vcardField == 'TEL' && $entry['tel_prefer'] &&
($databaseField == $entry['tel_prefer'])) ($databaseField == $entry['tel_prefer']))
{ {

12
calendar/inc/class.calendar_ical.inc.php
View File

@ -1048,12 +1048,16 @@ class calendar_ical extends calendar_boupdate
$paramData['ENCODING'] = 'FUNAMBOL-QP'; $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); $vevent->setAttribute($key, $valueData, $paramData, true, $valuesData);
} }
} }

5
infolog/inc/class.infolog_ical.inc.php
View File

@ -323,11 +323,6 @@ class infolog_ical extends infolog_bo
$options['ENCODING'] = 'FUNAMBOL-QP'; $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); $vevent->setAttribute($field, $value, $options);
} }