extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve charset support for CalDAV

Browse Source
This commit is contained in:
Jörg Lehrke 2010-06-14 07:51:28 +00:00
parent d5131a6d92
commit 53ebb5dc19
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -495,6 +495,25 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
$handler = $this->_get_handler(); $handler = $this->_get_handler();
$vCalendar = htmlspecialchars_decode($options['content']); $vCalendar = htmlspecialchars_decode($options['content']);
$charset = null;
if (!empty($options['content_type']))
{
$content_type = explode(';', $options['content_type']);
if (count($content_type) > 1)
{
array_shift($content_type);
foreach ($content_type as $attribute)
{
trim($attribute);
list($key, $value) = explode('=', $attribute);
switch (strtolower($key))
{
case 'charset':
$charset = strtoupper(substr($value,1,-1));
}
}
}
}
if (is_array($oldEvent)) if (is_array($oldEvent))
{ {
@ -512,7 +531,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
else else
{ {
// new entry? // new entry?
if (($foundEvents = $handler->search($vCalendar))) if (($foundEvents = $handler->search($vCalendar, null, false, $charset)))
{ {
if (($eventId = array_shift($foundEvents)) && if (($eventId = array_shift($foundEvents)) &&
(list($eventId) = explode(':', $eventId)) && (list($eventId) = explode(':', $eventId)) &&
@ -536,7 +555,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
} }
if (!($cal_id = $handler->importVCal($vCalendar, $eventId, if (!($cal_id = $handler->importVCal($vCalendar, $eventId,
self::etag2value($this->http_if_match), false, 0, $this->principalURL, $user))) self::etag2value($this->http_if_match), false, 0, $this->principalURL, $user, $charset)))
{ {
if ($this->debug) error_log(__METHOD__."(,$id) importVCal($options[content]) returned false"); if ($this->debug) error_log(__METHOD__."(,$id) importVCal($options[content]) returned false");
if ($eventId && $cal_id === false) if ($eventId && $cal_id === false)