nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-23 02:14:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

expand-property repord - prevent infinite recursion and recursion to the object itself (non-recursive getting request URL properties)

Browse Source
This commit is contained in:
Ján Máté 2014-05-14 13:33:36 +02:00
parent 31af435cec
commit 822e81644d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/caldav-REPORT-expand-property.php
View File

@ -71,7 +71,9 @@ function expand_properties( $urls, $ptree, &$reply, $recurse_again = true ) {
$paths = array(); $paths = array();
foreach( $hrefs AS $k => $v ) { foreach( $hrefs AS $k => $v ) {
$content = $v->GetContent(); $content = $v->GetContent();
$paths[] = $content; // prevent infinite recursion and recursion to the object itself (non-recursive getting request URL properties)
if($content[0]=='/' && $content!='/caldav.php'.str_replace( '%2F', '/', rawurlencode($url)))
$paths[] = $content;
} }
// dbg_error_log('REPORT',' Found property "%s" contains hrefs "%s"', $pname, implode(', ',$paths) ); // dbg_error_log('REPORT',' Found property "%s" contains hrefs "%s"', $pname, implode(', ',$paths) );
$property->SetContent( expand_properties($paths, $subtrees[$pname], $reply, false) ); $property->SetContent( expand_properties($paths, $subtrees[$pname], $reply, false) );