nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-30 18:37:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add FBTYPE to busy details.

Browse Source
This commit is contained in:
Andrew McMillan 2008-10-26 00:54:32 +13:00
parent 1d62197986
commit 1eff233266
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/caldav-POST.php
View File

@ -117,7 +117,7 @@ function handle_freebusy_request( $ic ) {
if ( $date->GreaterThan($fbq_end) ) break;
$todate = clone($date);
$todate->AddDuration($duration);
$fb->Add("FREEBUSY", sprintf("%s/%s", $date->Render('Ymd\THis'), $todate->Render('Ymd\THis') ), $fbparams );
$fb->Add("FREEBUSY;FBTYPE=BUSY-TENTATIVE", sprintf("%s/%s", $date->Render('Ymd\THis'), $todate->Render('Ymd\THis') ), $fbparams );
}
}
else {
@ -135,11 +135,11 @@ function handle_freebusy_request( $ic ) {
if ( $date->GreaterThan($fbq_end) ) break;
$todate = clone($date);
$todate->AddDuration($duration);
$fb->Add("FREEBUSY", sprintf("%s/%s", $date->Render('Ymd\THis'), $todate->Render('Ymd\THis') ) );
$fb->Add("FREEBUSY;FBTYPE=BUSY", sprintf("%s/%s", $date->Render('Ymd\THis'), $todate->Render('Ymd\THis') ) );
}
}
else {
$fb->Add("FREEBUSY", sprintf("%s/%s", $start->Render('Ymd\THis'), $v->finish ) );
$fb->Add("FREEBUSY;FBTYPE=BUSY", sprintf("%s/%s", $start->Render('Ymd\THis'), $v->finish ) );
}
}

12
testing/tests/regression-suite/243-Moz-POST-FB.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
Content-Length: 890
Content-Length: 950
Content-Type: text/plain; charset="utf-8"
<schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
@ -22,11 +22,11 @@ UID:c5bd82ea-cd89-4f58-8d31-336f47e44f97
ORGANIZER:mailto:user1@example.net
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma
ilto:user1@example.net
FREEBUSY:20081021T184500/20081021T193000
FREEBUSY:20081023T184500/20081023T193000
FREEBUSY:20081028T184500/20081028T193000
FREEBUSY:20081030T184500/20081030T193000
FREEBUSY:20081104T184500/20081104T193000
FREEBUSY;FBTYPE=BUSY:20081021T184500/20081021T193000
FREEBUSY;FBTYPE=BUSY:20081023T184500/20081023T193000
FREEBUSY;FBTYPE=BUSY:20081028T184500/20081028T193000
FREEBUSY;FBTYPE=BUSY:20081030T184500/20081030T193000
FREEBUSY;FBTYPE=BUSY:20081104T184500/20081104T193000
END:VFREEBUSY
END:VCALENDAR
</C:calendar-data>

34
testing/tests/regression-suite/244-Moz-POST-FB.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
Content-Length: 1352
Content-Length: 1544
Content-Type: text/plain; charset="utf-8"
<schedule-response xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
@ -22,22 +22,22 @@ UID:c5bd82ea-cd89-4f58-8d31-336f47e44f97
ORGANIZER:mailto:user1@example.net
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma
ilto:user2@example.net
FREEBUSY:20081020T220000/20081020T223000
FREEBUSY:20081021T220000/20081021T223000
FREEBUSY:20081022T220000/20081022T223000
FREEBUSY:20081023T220000/20081023T223000
FREEBUSY:20081024T220000/20081024T223000
FREEBUSY:20081027T220000/20081027T223000
FREEBUSY:20081028T220000/20081028T223000
FREEBUSY:20081029T220000/20081029T223000
FREEBUSY:20081030T220000/20081030T223000
FREEBUSY:20081031T220000/20081031T223000
FREEBUSY:20081103T220000/20081103T223000
FREEBUSY:20081104T220000/20081104T223000
FREEBUSY:20081026T200000/20081026T210000
FREEBUSY:20081102T200000/20081102T210000
FREEBUSY:20081024T010000/20081024T020000
FREEBUSY:20081031T010000/20081031T020000
FREEBUSY;FBTYPE=BUSY:20081020T220000/20081020T223000
FREEBUSY;FBTYPE=BUSY:20081021T220000/20081021T223000
FREEBUSY;FBTYPE=BUSY:20081022T220000/20081022T223000
FREEBUSY;FBTYPE=BUSY:20081023T220000/20081023T223000
FREEBUSY;FBTYPE=BUSY:20081024T220000/20081024T223000
FREEBUSY;FBTYPE=BUSY:20081027T220000/20081027T223000
FREEBUSY;FBTYPE=BUSY:20081028T220000/20081028T223000
FREEBUSY;FBTYPE=BUSY:20081029T220000/20081029T223000
FREEBUSY;FBTYPE=BUSY:20081030T220000/20081030T223000
FREEBUSY;FBTYPE=BUSY:20081031T220000/20081031T223000
FREEBUSY;FBTYPE=BUSY:20081103T220000/20081103T223000
FREEBUSY;FBTYPE=BUSY:20081104T220000/20081104T223000
FREEBUSY;FBTYPE=BUSY:20081026T200000/20081026T210000
FREEBUSY;FBTYPE=BUSY:20081102T200000/20081102T210000
FREEBUSY;FBTYPE=BUSY:20081024T010000/20081024T020000
FREEBUSY;FBTYPE=BUSY:20081031T010000/20081031T020000
END:VFREEBUSY
END:VCALENDAR
</C:calendar-data>