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

* CalDAV/CardDAV: entries with urls containing url-encoded chars, eg. from Google calendar, were not send to clients (missing urldecoding in multiget report)

Browse Source
This commit is contained in:
Ralf Becker 2014-02-20 15:11:27 +00:00
parent 90c89e0eb7
commit 94af139465
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -506,7 +506,7 @@ class addressbook_groupdav extends groupdav_handler
if ($option['name'] == 'href') if ($option['name'] == 'href')
{ {
$parts = explode('/',$option['data']); $parts = explode('/',$option['data']);
if (($id = array_pop($parts))) if (($id = urldecode(array_pop($parts))))
{ {
$ids[] = groupdav_handler::$path_extension ? basename($id,groupdav_handler::$path_extension) : $id; $ids[] = groupdav_handler::$path_extension ? basename($id,groupdav_handler::$path_extension) : $id;
} }

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

@ -533,7 +533,7 @@ class calendar_groupdav extends groupdav_handler
if ($option['name'] == 'href') if ($option['name'] == 'href')
{ {
$parts = explode('/',$option['data']); $parts = explode('/',$option['data']);
if (($id = array_pop($parts))) if (($id = urldecode(array_pop($parts))))
{ {
$cal_filters['query'][self::$path_attr][] = groupdav_handler::$path_extension ? $cal_filters['query'][self::$path_attr][] = groupdav_handler::$path_extension ?
basename($id,groupdav_handler::$path_extension) : $id; basename($id,groupdav_handler::$path_extension) : $id;

2
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -430,7 +430,7 @@ class infolog_groupdav extends groupdav_handler
if ($option['name'] == 'href') if ($option['name'] == 'href')
{ {
$parts = explode('/',$option['data']); $parts = explode('/',$option['data']);
if (($id = basename(array_pop($parts)))) if (($id = basename(urldecode(array_pop($parts)))))
{ {
$cal_filters[self::$path_attr][] = groupdav_handler::$path_extension ? $cal_filters[self::$path_attr][] = groupdav_handler::$path_extension ?
basename($id,groupdav_handler::$path_extension) : $id; basename($id,groupdav_handler::$path_extension) : $id;