From 58b56fd6308aea27023c3488ce5fb8732477ee16 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 7 Jan 2014 17:33:01 +0000 Subject: [PATCH] * CalDAV/calendar: fixed permanent auth request in iCal, if accountselection is set to "selectbox with groupmembers" and rights granted from group without being a member expand-property report now ignores the url instead of throwing an exception --- phpgwapi/inc/class.groupdav_principals.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php index 39abc912c5..454f16a2f0 100644 --- a/phpgwapi/inc/class.groupdav_principals.inc.php +++ b/phpgwapi/inc/class.groupdav_principals.inc.php @@ -324,13 +324,15 @@ class groupdav_principals extends groupdav_handler $this->groupdav->options = $options2; // also modify global variable // run regular profind to get requested 2.-level properties for each href - foreach($expand_prop['val'] as &$prop_val) + foreach($expand_prop['val'] as $key => &$prop_val) { list(,$expand_path) = explode($this->groupdav->base_uri, $prop_val['val']); //error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)"); if ($this->propfind($expand_path, $options2, $prop_val, $user) !== true || !isset($prop_val['files'][0])) { - throw new egw_exception_assertion_failed('no propfind for '.$expand_path); + // do NOT return that path, eg. perms give rights but account_selection="groupmembers" forbids access + unset($expand_prop['val'][$key]); + continue; } $prop_val = $prop_val['files'][0]; }