holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* CalDAV/CardDAV: encoding VT (vertical tab) as it stalls Outlook (CalDav Synchronizer)

Browse Source
This commit is contained in:
Ralf Becker 2019-05-24 15:10:48 +02:00
parent e62e27b179
commit 1338090a84
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ class addressbook_vcal extends addressbook_bo
{
$options['ENCODING'] = 'FUNAMBOL-QP';
}
elseif (preg_match('/([\000-\012\015\016\020-\037\075])/', $value))
elseif (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value))
{
$options['ENCODING'] = 'QUOTED-PRINTABLE';
}
@ -467,7 +467,7 @@ class addressbook_vcal extends addressbook_bo
{
$options['ENCODING'] = 'FUNAMBOL-QP';
}
elseif (preg_match('/([\000-\012\015\016\020-\037\075])/', $value))
elseif (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value))
{
$options['ENCODING'] = 'QUOTED-PRINTABLE';
}

7
api/src/CalDAV/Handler.php
View File

@ -114,6 +114,13 @@ abstract class Handler
*/
var $new_id;
/**
* Regular expression to identify content requiring QUOTED-PRINTABLE encoding
*
* Used in {addressbook,calendar,infolog}/inc/class.*cal.inc.php
*/
const REQUIRE_QUOTED_PRINTABLE_ENCODING = '/([\000-\012\013\015\016\020-\037\075])/';
/**
* Constructor
*

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

@ -1034,7 +1034,7 @@ class calendar_ical extends calendar_boupdate
else
{
$paramData['CHARSET'] = '';
if (preg_match('/([\000-\012\015\016\020-\037\075])/', $valueData))
if (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $valueData))
{
$paramData['ENCODING'] = 'QUOTED-PRINTABLE';
}

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

@ -309,7 +309,7 @@ class infolog_ical extends infolog_bo
{
$options['CHARSET'] = '';
if (preg_match('/([\000-\012\015\016\020-\037\075])/', $value))
if (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value))
{
$options['ENCODING'] = 'QUOTED-PRINTABLE';
}
@ -990,7 +990,7 @@ class infolog_ical extends infolog_bo
{
$options['CHARSET'] = '';
if (preg_match('/([\000-\012\015\016\020-\037\075])/', $value))
if (preg_match(Api\CalDAV\Handler::REQUIRE_QUOTED_PRINTABLE_ENCODING, $value))
{
$options['ENCODING'] = 'QUOTED-PRINTABLE';
}