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

Quote getctag response to match getetag. Try and output calendar-free-busy-set

Browse Source 
for queries against the inbox which request it.
This commit is contained in:
Andrew McMillan 2008-10-25 13:15:14 +13:00
parent a11f29ba11
commit 35e21ab66f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/caldav-PROPFIND.php
View File

@ -328,6 +328,11 @@ function collection_to_xml( $collection ) {
$not_found = new XMLElement("prop");
$denied = new XMLElement("prop");
$collection->type = ($collection->is_calendar == 't' ? 'calendar' : ($collection->is_principal == 't' ? 'principal' : '') );
if ( preg_match( '#^((/[^/]+/)\.(in|out)/)[^/]*$#', $collection->dav_name, $matches ) ) {
$collection->type = $matches[3];
}
/**
* First process any static values we do support
*/
@ -354,9 +359,6 @@ function collection_to_xml( $collection ) {
|| isset($prop_list['DAV::resourcetype']) ) {
$resourcetypes = array( new XMLElement("collection") );
$contentlength = false;
if ( preg_match( '#^((/[^/]+/)\.(in|out)/)[^/]*$#', $collection->dav_name, $matches ) ) {
$collection->type = $matches[3];
}
if ( $collection->is_calendar == 't' ) {
$resourcetypes[] = new XMLElement($reply->Caldav("calendar"), false);
$resourcetypes[] = new XMLElement($reply->Caldav("schedule-calendar"), false);
@ -388,13 +390,13 @@ function collection_to_xml( $collection ) {
}
if ( isset($prop_list['http://calendarserver.org/ns/:getctag']) ) {
// Calendar Server extension which only applies to collections. We return the etag, which does the needful.
$prop->NewElement($reply->Calendarserver('getctag'),$collection->dav_etag );
$prop->NewElement($reply->Calendarserver('getctag'),'"'.$collection->dav_etag.'"' );
}
if ( isset($prop_list['urn:ietf:params:xml:ns:caldav:calendar-free-busy-set'] ) ) {
if ( isset($collection->is_inbox) && $collection->is_inbox && $session->user_no == $collection->user_no ) {
if ( $collection->type == 'in' && $session->user_no == $collection->user_no ) {
$fb_set = array();
foreach( $collection->free_busy_set AS $k => $v ) {
foreach( $request->principal->calendar_free_busy_set AS $k => $v ) {
$fb_set[] = new XMLElement('href', $v );
}
$prop->NewElement($reply->Caldav("calendar-free-busy-set"), $fb_set );