nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for resource-id and parent-set properties.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-18 13:21:19 +13:00
parent 897ace4f1d
commit 8fc2a76cea
3 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
inc/DAVResource.php
View File

@ -1206,8 +1206,36 @@ EOQRY;
$prop->NewElement('href', ConstructURL($this->dav_name) ); $prop->NewElement('href', ConstructURL($this->dav_name) );
break; break;
case 'DAV::resource_id': case 'DAV::resource-id':
$prop->NewElement('href', ConstructURL('.resources/'.$this->resource_id) ); if ( $this->resource_id > 0 )
$reply->DAVElement( $prop, 'resource-id', $reply->href(ConstructURL('/.resources/'.$this->resource_id) ) );
else
return false;
break;
case 'DAV::parent-set':
$parent_set = $reply->DAVElement( $prop, 'parent-set' );
if ( preg_match( '{^(.*)/([^/]+)/?$}', $this->bound_from, $matches ) ) {
$reply->DAVElement($parent_set, 'parent', array(
new XMLElement( 'href', ConstructURL($matches[1])),
new XMLElement( 'segment', $matches[2])
));
$sql = <<<EOQRY
SELECT regexp_replace( b.parent_container, '/$', '') AS parent,
regexp_replace( replace( b.dav_name, b.parent_container, ''), '/$', '') AS segment
FROM dav_binding b JOIN collection c ON(b.bound_source_id=c.collection_id)
WHERE regexp_replace( b.dav_name, '^.*/', c.dav_name ) = :bound_from
EOQRY;
$qry = new AwlQuery($sql, array( ':bound_from' => $this->bound_from ) );
if ( $qry->Exec('DAVResource',__LINE__,__FILE__) && $qry->rows() > 0 ) {
while( $row = $qry->Fetch() ) {
$reply->DAVElement($parent_set, 'parent', array(
new XMLElement( 'href', ConstructURL($row->parent)),
new XMLElement( 'segment', $row->segment)
));
}
}
}
break; break;
case 'DAV::getcontenttype': case 'DAV::getcontenttype':

50
testing/tests/regression-suite/964-PROPFIND.result
View File

@ -5,6 +5,10 @@
<propstat> <propstat>
<prop> <prop>
<displayname>User 4</displayname> <displayname>User 4</displayname>
<resource-id>
<href>/caldav.php/.resources/6</href>
</resource-id>
<parent-set/>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
@ -14,6 +18,19 @@
<propstat> <propstat>
<prop> <prop>
<displayname>User 2's Calendar, as uploaded by Admin</displayname> <displayname>User 2's Calendar, as uploaded by Admin</displayname>
<resource-id>
<href>/caldav.php/.resources/11</href>
</resource-id>
<parent-set>
<parent>
<href>/caldav.php/user2</href>
<segment>home</segment>
</parent>
<parent>
<href>/caldav.php/user4</href>
<segment>user2</segment>
</parent>
</parent-set>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
@ -23,6 +40,15 @@
<propstat> <propstat>
<prop> <prop>
<displayname>mir-test</displayname> <displayname>mir-test</displayname>
<resource-id>
<href>/caldav.php/.resources/13</href>
</resource-id>
<parent-set>
<parent>
<href>/caldav.php/user4</href>
<segment>home</segment>
</parent>
</parent-set>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
@ -32,17 +58,41 @@
<propstat> <propstat>
<prop> <prop>
<displayname>/user4/calendar-proxy-read/</displayname> <displayname>/user4/calendar-proxy-read/</displayname>
<parent-set>
<parent>
<href>/caldav.php/user4</href>
<segment>calendar-proxy-read</segment>
</parent>
</parent-set>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
<propstat>
<prop>
<resource-id/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
</response> </response>
<response> <response>
<href>/caldav.php/user4/calendar-proxy-write/</href> <href>/caldav.php/user4/calendar-proxy-write/</href>
<propstat> <propstat>
<prop> <prop>
<displayname>/user4/calendar-proxy-write/</displayname> <displayname>/user4/calendar-proxy-write/</displayname>
<parent-set>
<parent>
<href>/caldav.php/user4</href>
<segment>calendar-proxy-write</segment>
</parent>
</parent-set>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
<propstat>
<prop>
<resource-id/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
</response> </response>
</multistatus> </multistatus>

2
testing/tests/regression-suite/964-PROPFIND.test
View File

@ -15,6 +15,8 @@ BEGINDATA
<propfind xmlns="DAV:"> <propfind xmlns="DAV:">
<prop> <prop>
<displayname/> <displayname/>
<resource-id/>
<parent-set/>
</prop> </prop>
</propfind> </propfind>
ENDDATA ENDDATA