From 5fc2b3631bbd8516f9f096ecb573564122cd8b85 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 20 Feb 2014 15:12:05 +0000 Subject: [PATCH] * CalDAV/CardDAV: entries with urls containing url-encoded chars, eg. from Google calendar, were not send to clients (missing urldecoding in multiget report) --- addressbook/inc/class.addressbook_groupdav.inc.php | 2 +- calendar/inc/class.calendar_groupdav.inc.php | 2 +- infolog/inc/class.infolog_groupdav.inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php index 2b9cb494fb..39442ecd55 100644 --- a/addressbook/inc/class.addressbook_groupdav.inc.php +++ b/addressbook/inc/class.addressbook_groupdav.inc.php @@ -397,7 +397,7 @@ class addressbook_groupdav extends groupdav_handler if ($option['name'] == 'href') { $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; } diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index bfda3c4603..e311917c94 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -422,7 +422,7 @@ class calendar_groupdav extends groupdav_handler if ($option['name'] == 'href') { $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 ? basename($id,groupdav_handler::$path_extension) : $id; diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index b7dbdb3a12..d2b85b4db8 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -335,7 +335,7 @@ class infolog_groupdav extends groupdav_handler if ($option['name'] == 'href') { $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 ? basename($id,groupdav_handler::$path_extension) : $id;