From ace8f337845fe86833249d49c6c1b048c0a085a0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 24 Jan 2012 05:27:26 +0000 Subject: [PATCH] implement CalDAV to return already expanded recurrences in a given time-range, instead of just a recurring event with a recurrence rule --- phpgwapi/inc/class.groupdav.inc.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php index b692bbbdc6..f3bbb0a401 100644 --- a/phpgwapi/inc/class.groupdav.inc.php +++ b/phpgwapi/inc/class.groupdav.inc.php @@ -513,9 +513,10 @@ class groupdav extends HTTP_WebDAV_Server * * @param string $name property name * @param string $ns=null namespace, if that is to be checked too - * @return boolean|string true: $name explicitly requested (or autoindex), 'allprop' requested, false: $name was not requested + * @param boolean $return_prop=false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children' + * @return boolean|string|array true: $name explicitly requested (or autoindex), 'allprop' requested, false: $name was not requested */ - function prop_requested($name, $ns=null) + function prop_requested($name, $ns=null, $return_prop=false) { if (!is_array($this->propfind_options) || !isset($this->propfind_options['props'])) { @@ -526,7 +527,7 @@ class groupdav extends HTTP_WebDAV_Server { if ($prop['name'] == $name && (is_null($ns) || $prop['xmlns'] == $ns)) { - $ret = true; + $ret = $return_prop ? $prop : true; break; } if ($prop['name'] == 'allprop') $ret = 'allprop';