holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement CalDAV <calendar-data><expand start="..." end="..."/></calendar-data> to return already expanded recurrences in a given time-range, instead of just a recurring event with a recurrence rule

Browse Source
This commit is contained in:
Ralf Becker 2012-01-24 05:27:26 +00:00
parent 8645bac6a3
commit ace8f33784
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.groupdav.inc.php
View File

@ -513,9 +513,10 @@ class groupdav extends HTTP_WebDAV_Server
* *
* @param string $name property name * @param string $name property name
* @param string $ns=null namespace, if that is to be checked too * @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'])) 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)) if ($prop['name'] == $name && (is_null($ns) || $prop['xmlns'] == $ns))
{ {
$ret = true; $ret = $return_prop ? $prop : true;
break; break;
} }
if ($prop['name'] == 'allprop') $ret = 'allprop'; if ($prop['name'] == 'allprop') $ret = 'allprop';