From 1eff2332663dd726256041770fb41f5659b1129f Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sun, 26 Oct 2008 00:54:32 +1300
Subject: [PATCH] Add FBTYPE to busy details.

---
 inc/caldav-POST.php                           |  6 ++--
 .../regression-suite/243-Moz-POST-FB.result   | 12 +++----
 .../regression-suite/244-Moz-POST-FB.result   | 34 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/inc/caldav-POST.php b/inc/caldav-POST.php
index fb638d72..a07a3e0c 100644
--- a/inc/caldav-POST.php
+++ b/inc/caldav-POST.php
@@ -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 ) );
       }
     }
 
diff --git a/testing/tests/regression-suite/243-Moz-POST-FB.result b/testing/tests/regression-suite/243-Moz-POST-FB.result
index f508016d..056be8b5 100644
--- a/testing/tests/regression-suite/243-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/243-Moz-POST-FB.result
@@ -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>
diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result
index 7e6a5054..a20d43b0 100644
--- a/testing/tests/regression-suite/244-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/244-Moz-POST-FB.result
@@ -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>