diff --git a/inc/freebusy-GET.php b/inc/freebusy-GET.php index 11bdc253..13b87ead 100644 --- a/inc/freebusy-GET.php +++ b/inc/freebusy-GET.php @@ -1,13 +1,12 @@ by_email) ) { - $where = "WHERE caldav_data.user_no = $request->user_no "; -} -else { - $where = "WHERE caldav_data.user_no = $request->user_no AND caldav_data.dav_name ~ ".qpg("^".$request->path)." "; +$params = array( ':user_no' => $request->user_no ); +$where = 'WHERE caldav_data.user_no = :user_no '; +if ( ! isset($request->by_email) ) { + $params[':path_match'] = "^".$request->path; + $where .= 'AND caldav_data.dav_name ~ :path_match '; } $begindate = new iCalDate($fb_start); @@ -19,8 +18,10 @@ else { $enddate->AddDuration( $fb_period ); } +$params[':range_start'] = $fb_start; if ( isset($fb_end) && $fb_end != '' ) { - $sql_end = qpg($fb_end); + $params[':range_end'] = $fb_end; + $where .= ' AND rrule_event_overlaps( dtstart, dtend, rrule, :range_start, :range_end) '; } else { $sql_period = str_replace( 'P', '', $fb_period ); @@ -30,14 +31,14 @@ else { $sql_period = str_replace( 'H', ' hours ', $sql_period ); $sql_period = str_replace( 'M', ' minutes ', $sql_period ); $sql_period = str_replace( 'S', ' seconds ', $sql_period ); - $sql_end = "( TIMESTAMP " . qpg($fb_start) . " + ( INTERVAL ".qpg($sql_period).") )"; + $params[':sql_duration'] = $sql_period; + $where .= ' AND rrule_event_overlaps( dtstart, dtend, rrule, :range_start, (TIMESTAMP :range_start + (INTERVAL :sql_duration)) ) '; } -$where .= "AND rrule_event_overlaps( dtstart, dtend, rrule, ".qpg($fb_start).", $sql_end ) "; $where .= "AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) "; $where .= "AND (calendar_item.transp != 'TRANSPARENT' OR calendar_item.transp IS NULL) "; $where .= "AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) "; -if ( ! $request->AllowedTo('all') ) { +if ( $request->Privileges() != privilege_to_bits('all') ) { $where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) "; } @@ -49,8 +50,8 @@ $sql .= "to_char(calendar_item.dtend at time zone 'GMT',".iCalendar::SqlUTCForma $sql .= "FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)".$where; if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY dav_id"; // echo $sql. "\n"; -$qry = new PgQuery( $sql ); -if ( $qry->Exec("freebusy",__LINE__,__FILE__) && $qry->rows > 0 ) { +$qry = new AwlQuery( $sql, $params ); +if ( $qry->Exec("freebusy",__LINE__,__FILE__) && $qry->rows() > 0 ) { while( $calendar_object = $qry->Fetch() ) { if ( $calendar_object->transp != "TRANSPARENT" ) { switch ( $calendar_object->status ) { @@ -71,8 +72,17 @@ if ( $qry->Exec("freebusy",__LINE__,__FILE__) && $qry->rows > 0 ) { } } } -$freebusy = iCalendar::iCalHeader(); -$freebusy .= sprintf("BEGIN:VFREEBUSY\nDTSTAMP:%s\nDTSTART:%s\n%s:%s\n", date('Ymd\THis\Z'), $begindate->RenderGMT(), (isset($fb_period) ? "DURATION" : "DTEND"), (isset($fb_period) ? $fb_period : $enddate->RenderGMT())); + +$freebusy = new iCalComponent(); +$freebusy->SetType('VFREEBUSY'); +$freebusy->AddProperty('DTSTAMP', date('Ymd\THis\Z')); +$freebusy->AddProperty('DTSTART', $begindate->RenderGMT()); +if ( isset($fb_period) ) { + $freebusy->AddProperty('DURATION', $fb_period); +} +else { + $freebusy->AddProperty('DTEND', $enddate->RenderGMT()); +} foreach( $busy_tentative AS $k => $v ) { $start = new iCalDate($v->start); @@ -85,11 +95,11 @@ foreach( $busy_tentative AS $k => $v ) { if ( $date->GreaterThan($enddate) ) break; $todate = clone($date); $todate->AddDuration($duration); - $freebusy .= sprintf("FREEBUSY;FBTYPE=BUSY-TENTATIVE:%s/%s\n", $date->RenderGMT(), $todate->RenderGMT() ); + $freebusy->AddProperty( 'FREEBUSY', $date->RenderGMT().'/'.$todate->RenderGMT(), array('FBTYPE' => 'BUSY-TENTATIVE') ); } } else { - $freebusy .= sprintf("FREEBUSY;FBTYPE=BUSY-TENTATIVE:%s/%s\n", $start->RenderGMT(), $finish->RenderGMT() ); + $freebusy->AddProperty( 'FREEBUSY', $start->RenderGMT().'/'.$finish->RenderGMT(), array('FBTYPE' => 'BUSY-TENTATIVE') ); } } @@ -105,15 +115,17 @@ foreach( $busy AS $k => $v ) { if ( $date->GreaterThan($enddate) ) break; $todate = clone($date); $todate->AddDuration($duration); - $freebusy .= sprintf("FREEBUSY:%s/%s\n", $date->RenderGMT(), $todate->RenderGMT() ); + $freebusy->AddProperty( 'FREEBUSY', $date->RenderGMT().'/'.$todate->RenderGMT() ); } } else { - $freebusy .= sprintf("FREEBUSY:%s/%s\n", $start->RenderGMT(), $finish->RenderGMT() ); + $freebusy->AddProperty( 'FREEBUSY', $start->RenderGMT().'/'.$finish->RenderGMT() ); } } -$freebusy .= "END:VFREEBUSY\n"; -$freebusy .= iCalendar::iCalFooter(); -$request->DoResponse( 200, $freebusy, 'text/calendar' ); +$result = new iCalComponent(); +$result->VCalendar(); +$result->AddComponent($freebusy); + +$request->DoResponse( 200, $result->Render(), 'text/calendar' ); // Won't return from that diff --git a/testing/tests/regression-suite/832-freebusy.result b/testing/tests/regression-suite/832-freebusy.result index fc283941..0613d909 100644 --- a/testing/tests/regression-suite/832-freebusy.result +++ b/testing/tests/regression-suite/832-freebusy.result @@ -1,343 +1,344 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 14366 +Content-Length: 14720 Content-Type: text/calendar BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 -BEGIN:VFREEBUSY +CALSCALE:GREGORIAN +BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ DTSTART:correct DTEND:correct -FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z -FREEBUSY:20061101T233000Z/20061102T003000Z -FREEBUSY:20061031T210000Z/20061031T220000Z -FREEBUSY:20061101T210000Z/20061101T090000Z -FREEBUSY:20061109T080000Z/20061109T090000Z -FREEBUSY:20061116T080000Z/20061116T090000Z -FREEBUSY:20061123T080000Z/20061123T090000Z -FREEBUSY:20061130T080000Z/20061130T090000Z -FREEBUSY:20061207T080000Z/20061207T090000Z -FREEBUSY:20061214T080000Z/20061214T090000Z -FREEBUSY:20061221T080000Z/20061221T090000Z -FREEBUSY:20061228T080000Z/20061228T090000Z -FREEBUSY:20070104T080000Z/20070104T090000Z -FREEBUSY:20070111T080000Z/20070111T090000Z -FREEBUSY:20070118T080000Z/20070118T090000Z -FREEBUSY:20070125T080000Z/20070125T090000Z -FREEBUSY:20070201T080000Z/20070201T090000Z -FREEBUSY:20070208T080000Z/20070208T090000Z -FREEBUSY:20070215T080000Z/20070215T090000Z -FREEBUSY:20070222T080000Z/20070222T090000Z -FREEBUSY:20070301T080000Z/20070301T090000Z -FREEBUSY:20070308T080000Z/20070308T090000Z -FREEBUSY:20070315T080000Z/20070315T090000Z -FREEBUSY:20070322T090000Z/20070322T100000Z -FREEBUSY:20070329T090000Z/20070329T100000Z -FREEBUSY:20070405T090000Z/20070405T100000Z -FREEBUSY:20070412T090000Z/20070412T100000Z -FREEBUSY:20070419T090000Z/20070419T100000Z -FREEBUSY:20070426T090000Z/20070426T100000Z -FREEBUSY:20061223T030000Z/20061223T050000Z -FREEBUSY:20061103T030000Z/20061102T154500Z -FREEBUSY:20061116T140000Z/20061116T154500Z -FREEBUSY:20061130T140000Z/20061130T154500Z -FREEBUSY:20061214T140000Z/20061214T154500Z -FREEBUSY:20061228T140000Z/20061228T154500Z -FREEBUSY:20070111T140000Z/20070111T154500Z -FREEBUSY:20070125T140000Z/20070125T154500Z -FREEBUSY:20070208T140000Z/20070208T154500Z -FREEBUSY:20070222T140000Z/20070222T154500Z -FREEBUSY:20070308T140000Z/20070308T154500Z -FREEBUSY:20070322T150000Z/20070322T164500Z -FREEBUSY:20070405T150000Z/20070405T164500Z -FREEBUSY:20070419T150000Z/20070419T164500Z -FREEBUSY:20070503T150000Z/20070503T164500Z -FREEBUSY:20070517T150000Z/20070517T164500Z -FREEBUSY:20070531T150000Z/20070531T164500Z -FREEBUSY:20070614T150000Z/20070614T164500Z -FREEBUSY:20070628T150000Z/20070628T164500Z -FREEBUSY:20061102T183000Z/20061102T073000Z -FREEBUSY:20061202T053000Z/20061202T073000Z -FREEBUSY:20070102T053000Z/20070102T073000Z -FREEBUSY:20070202T053000Z/20070202T073000Z -FREEBUSY:20070302T053000Z/20070302T073000Z -FREEBUSY:20070402T063000Z/20070402T083000Z -FREEBUSY:20070502T063000Z/20070502T083000Z -FREEBUSY:20070602T063000Z/20070602T083000Z -FREEBUSY:20061001T090000Z/20061001T100000Z -FREEBUSY:20061002T090000Z/20061002T100000Z -FREEBUSY:20061003T090000Z/20061003T100000Z -FREEBUSY:20061004T090000Z/20061004T100000Z -FREEBUSY:20061005T090000Z/20061005T100000Z -FREEBUSY:20061006T090000Z/20061006T100000Z -FREEBUSY:20061007T090000Z/20061007T100000Z -FREEBUSY:20061008T090000Z/20061008T100000Z -FREEBUSY:20061009T090000Z/20061009T100000Z -FREEBUSY:20061010T090000Z/20061010T100000Z -FREEBUSY:20061011T090000Z/20061011T100000Z -FREEBUSY:20061012T090000Z/20061012T100000Z -FREEBUSY:20061013T090000Z/20061013T100000Z -FREEBUSY:20061014T090000Z/20061014T100000Z -FREEBUSY:20061015T090000Z/20061015T100000Z -FREEBUSY:20061016T090000Z/20061016T100000Z -FREEBUSY:20061017T090000Z/20061017T100000Z -FREEBUSY:20061018T090000Z/20061018T100000Z -FREEBUSY:20061019T090000Z/20061019T100000Z -FREEBUSY:20061020T090000Z/20061020T100000Z -FREEBUSY:20061021T090000Z/20061021T100000Z -FREEBUSY:20061022T090000Z/20061022T100000Z -FREEBUSY:20061023T090000Z/20061023T100000Z -FREEBUSY:20061024T090000Z/20061024T100000Z -FREEBUSY:20061025T090000Z/20061025T100000Z -FREEBUSY:20061026T090000Z/20061026T100000Z -FREEBUSY:20061027T090000Z/20061027T100000Z -FREEBUSY:20061028T090000Z/20061028T100000Z -FREEBUSY:20061029T090000Z/20061029T100000Z -FREEBUSY:20061030T090000Z/20061030T100000Z -FREEBUSY:20061031T090000Z/20061031T100000Z -FREEBUSY:20061101T090000Z/20061101T100000Z -FREEBUSY:20061102T090000Z/20061102T100000Z -FREEBUSY:20061103T090000Z/20061103T100000Z -FREEBUSY:20061104T090000Z/20061104T100000Z -FREEBUSY:20061105T090000Z/20061105T100000Z -FREEBUSY:20061106T090000Z/20061106T100000Z -FREEBUSY:20061107T090000Z/20061107T100000Z -FREEBUSY:20061108T090000Z/20061108T100000Z -FREEBUSY:20061109T090000Z/20061109T100000Z -FREEBUSY:20061110T090000Z/20061110T100000Z -FREEBUSY:20061111T090000Z/20061111T100000Z -FREEBUSY:20061112T090000Z/20061112T100000Z -FREEBUSY:20061113T090000Z/20061113T100000Z -FREEBUSY:20061114T090000Z/20061114T100000Z -FREEBUSY:20061115T090000Z/20061115T100000Z -FREEBUSY:20061116T090000Z/20061116T100000Z -FREEBUSY:20061117T090000Z/20061117T100000Z -FREEBUSY:20061118T090000Z/20061118T100000Z -FREEBUSY:20061119T090000Z/20061119T100000Z -FREEBUSY:20061120T090000Z/20061120T100000Z -FREEBUSY:20061121T090000Z/20061121T100000Z -FREEBUSY:20061122T090000Z/20061122T100000Z -FREEBUSY:20061123T090000Z/20061123T100000Z -FREEBUSY:20061124T090000Z/20061124T100000Z -FREEBUSY:20061125T090000Z/20061125T100000Z -FREEBUSY:20061126T090000Z/20061126T100000Z -FREEBUSY:20061127T090000Z/20061127T100000Z -FREEBUSY:20061128T090000Z/20061128T100000Z -FREEBUSY:20061129T090000Z/20061129T100000Z -FREEBUSY:20061130T090000Z/20061130T100000Z -FREEBUSY:20061201T090000Z/20061201T100000Z -FREEBUSY:20061202T090000Z/20061202T100000Z -FREEBUSY:20061203T090000Z/20061203T100000Z -FREEBUSY:20061204T090000Z/20061204T100000Z -FREEBUSY:20061205T090000Z/20061205T100000Z -FREEBUSY:20061206T090000Z/20061206T100000Z -FREEBUSY:20061207T090000Z/20061207T100000Z -FREEBUSY:20061208T090000Z/20061208T100000Z -FREEBUSY:20061209T090000Z/20061209T100000Z -FREEBUSY:20061210T090000Z/20061210T100000Z -FREEBUSY:20061211T090000Z/20061211T100000Z -FREEBUSY:20061212T090000Z/20061212T100000Z -FREEBUSY:20061213T090000Z/20061213T100000Z -FREEBUSY:20061214T090000Z/20061214T100000Z -FREEBUSY:20061215T090000Z/20061215T100000Z -FREEBUSY:20061216T090000Z/20061216T100000Z -FREEBUSY:20061217T090000Z/20061217T100000Z -FREEBUSY:20061218T090000Z/20061218T100000Z -FREEBUSY:20061219T090000Z/20061219T100000Z -FREEBUSY:20061220T090000Z/20061220T100000Z -FREEBUSY:20061221T090000Z/20061221T100000Z -FREEBUSY:20061222T090000Z/20061222T100000Z -FREEBUSY:20061223T090000Z/20061223T100000Z -FREEBUSY:20061224T090000Z/20061224T100000Z -FREEBUSY:20061225T090000Z/20061225T100000Z -FREEBUSY:20061226T090000Z/20061226T100000Z -FREEBUSY:20061227T090000Z/20061227T100000Z -FREEBUSY:20061228T090000Z/20061228T100000Z -FREEBUSY:20061229T090000Z/20061229T100000Z -FREEBUSY:20061230T090000Z/20061230T100000Z -FREEBUSY:20061231T090000Z/20061231T100000Z -FREEBUSY:20070101T090000Z/20070101T100000Z -FREEBUSY:20070102T090000Z/20070102T100000Z -FREEBUSY:20070103T090000Z/20070103T100000Z -FREEBUSY:20070104T090000Z/20070104T100000Z -FREEBUSY:20070105T090000Z/20070105T100000Z -FREEBUSY:20070106T090000Z/20070106T100000Z -FREEBUSY:20070107T090000Z/20070107T100000Z -FREEBUSY:20070108T090000Z/20070108T100000Z -FREEBUSY:20070109T090000Z/20070109T100000Z -FREEBUSY:20070110T090000Z/20070110T100000Z -FREEBUSY:20070111T090000Z/20070111T100000Z -FREEBUSY:20070112T090000Z/20070112T100000Z -FREEBUSY:20070113T090000Z/20070113T100000Z -FREEBUSY:20070114T090000Z/20070114T100000Z -FREEBUSY:20070115T090000Z/20070115T100000Z -FREEBUSY:20070116T090000Z/20070116T100000Z -FREEBUSY:20070117T090000Z/20070117T100000Z -FREEBUSY:20070118T090000Z/20070118T100000Z -FREEBUSY:20070119T090000Z/20070119T100000Z -FREEBUSY:20070120T090000Z/20070120T100000Z -FREEBUSY:20070121T090000Z/20070121T100000Z -FREEBUSY:20070122T090000Z/20070122T100000Z -FREEBUSY:20070123T090000Z/20070123T100000Z -FREEBUSY:20070124T090000Z/20070124T100000Z -FREEBUSY:20070125T090000Z/20070125T100000Z -FREEBUSY:20070126T090000Z/20070126T100000Z -FREEBUSY:20070127T090000Z/20070127T100000Z -FREEBUSY:20070128T090000Z/20070128T100000Z -FREEBUSY:20070129T090000Z/20070129T100000Z -FREEBUSY:20070130T090000Z/20070130T100000Z -FREEBUSY:20070131T090000Z/20070131T100000Z -FREEBUSY:20070201T090000Z/20070201T100000Z -FREEBUSY:20070202T090000Z/20070202T100000Z -FREEBUSY:20070203T090000Z/20070203T100000Z -FREEBUSY:20070204T090000Z/20070204T100000Z -FREEBUSY:20070205T090000Z/20070205T100000Z -FREEBUSY:20070206T090000Z/20070206T100000Z -FREEBUSY:20070207T090000Z/20070207T100000Z -FREEBUSY:20070208T090000Z/20070208T100000Z -FREEBUSY:20070209T090000Z/20070209T100000Z -FREEBUSY:20070210T090000Z/20070210T100000Z -FREEBUSY:20070211T090000Z/20070211T100000Z -FREEBUSY:20070212T090000Z/20070212T100000Z -FREEBUSY:20070213T090000Z/20070213T100000Z -FREEBUSY:20070214T090000Z/20070214T100000Z -FREEBUSY:20070215T090000Z/20070215T100000Z -FREEBUSY:20070216T090000Z/20070216T100000Z -FREEBUSY:20070217T090000Z/20070217T100000Z -FREEBUSY:20070218T090000Z/20070218T100000Z -FREEBUSY:20070219T090000Z/20070219T100000Z -FREEBUSY:20070220T090000Z/20070220T100000Z -FREEBUSY:20070221T090000Z/20070221T100000Z -FREEBUSY:20070222T090000Z/20070222T100000Z -FREEBUSY:20070223T090000Z/20070223T100000Z -FREEBUSY:20070224T090000Z/20070224T100000Z -FREEBUSY:20070225T090000Z/20070225T100000Z -FREEBUSY:20070226T090000Z/20070226T100000Z -FREEBUSY:20070227T090000Z/20070227T100000Z -FREEBUSY:20070228T090000Z/20070228T100000Z -FREEBUSY:20070301T090000Z/20070301T100000Z -FREEBUSY:20070302T090000Z/20070302T100000Z -FREEBUSY:20070303T090000Z/20070303T100000Z -FREEBUSY:20070304T090000Z/20070304T100000Z -FREEBUSY:20070305T090000Z/20070305T100000Z -FREEBUSY:20070306T090000Z/20070306T100000Z -FREEBUSY:20070307T090000Z/20070307T100000Z -FREEBUSY:20070308T090000Z/20070308T100000Z -FREEBUSY:20070309T090000Z/20070309T100000Z -FREEBUSY:20070310T090000Z/20070310T100000Z -FREEBUSY:20070311T090000Z/20070311T100000Z -FREEBUSY:20070312T090000Z/20070312T100000Z -FREEBUSY:20070313T090000Z/20070313T100000Z -FREEBUSY:20070314T090000Z/20070314T100000Z -FREEBUSY:20070315T090000Z/20070315T100000Z -FREEBUSY:20070316T090000Z/20070316T100000Z -FREEBUSY:20070317T090000Z/20070317T100000Z -FREEBUSY:20070318T100000Z/20070318T110000Z -FREEBUSY:20070319T100000Z/20070319T110000Z -FREEBUSY:20070320T100000Z/20070320T110000Z -FREEBUSY:20070321T100000Z/20070321T110000Z -FREEBUSY:20070322T100000Z/20070322T110000Z -FREEBUSY:20070323T100000Z/20070323T110000Z -FREEBUSY:20070324T100000Z/20070324T110000Z -FREEBUSY:20070325T100000Z/20070325T110000Z -FREEBUSY:20070326T100000Z/20070326T110000Z -FREEBUSY:20070327T100000Z/20070327T110000Z -FREEBUSY:20070328T100000Z/20070328T110000Z -FREEBUSY:20070329T100000Z/20070329T110000Z -FREEBUSY:20070330T100000Z/20070330T110000Z -FREEBUSY:20070331T100000Z/20070331T110000Z -FREEBUSY:20070401T100000Z/20070401T110000Z -FREEBUSY:20070402T100000Z/20070402T110000Z -FREEBUSY:20070403T100000Z/20070403T110000Z -FREEBUSY:20070404T100000Z/20070404T110000Z -FREEBUSY:20070405T100000Z/20070405T110000Z -FREEBUSY:20070406T100000Z/20070406T110000Z -FREEBUSY:20070407T100000Z/20070407T110000Z -FREEBUSY:20070408T100000Z/20070408T110000Z -FREEBUSY:20070409T100000Z/20070409T110000Z -FREEBUSY:20070410T100000Z/20070410T110000Z -FREEBUSY:20070411T100000Z/20070411T110000Z -FREEBUSY:20070412T100000Z/20070412T110000Z -FREEBUSY:20070413T100000Z/20070413T110000Z -FREEBUSY:20070414T100000Z/20070414T110000Z -FREEBUSY:20070415T100000Z/20070415T110000Z -FREEBUSY:20070416T100000Z/20070416T110000Z -FREEBUSY:20070417T100000Z/20070417T110000Z -FREEBUSY:20070418T100000Z/20070418T110000Z -FREEBUSY:20070419T100000Z/20070419T110000Z -FREEBUSY:20070420T100000Z/20070420T110000Z -FREEBUSY:20070421T100000Z/20070421T110000Z -FREEBUSY:20070422T100000Z/20070422T110000Z -FREEBUSY:20070423T100000Z/20070423T110000Z -FREEBUSY:20070424T100000Z/20070424T110000Z -FREEBUSY:20070425T100000Z/20070425T110000Z -FREEBUSY:20070426T100000Z/20070426T110000Z -FREEBUSY:20070427T100000Z/20070427T110000Z -FREEBUSY:20070428T100000Z/20070428T110000Z -FREEBUSY:20070429T100000Z/20070429T110000Z -FREEBUSY:20070430T100000Z/20070430T110000Z -FREEBUSY:20070501T100000Z/20070501T110000Z -FREEBUSY:20070502T100000Z/20070502T110000Z -FREEBUSY:20070503T100000Z/20070503T110000Z -FREEBUSY:20070504T100000Z/20070504T110000Z -FREEBUSY:20070505T100000Z/20070505T110000Z -FREEBUSY:20070506T100000Z/20070506T110000Z -FREEBUSY:20070507T100000Z/20070507T110000Z -FREEBUSY:20070508T100000Z/20070508T110000Z -FREEBUSY:20070509T100000Z/20070509T110000Z -FREEBUSY:20070510T100000Z/20070510T110000Z -FREEBUSY:20070511T100000Z/20070511T110000Z -FREEBUSY:20070512T100000Z/20070512T110000Z -FREEBUSY:20070513T100000Z/20070513T110000Z -FREEBUSY:20070514T100000Z/20070514T110000Z -FREEBUSY:20070515T100000Z/20070515T110000Z -FREEBUSY:20070516T100000Z/20070516T110000Z -FREEBUSY:20070517T100000Z/20070517T110000Z -FREEBUSY:20070518T100000Z/20070518T110000Z -FREEBUSY:20070519T100000Z/20070519T110000Z -FREEBUSY:20070520T100000Z/20070520T110000Z -FREEBUSY:20070521T100000Z/20070521T110000Z -FREEBUSY:20070522T100000Z/20070522T110000Z -FREEBUSY:20070523T100000Z/20070523T110000Z -FREEBUSY:20070524T100000Z/20070524T110000Z -FREEBUSY:20070525T100000Z/20070525T110000Z -FREEBUSY:20070526T100000Z/20070526T110000Z -FREEBUSY:20070527T100000Z/20070527T110000Z -FREEBUSY:20070528T100000Z/20070528T110000Z -FREEBUSY:20070529T100000Z/20070529T110000Z -FREEBUSY:20070530T100000Z/20070530T110000Z -FREEBUSY:20070531T100000Z/20070531T110000Z -FREEBUSY:20070601T100000Z/20070601T110000Z -FREEBUSY:20070602T100000Z/20070602T110000Z -FREEBUSY:20070603T100000Z/20070603T110000Z -FREEBUSY:20070604T100000Z/20070604T110000Z -FREEBUSY:20070605T100000Z/20070605T110000Z -FREEBUSY:20070606T100000Z/20070606T110000Z -FREEBUSY:20070607T100000Z/20070607T110000Z -FREEBUSY:20070608T100000Z/20070608T110000Z -FREEBUSY:20070609T100000Z/20070609T110000Z -FREEBUSY:20070610T100000Z/20070610T110000Z -FREEBUSY:20070611T100000Z/20070611T110000Z -FREEBUSY:20070612T100000Z/20070612T110000Z -FREEBUSY:20070613T100000Z/20070613T110000Z -FREEBUSY:20070614T100000Z/20070614T110000Z -FREEBUSY:20070615T100000Z/20070615T110000Z -FREEBUSY:20070616T100000Z/20070616T110000Z -FREEBUSY:20070617T100000Z/20070617T110000Z -FREEBUSY:20070618T100000Z/20070618T110000Z -FREEBUSY:20070619T100000Z/20070619T110000Z -FREEBUSY:20070620T100000Z/20070620T110000Z -FREEBUSY:20070621T100000Z/20070621T110000Z -FREEBUSY:20070622T100000Z/20070622T110000Z -FREEBUSY:20070623T100000Z/20070623T110000Z -FREEBUSY:20070624T100000Z/20070624T110000Z -FREEBUSY:20070625T100000Z/20070625T110000Z -FREEBUSY:20070626T100000Z/20070626T110000Z -FREEBUSY:20070627T100000Z/20070627T110000Z -FREEBUSY:20070628T100000Z/20070628T110000Z -FREEBUSY:20070629T100000Z/20070629T110000Z -FREEBUSY:20070630T100000Z/20070630T110000Z -END:VFREEBUSY +FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z +FREEBUSY:20061101T233000Z/20061102T003000Z +FREEBUSY:20061031T210000Z/20061031T220000Z +FREEBUSY:20061101T210000Z/20061101T090000Z +FREEBUSY:20061109T080000Z/20061109T090000Z +FREEBUSY:20061116T080000Z/20061116T090000Z +FREEBUSY:20061123T080000Z/20061123T090000Z +FREEBUSY:20061130T080000Z/20061130T090000Z +FREEBUSY:20061207T080000Z/20061207T090000Z +FREEBUSY:20061214T080000Z/20061214T090000Z +FREEBUSY:20061221T080000Z/20061221T090000Z +FREEBUSY:20061228T080000Z/20061228T090000Z +FREEBUSY:20070104T080000Z/20070104T090000Z +FREEBUSY:20070111T080000Z/20070111T090000Z +FREEBUSY:20070118T080000Z/20070118T090000Z +FREEBUSY:20070125T080000Z/20070125T090000Z +FREEBUSY:20070201T080000Z/20070201T090000Z +FREEBUSY:20070208T080000Z/20070208T090000Z +FREEBUSY:20070215T080000Z/20070215T090000Z +FREEBUSY:20070222T080000Z/20070222T090000Z +FREEBUSY:20070301T080000Z/20070301T090000Z +FREEBUSY:20070308T080000Z/20070308T090000Z +FREEBUSY:20070315T080000Z/20070315T090000Z +FREEBUSY:20070322T090000Z/20070322T100000Z +FREEBUSY:20070329T090000Z/20070329T100000Z +FREEBUSY:20070405T090000Z/20070405T100000Z +FREEBUSY:20070412T090000Z/20070412T100000Z +FREEBUSY:20070419T090000Z/20070419T100000Z +FREEBUSY:20070426T090000Z/20070426T100000Z +FREEBUSY:20061223T030000Z/20061223T050000Z +FREEBUSY:20061103T030000Z/20061102T154500Z +FREEBUSY:20061116T140000Z/20061116T154500Z +FREEBUSY:20061130T140000Z/20061130T154500Z +FREEBUSY:20061214T140000Z/20061214T154500Z +FREEBUSY:20061228T140000Z/20061228T154500Z +FREEBUSY:20070111T140000Z/20070111T154500Z +FREEBUSY:20070125T140000Z/20070125T154500Z +FREEBUSY:20070208T140000Z/20070208T154500Z +FREEBUSY:20070222T140000Z/20070222T154500Z +FREEBUSY:20070308T140000Z/20070308T154500Z +FREEBUSY:20070322T150000Z/20070322T164500Z +FREEBUSY:20070405T150000Z/20070405T164500Z +FREEBUSY:20070419T150000Z/20070419T164500Z +FREEBUSY:20070503T150000Z/20070503T164500Z +FREEBUSY:20070517T150000Z/20070517T164500Z +FREEBUSY:20070531T150000Z/20070531T164500Z +FREEBUSY:20070614T150000Z/20070614T164500Z +FREEBUSY:20070628T150000Z/20070628T164500Z +FREEBUSY:20061102T183000Z/20061102T073000Z +FREEBUSY:20061202T053000Z/20061202T073000Z +FREEBUSY:20070102T053000Z/20070102T073000Z +FREEBUSY:20070202T053000Z/20070202T073000Z +FREEBUSY:20070302T053000Z/20070302T073000Z +FREEBUSY:20070402T063000Z/20070402T083000Z +FREEBUSY:20070502T063000Z/20070502T083000Z +FREEBUSY:20070602T063000Z/20070602T083000Z +FREEBUSY:20061001T090000Z/20061001T100000Z +FREEBUSY:20061002T090000Z/20061002T100000Z +FREEBUSY:20061003T090000Z/20061003T100000Z +FREEBUSY:20061004T090000Z/20061004T100000Z +FREEBUSY:20061005T090000Z/20061005T100000Z +FREEBUSY:20061006T090000Z/20061006T100000Z +FREEBUSY:20061007T090000Z/20061007T100000Z +FREEBUSY:20061008T090000Z/20061008T100000Z +FREEBUSY:20061009T090000Z/20061009T100000Z +FREEBUSY:20061010T090000Z/20061010T100000Z +FREEBUSY:20061011T090000Z/20061011T100000Z +FREEBUSY:20061012T090000Z/20061012T100000Z +FREEBUSY:20061013T090000Z/20061013T100000Z +FREEBUSY:20061014T090000Z/20061014T100000Z +FREEBUSY:20061015T090000Z/20061015T100000Z +FREEBUSY:20061016T090000Z/20061016T100000Z +FREEBUSY:20061017T090000Z/20061017T100000Z +FREEBUSY:20061018T090000Z/20061018T100000Z +FREEBUSY:20061019T090000Z/20061019T100000Z +FREEBUSY:20061020T090000Z/20061020T100000Z +FREEBUSY:20061021T090000Z/20061021T100000Z +FREEBUSY:20061022T090000Z/20061022T100000Z +FREEBUSY:20061023T090000Z/20061023T100000Z +FREEBUSY:20061024T090000Z/20061024T100000Z +FREEBUSY:20061025T090000Z/20061025T100000Z +FREEBUSY:20061026T090000Z/20061026T100000Z +FREEBUSY:20061027T090000Z/20061027T100000Z +FREEBUSY:20061028T090000Z/20061028T100000Z +FREEBUSY:20061029T090000Z/20061029T100000Z +FREEBUSY:20061030T090000Z/20061030T100000Z +FREEBUSY:20061031T090000Z/20061031T100000Z +FREEBUSY:20061101T090000Z/20061101T100000Z +FREEBUSY:20061102T090000Z/20061102T100000Z +FREEBUSY:20061103T090000Z/20061103T100000Z +FREEBUSY:20061104T090000Z/20061104T100000Z +FREEBUSY:20061105T090000Z/20061105T100000Z +FREEBUSY:20061106T090000Z/20061106T100000Z +FREEBUSY:20061107T090000Z/20061107T100000Z +FREEBUSY:20061108T090000Z/20061108T100000Z +FREEBUSY:20061109T090000Z/20061109T100000Z +FREEBUSY:20061110T090000Z/20061110T100000Z +FREEBUSY:20061111T090000Z/20061111T100000Z +FREEBUSY:20061112T090000Z/20061112T100000Z +FREEBUSY:20061113T090000Z/20061113T100000Z +FREEBUSY:20061114T090000Z/20061114T100000Z +FREEBUSY:20061115T090000Z/20061115T100000Z +FREEBUSY:20061116T090000Z/20061116T100000Z +FREEBUSY:20061117T090000Z/20061117T100000Z +FREEBUSY:20061118T090000Z/20061118T100000Z +FREEBUSY:20061119T090000Z/20061119T100000Z +FREEBUSY:20061120T090000Z/20061120T100000Z +FREEBUSY:20061121T090000Z/20061121T100000Z +FREEBUSY:20061122T090000Z/20061122T100000Z +FREEBUSY:20061123T090000Z/20061123T100000Z +FREEBUSY:20061124T090000Z/20061124T100000Z +FREEBUSY:20061125T090000Z/20061125T100000Z +FREEBUSY:20061126T090000Z/20061126T100000Z +FREEBUSY:20061127T090000Z/20061127T100000Z +FREEBUSY:20061128T090000Z/20061128T100000Z +FREEBUSY:20061129T090000Z/20061129T100000Z +FREEBUSY:20061130T090000Z/20061130T100000Z +FREEBUSY:20061201T090000Z/20061201T100000Z +FREEBUSY:20061202T090000Z/20061202T100000Z +FREEBUSY:20061203T090000Z/20061203T100000Z +FREEBUSY:20061204T090000Z/20061204T100000Z +FREEBUSY:20061205T090000Z/20061205T100000Z +FREEBUSY:20061206T090000Z/20061206T100000Z +FREEBUSY:20061207T090000Z/20061207T100000Z +FREEBUSY:20061208T090000Z/20061208T100000Z +FREEBUSY:20061209T090000Z/20061209T100000Z +FREEBUSY:20061210T090000Z/20061210T100000Z +FREEBUSY:20061211T090000Z/20061211T100000Z +FREEBUSY:20061212T090000Z/20061212T100000Z +FREEBUSY:20061213T090000Z/20061213T100000Z +FREEBUSY:20061214T090000Z/20061214T100000Z +FREEBUSY:20061215T090000Z/20061215T100000Z +FREEBUSY:20061216T090000Z/20061216T100000Z +FREEBUSY:20061217T090000Z/20061217T100000Z +FREEBUSY:20061218T090000Z/20061218T100000Z +FREEBUSY:20061219T090000Z/20061219T100000Z +FREEBUSY:20061220T090000Z/20061220T100000Z +FREEBUSY:20061221T090000Z/20061221T100000Z +FREEBUSY:20061222T090000Z/20061222T100000Z +FREEBUSY:20061223T090000Z/20061223T100000Z +FREEBUSY:20061224T090000Z/20061224T100000Z +FREEBUSY:20061225T090000Z/20061225T100000Z +FREEBUSY:20061226T090000Z/20061226T100000Z +FREEBUSY:20061227T090000Z/20061227T100000Z +FREEBUSY:20061228T090000Z/20061228T100000Z +FREEBUSY:20061229T090000Z/20061229T100000Z +FREEBUSY:20061230T090000Z/20061230T100000Z +FREEBUSY:20061231T090000Z/20061231T100000Z +FREEBUSY:20070101T090000Z/20070101T100000Z +FREEBUSY:20070102T090000Z/20070102T100000Z +FREEBUSY:20070103T090000Z/20070103T100000Z +FREEBUSY:20070104T090000Z/20070104T100000Z +FREEBUSY:20070105T090000Z/20070105T100000Z +FREEBUSY:20070106T090000Z/20070106T100000Z +FREEBUSY:20070107T090000Z/20070107T100000Z +FREEBUSY:20070108T090000Z/20070108T100000Z +FREEBUSY:20070109T090000Z/20070109T100000Z +FREEBUSY:20070110T090000Z/20070110T100000Z +FREEBUSY:20070111T090000Z/20070111T100000Z +FREEBUSY:20070112T090000Z/20070112T100000Z +FREEBUSY:20070113T090000Z/20070113T100000Z +FREEBUSY:20070114T090000Z/20070114T100000Z +FREEBUSY:20070115T090000Z/20070115T100000Z +FREEBUSY:20070116T090000Z/20070116T100000Z +FREEBUSY:20070117T090000Z/20070117T100000Z +FREEBUSY:20070118T090000Z/20070118T100000Z +FREEBUSY:20070119T090000Z/20070119T100000Z +FREEBUSY:20070120T090000Z/20070120T100000Z +FREEBUSY:20070121T090000Z/20070121T100000Z +FREEBUSY:20070122T090000Z/20070122T100000Z +FREEBUSY:20070123T090000Z/20070123T100000Z +FREEBUSY:20070124T090000Z/20070124T100000Z +FREEBUSY:20070125T090000Z/20070125T100000Z +FREEBUSY:20070126T090000Z/20070126T100000Z +FREEBUSY:20070127T090000Z/20070127T100000Z +FREEBUSY:20070128T090000Z/20070128T100000Z +FREEBUSY:20070129T090000Z/20070129T100000Z +FREEBUSY:20070130T090000Z/20070130T100000Z +FREEBUSY:20070131T090000Z/20070131T100000Z +FREEBUSY:20070201T090000Z/20070201T100000Z +FREEBUSY:20070202T090000Z/20070202T100000Z +FREEBUSY:20070203T090000Z/20070203T100000Z +FREEBUSY:20070204T090000Z/20070204T100000Z +FREEBUSY:20070205T090000Z/20070205T100000Z +FREEBUSY:20070206T090000Z/20070206T100000Z +FREEBUSY:20070207T090000Z/20070207T100000Z +FREEBUSY:20070208T090000Z/20070208T100000Z +FREEBUSY:20070209T090000Z/20070209T100000Z +FREEBUSY:20070210T090000Z/20070210T100000Z +FREEBUSY:20070211T090000Z/20070211T100000Z +FREEBUSY:20070212T090000Z/20070212T100000Z +FREEBUSY:20070213T090000Z/20070213T100000Z +FREEBUSY:20070214T090000Z/20070214T100000Z +FREEBUSY:20070215T090000Z/20070215T100000Z +FREEBUSY:20070216T090000Z/20070216T100000Z +FREEBUSY:20070217T090000Z/20070217T100000Z +FREEBUSY:20070218T090000Z/20070218T100000Z +FREEBUSY:20070219T090000Z/20070219T100000Z +FREEBUSY:20070220T090000Z/20070220T100000Z +FREEBUSY:20070221T090000Z/20070221T100000Z +FREEBUSY:20070222T090000Z/20070222T100000Z +FREEBUSY:20070223T090000Z/20070223T100000Z +FREEBUSY:20070224T090000Z/20070224T100000Z +FREEBUSY:20070225T090000Z/20070225T100000Z +FREEBUSY:20070226T090000Z/20070226T100000Z +FREEBUSY:20070227T090000Z/20070227T100000Z +FREEBUSY:20070228T090000Z/20070228T100000Z +FREEBUSY:20070301T090000Z/20070301T100000Z +FREEBUSY:20070302T090000Z/20070302T100000Z +FREEBUSY:20070303T090000Z/20070303T100000Z +FREEBUSY:20070304T090000Z/20070304T100000Z +FREEBUSY:20070305T090000Z/20070305T100000Z +FREEBUSY:20070306T090000Z/20070306T100000Z +FREEBUSY:20070307T090000Z/20070307T100000Z +FREEBUSY:20070308T090000Z/20070308T100000Z +FREEBUSY:20070309T090000Z/20070309T100000Z +FREEBUSY:20070310T090000Z/20070310T100000Z +FREEBUSY:20070311T090000Z/20070311T100000Z +FREEBUSY:20070312T090000Z/20070312T100000Z +FREEBUSY:20070313T090000Z/20070313T100000Z +FREEBUSY:20070314T090000Z/20070314T100000Z +FREEBUSY:20070315T090000Z/20070315T100000Z +FREEBUSY:20070316T090000Z/20070316T100000Z +FREEBUSY:20070317T090000Z/20070317T100000Z +FREEBUSY:20070318T100000Z/20070318T110000Z +FREEBUSY:20070319T100000Z/20070319T110000Z +FREEBUSY:20070320T100000Z/20070320T110000Z +FREEBUSY:20070321T100000Z/20070321T110000Z +FREEBUSY:20070322T100000Z/20070322T110000Z +FREEBUSY:20070323T100000Z/20070323T110000Z +FREEBUSY:20070324T100000Z/20070324T110000Z +FREEBUSY:20070325T100000Z/20070325T110000Z +FREEBUSY:20070326T100000Z/20070326T110000Z +FREEBUSY:20070327T100000Z/20070327T110000Z +FREEBUSY:20070328T100000Z/20070328T110000Z +FREEBUSY:20070329T100000Z/20070329T110000Z +FREEBUSY:20070330T100000Z/20070330T110000Z +FREEBUSY:20070331T100000Z/20070331T110000Z +FREEBUSY:20070401T100000Z/20070401T110000Z +FREEBUSY:20070402T100000Z/20070402T110000Z +FREEBUSY:20070403T100000Z/20070403T110000Z +FREEBUSY:20070404T100000Z/20070404T110000Z +FREEBUSY:20070405T100000Z/20070405T110000Z +FREEBUSY:20070406T100000Z/20070406T110000Z +FREEBUSY:20070407T100000Z/20070407T110000Z +FREEBUSY:20070408T100000Z/20070408T110000Z +FREEBUSY:20070409T100000Z/20070409T110000Z +FREEBUSY:20070410T100000Z/20070410T110000Z +FREEBUSY:20070411T100000Z/20070411T110000Z +FREEBUSY:20070412T100000Z/20070412T110000Z +FREEBUSY:20070413T100000Z/20070413T110000Z +FREEBUSY:20070414T100000Z/20070414T110000Z +FREEBUSY:20070415T100000Z/20070415T110000Z +FREEBUSY:20070416T100000Z/20070416T110000Z +FREEBUSY:20070417T100000Z/20070417T110000Z +FREEBUSY:20070418T100000Z/20070418T110000Z +FREEBUSY:20070419T100000Z/20070419T110000Z +FREEBUSY:20070420T100000Z/20070420T110000Z +FREEBUSY:20070421T100000Z/20070421T110000Z +FREEBUSY:20070422T100000Z/20070422T110000Z +FREEBUSY:20070423T100000Z/20070423T110000Z +FREEBUSY:20070424T100000Z/20070424T110000Z +FREEBUSY:20070425T100000Z/20070425T110000Z +FREEBUSY:20070426T100000Z/20070426T110000Z +FREEBUSY:20070427T100000Z/20070427T110000Z +FREEBUSY:20070428T100000Z/20070428T110000Z +FREEBUSY:20070429T100000Z/20070429T110000Z +FREEBUSY:20070430T100000Z/20070430T110000Z +FREEBUSY:20070501T100000Z/20070501T110000Z +FREEBUSY:20070502T100000Z/20070502T110000Z +FREEBUSY:20070503T100000Z/20070503T110000Z +FREEBUSY:20070504T100000Z/20070504T110000Z +FREEBUSY:20070505T100000Z/20070505T110000Z +FREEBUSY:20070506T100000Z/20070506T110000Z +FREEBUSY:20070507T100000Z/20070507T110000Z +FREEBUSY:20070508T100000Z/20070508T110000Z +FREEBUSY:20070509T100000Z/20070509T110000Z +FREEBUSY:20070510T100000Z/20070510T110000Z +FREEBUSY:20070511T100000Z/20070511T110000Z +FREEBUSY:20070512T100000Z/20070512T110000Z +FREEBUSY:20070513T100000Z/20070513T110000Z +FREEBUSY:20070514T100000Z/20070514T110000Z +FREEBUSY:20070515T100000Z/20070515T110000Z +FREEBUSY:20070516T100000Z/20070516T110000Z +FREEBUSY:20070517T100000Z/20070517T110000Z +FREEBUSY:20070518T100000Z/20070518T110000Z +FREEBUSY:20070519T100000Z/20070519T110000Z +FREEBUSY:20070520T100000Z/20070520T110000Z +FREEBUSY:20070521T100000Z/20070521T110000Z +FREEBUSY:20070522T100000Z/20070522T110000Z +FREEBUSY:20070523T100000Z/20070523T110000Z +FREEBUSY:20070524T100000Z/20070524T110000Z +FREEBUSY:20070525T100000Z/20070525T110000Z +FREEBUSY:20070526T100000Z/20070526T110000Z +FREEBUSY:20070527T100000Z/20070527T110000Z +FREEBUSY:20070528T100000Z/20070528T110000Z +FREEBUSY:20070529T100000Z/20070529T110000Z +FREEBUSY:20070530T100000Z/20070530T110000Z +FREEBUSY:20070531T100000Z/20070531T110000Z +FREEBUSY:20070601T100000Z/20070601T110000Z +FREEBUSY:20070602T100000Z/20070602T110000Z +FREEBUSY:20070603T100000Z/20070603T110000Z +FREEBUSY:20070604T100000Z/20070604T110000Z +FREEBUSY:20070605T100000Z/20070605T110000Z +FREEBUSY:20070606T100000Z/20070606T110000Z +FREEBUSY:20070607T100000Z/20070607T110000Z +FREEBUSY:20070608T100000Z/20070608T110000Z +FREEBUSY:20070609T100000Z/20070609T110000Z +FREEBUSY:20070610T100000Z/20070610T110000Z +FREEBUSY:20070611T100000Z/20070611T110000Z +FREEBUSY:20070612T100000Z/20070612T110000Z +FREEBUSY:20070613T100000Z/20070613T110000Z +FREEBUSY:20070614T100000Z/20070614T110000Z +FREEBUSY:20070615T100000Z/20070615T110000Z +FREEBUSY:20070616T100000Z/20070616T110000Z +FREEBUSY:20070617T100000Z/20070617T110000Z +FREEBUSY:20070618T100000Z/20070618T110000Z +FREEBUSY:20070619T100000Z/20070619T110000Z +FREEBUSY:20070620T100000Z/20070620T110000Z +FREEBUSY:20070621T100000Z/20070621T110000Z +FREEBUSY:20070622T100000Z/20070622T110000Z +FREEBUSY:20070623T100000Z/20070623T110000Z +FREEBUSY:20070624T100000Z/20070624T110000Z +FREEBUSY:20070625T100000Z/20070625T110000Z +FREEBUSY:20070626T100000Z/20070626T110000Z +FREEBUSY:20070627T100000Z/20070627T110000Z +FREEBUSY:20070628T100000Z/20070628T110000Z +FREEBUSY:20070629T100000Z/20070629T110000Z +FREEBUSY:20070630T100000Z/20070630T110000Z +END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/832-freebusy.test b/testing/tests/regression-suite/832-freebusy.test index 959cf9f3..45ad3f5a 100644 --- a/testing/tests/regression-suite/832-freebusy.test +++ b/testing/tests/regression-suite/832-freebusy.test @@ -5,7 +5,7 @@ TYPE=GET URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959 HEAD -REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/ -REPLACE=/^DTSTART:20060930T120000Z$/DTSTART:correct/ -REPLACE=/^DTEND:20070630T115959Z$/DTEND:correct/ +REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ +REPLACE=/^DTSTART:20060930T120000Z\r?$/DTSTART:correct/ +REPLACE=/^DTEND:20070630T115959Z\r?$/DTEND:correct/ diff --git a/testing/tests/regression-suite/833-freebusy.result b/testing/tests/regression-suite/833-freebusy.result index 6c3732ba..122a5455 100644 --- a/testing/tests/regression-suite/833-freebusy.result +++ b/testing/tests/regression-suite/833-freebusy.result @@ -1,70 +1,71 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 2627 +Content-Length: 2708 Content-Type: text/calendar BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 -BEGIN:VFREEBUSY +CALSCALE:GREGORIAN +BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ -DTSTART:20061001T000000Z -DTEND:20070630T235959Z -FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z -FREEBUSY:20061101T233000Z/20061102T003000Z -FREEBUSY:20061031T210000Z/20061031T220000Z -FREEBUSY:20061101T210000Z/20061101T090000Z -FREEBUSY:20061109T080000Z/20061109T090000Z -FREEBUSY:20061116T080000Z/20061116T090000Z -FREEBUSY:20061123T080000Z/20061123T090000Z -FREEBUSY:20061130T080000Z/20061130T090000Z -FREEBUSY:20061207T080000Z/20061207T090000Z -FREEBUSY:20061214T080000Z/20061214T090000Z -FREEBUSY:20061221T080000Z/20061221T090000Z -FREEBUSY:20061228T080000Z/20061228T090000Z -FREEBUSY:20070104T080000Z/20070104T090000Z -FREEBUSY:20070111T080000Z/20070111T090000Z -FREEBUSY:20070118T080000Z/20070118T090000Z -FREEBUSY:20070125T080000Z/20070125T090000Z -FREEBUSY:20070201T080000Z/20070201T090000Z -FREEBUSY:20070208T080000Z/20070208T090000Z -FREEBUSY:20070215T080000Z/20070215T090000Z -FREEBUSY:20070222T080000Z/20070222T090000Z -FREEBUSY:20070301T080000Z/20070301T090000Z -FREEBUSY:20070308T080000Z/20070308T090000Z -FREEBUSY:20070315T080000Z/20070315T090000Z -FREEBUSY:20070322T090000Z/20070322T100000Z -FREEBUSY:20070329T090000Z/20070329T100000Z -FREEBUSY:20070405T090000Z/20070405T100000Z -FREEBUSY:20070412T090000Z/20070412T100000Z -FREEBUSY:20070419T090000Z/20070419T100000Z -FREEBUSY:20070426T090000Z/20070426T100000Z -FREEBUSY:20061223T030000Z/20061223T050000Z -FREEBUSY:20061103T030000Z/20061102T154500Z -FREEBUSY:20061116T140000Z/20061116T154500Z -FREEBUSY:20061130T140000Z/20061130T154500Z -FREEBUSY:20061214T140000Z/20061214T154500Z -FREEBUSY:20061228T140000Z/20061228T154500Z -FREEBUSY:20070111T140000Z/20070111T154500Z -FREEBUSY:20070125T140000Z/20070125T154500Z -FREEBUSY:20070208T140000Z/20070208T154500Z -FREEBUSY:20070222T140000Z/20070222T154500Z -FREEBUSY:20070308T140000Z/20070308T154500Z -FREEBUSY:20070322T150000Z/20070322T164500Z -FREEBUSY:20070405T150000Z/20070405T164500Z -FREEBUSY:20070419T150000Z/20070419T164500Z -FREEBUSY:20070503T150000Z/20070503T164500Z -FREEBUSY:20070517T150000Z/20070517T164500Z -FREEBUSY:20070531T150000Z/20070531T164500Z -FREEBUSY:20070614T150000Z/20070614T164500Z -FREEBUSY:20070628T150000Z/20070628T164500Z -FREEBUSY:20061102T183000Z/20061102T073000Z -FREEBUSY:20061202T053000Z/20061202T073000Z -FREEBUSY:20070102T053000Z/20070102T073000Z -FREEBUSY:20070202T053000Z/20070202T073000Z -FREEBUSY:20070302T053000Z/20070302T073000Z -FREEBUSY:20070402T063000Z/20070402T083000Z -FREEBUSY:20070502T063000Z/20070502T083000Z -FREEBUSY:20070602T063000Z/20070602T083000Z -END:VFREEBUSY +DTSTART:20061001T000000Z +DTEND:20070630T235959Z +FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z +FREEBUSY:20061101T233000Z/20061102T003000Z +FREEBUSY:20061031T210000Z/20061031T220000Z +FREEBUSY:20061101T210000Z/20061101T090000Z +FREEBUSY:20061109T080000Z/20061109T090000Z +FREEBUSY:20061116T080000Z/20061116T090000Z +FREEBUSY:20061123T080000Z/20061123T090000Z +FREEBUSY:20061130T080000Z/20061130T090000Z +FREEBUSY:20061207T080000Z/20061207T090000Z +FREEBUSY:20061214T080000Z/20061214T090000Z +FREEBUSY:20061221T080000Z/20061221T090000Z +FREEBUSY:20061228T080000Z/20061228T090000Z +FREEBUSY:20070104T080000Z/20070104T090000Z +FREEBUSY:20070111T080000Z/20070111T090000Z +FREEBUSY:20070118T080000Z/20070118T090000Z +FREEBUSY:20070125T080000Z/20070125T090000Z +FREEBUSY:20070201T080000Z/20070201T090000Z +FREEBUSY:20070208T080000Z/20070208T090000Z +FREEBUSY:20070215T080000Z/20070215T090000Z +FREEBUSY:20070222T080000Z/20070222T090000Z +FREEBUSY:20070301T080000Z/20070301T090000Z +FREEBUSY:20070308T080000Z/20070308T090000Z +FREEBUSY:20070315T080000Z/20070315T090000Z +FREEBUSY:20070322T090000Z/20070322T100000Z +FREEBUSY:20070329T090000Z/20070329T100000Z +FREEBUSY:20070405T090000Z/20070405T100000Z +FREEBUSY:20070412T090000Z/20070412T100000Z +FREEBUSY:20070419T090000Z/20070419T100000Z +FREEBUSY:20070426T090000Z/20070426T100000Z +FREEBUSY:20061223T030000Z/20061223T050000Z +FREEBUSY:20061103T030000Z/20061102T154500Z +FREEBUSY:20061116T140000Z/20061116T154500Z +FREEBUSY:20061130T140000Z/20061130T154500Z +FREEBUSY:20061214T140000Z/20061214T154500Z +FREEBUSY:20061228T140000Z/20061228T154500Z +FREEBUSY:20070111T140000Z/20070111T154500Z +FREEBUSY:20070125T140000Z/20070125T154500Z +FREEBUSY:20070208T140000Z/20070208T154500Z +FREEBUSY:20070222T140000Z/20070222T154500Z +FREEBUSY:20070308T140000Z/20070308T154500Z +FREEBUSY:20070322T150000Z/20070322T164500Z +FREEBUSY:20070405T150000Z/20070405T164500Z +FREEBUSY:20070419T150000Z/20070419T164500Z +FREEBUSY:20070503T150000Z/20070503T164500Z +FREEBUSY:20070517T150000Z/20070517T164500Z +FREEBUSY:20070531T150000Z/20070531T164500Z +FREEBUSY:20070614T150000Z/20070614T164500Z +FREEBUSY:20070628T150000Z/20070628T164500Z +FREEBUSY:20061102T183000Z/20061102T073000Z +FREEBUSY:20061202T053000Z/20061202T073000Z +FREEBUSY:20070102T053000Z/20070102T073000Z +FREEBUSY:20070202T053000Z/20070202T073000Z +FREEBUSY:20070302T053000Z/20070302T073000Z +FREEBUSY:20070402T063000Z/20070402T083000Z +FREEBUSY:20070502T063000Z/20070502T083000Z +FREEBUSY:20070602T063000Z/20070602T083000Z +END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/833-freebusy.test b/testing/tests/regression-suite/833-freebusy.test index d4fa08c3..d10dbea6 100644 --- a/testing/tests/regression-suite/833-freebusy.test +++ b/testing/tests/regression-suite/833-freebusy.test @@ -5,4 +5,4 @@ TYPE=GET URL=http://mycaldav/freebusy.php/user1/home/?start=20061001T000000Z&end=20070630T235959Z HEAD -REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/ +REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ diff --git a/testing/tests/regression-suite/835-freebusy.result b/testing/tests/regression-suite/835-freebusy.result index ebf398f0..bdcb8a03 100644 --- a/testing/tests/regression-suite/835-freebusy.result +++ b/testing/tests/regression-suite/835-freebusy.result @@ -1,14 +1,15 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 191 +Content-Length: 216 Content-Type: text/calendar BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 -BEGIN:VFREEBUSY +CALSCALE:GREGORIAN +BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ -DTSTART:20060930T120000Z -DURATION:P4WT12H -END:VFREEBUSY +DTSTART:20060930T120000Z +DURATION:P4WT12H +END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/835-freebusy.test b/testing/tests/regression-suite/835-freebusy.test index 7528f02e..84c5574d 100644 --- a/testing/tests/regression-suite/835-freebusy.test +++ b/testing/tests/regression-suite/835-freebusy.test @@ -7,4 +7,4 @@ HEAD AUTH=manager1:manager1 -REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/ +REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ diff --git a/testing/tests/regression-suite/836-freebusy.result b/testing/tests/regression-suite/836-freebusy.result index a3ab4dff..aa3990bc 100644 --- a/testing/tests/regression-suite/836-freebusy.result +++ b/testing/tests/regression-suite/836-freebusy.result @@ -1,343 +1,344 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 14366 +Content-Length: 14720 Content-Type: text/calendar BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 -BEGIN:VFREEBUSY +CALSCALE:GREGORIAN +BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ -DTSTART:20060930T120000Z -DTEND:20070630T115959Z -FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z -FREEBUSY:20061101T233000Z/20061102T003000Z -FREEBUSY:20061031T210000Z/20061031T220000Z -FREEBUSY:20061101T210000Z/20061101T090000Z -FREEBUSY:20061109T080000Z/20061109T090000Z -FREEBUSY:20061116T080000Z/20061116T090000Z -FREEBUSY:20061123T080000Z/20061123T090000Z -FREEBUSY:20061130T080000Z/20061130T090000Z -FREEBUSY:20061207T080000Z/20061207T090000Z -FREEBUSY:20061214T080000Z/20061214T090000Z -FREEBUSY:20061221T080000Z/20061221T090000Z -FREEBUSY:20061228T080000Z/20061228T090000Z -FREEBUSY:20070104T080000Z/20070104T090000Z -FREEBUSY:20070111T080000Z/20070111T090000Z -FREEBUSY:20070118T080000Z/20070118T090000Z -FREEBUSY:20070125T080000Z/20070125T090000Z -FREEBUSY:20070201T080000Z/20070201T090000Z -FREEBUSY:20070208T080000Z/20070208T090000Z -FREEBUSY:20070215T080000Z/20070215T090000Z -FREEBUSY:20070222T080000Z/20070222T090000Z -FREEBUSY:20070301T080000Z/20070301T090000Z -FREEBUSY:20070308T080000Z/20070308T090000Z -FREEBUSY:20070315T080000Z/20070315T090000Z -FREEBUSY:20070322T090000Z/20070322T100000Z -FREEBUSY:20070329T090000Z/20070329T100000Z -FREEBUSY:20070405T090000Z/20070405T100000Z -FREEBUSY:20070412T090000Z/20070412T100000Z -FREEBUSY:20070419T090000Z/20070419T100000Z -FREEBUSY:20070426T090000Z/20070426T100000Z -FREEBUSY:20061223T030000Z/20061223T050000Z -FREEBUSY:20061103T030000Z/20061102T154500Z -FREEBUSY:20061116T140000Z/20061116T154500Z -FREEBUSY:20061130T140000Z/20061130T154500Z -FREEBUSY:20061214T140000Z/20061214T154500Z -FREEBUSY:20061228T140000Z/20061228T154500Z -FREEBUSY:20070111T140000Z/20070111T154500Z -FREEBUSY:20070125T140000Z/20070125T154500Z -FREEBUSY:20070208T140000Z/20070208T154500Z -FREEBUSY:20070222T140000Z/20070222T154500Z -FREEBUSY:20070308T140000Z/20070308T154500Z -FREEBUSY:20070322T150000Z/20070322T164500Z -FREEBUSY:20070405T150000Z/20070405T164500Z -FREEBUSY:20070419T150000Z/20070419T164500Z -FREEBUSY:20070503T150000Z/20070503T164500Z -FREEBUSY:20070517T150000Z/20070517T164500Z -FREEBUSY:20070531T150000Z/20070531T164500Z -FREEBUSY:20070614T150000Z/20070614T164500Z -FREEBUSY:20070628T150000Z/20070628T164500Z -FREEBUSY:20061102T183000Z/20061102T073000Z -FREEBUSY:20061202T053000Z/20061202T073000Z -FREEBUSY:20070102T053000Z/20070102T073000Z -FREEBUSY:20070202T053000Z/20070202T073000Z -FREEBUSY:20070302T053000Z/20070302T073000Z -FREEBUSY:20070402T063000Z/20070402T083000Z -FREEBUSY:20070502T063000Z/20070502T083000Z -FREEBUSY:20070602T063000Z/20070602T083000Z -FREEBUSY:20061001T090000Z/20061001T100000Z -FREEBUSY:20061002T090000Z/20061002T100000Z -FREEBUSY:20061003T090000Z/20061003T100000Z -FREEBUSY:20061004T090000Z/20061004T100000Z -FREEBUSY:20061005T090000Z/20061005T100000Z -FREEBUSY:20061006T090000Z/20061006T100000Z -FREEBUSY:20061007T090000Z/20061007T100000Z -FREEBUSY:20061008T090000Z/20061008T100000Z -FREEBUSY:20061009T090000Z/20061009T100000Z -FREEBUSY:20061010T090000Z/20061010T100000Z -FREEBUSY:20061011T090000Z/20061011T100000Z -FREEBUSY:20061012T090000Z/20061012T100000Z -FREEBUSY:20061013T090000Z/20061013T100000Z -FREEBUSY:20061014T090000Z/20061014T100000Z -FREEBUSY:20061015T090000Z/20061015T100000Z -FREEBUSY:20061016T090000Z/20061016T100000Z -FREEBUSY:20061017T090000Z/20061017T100000Z -FREEBUSY:20061018T090000Z/20061018T100000Z -FREEBUSY:20061019T090000Z/20061019T100000Z -FREEBUSY:20061020T090000Z/20061020T100000Z -FREEBUSY:20061021T090000Z/20061021T100000Z -FREEBUSY:20061022T090000Z/20061022T100000Z -FREEBUSY:20061023T090000Z/20061023T100000Z -FREEBUSY:20061024T090000Z/20061024T100000Z -FREEBUSY:20061025T090000Z/20061025T100000Z -FREEBUSY:20061026T090000Z/20061026T100000Z -FREEBUSY:20061027T090000Z/20061027T100000Z -FREEBUSY:20061028T090000Z/20061028T100000Z -FREEBUSY:20061029T090000Z/20061029T100000Z -FREEBUSY:20061030T090000Z/20061030T100000Z -FREEBUSY:20061031T090000Z/20061031T100000Z -FREEBUSY:20061101T090000Z/20061101T100000Z -FREEBUSY:20061102T090000Z/20061102T100000Z -FREEBUSY:20061103T090000Z/20061103T100000Z -FREEBUSY:20061104T090000Z/20061104T100000Z -FREEBUSY:20061105T090000Z/20061105T100000Z -FREEBUSY:20061106T090000Z/20061106T100000Z -FREEBUSY:20061107T090000Z/20061107T100000Z -FREEBUSY:20061108T090000Z/20061108T100000Z -FREEBUSY:20061109T090000Z/20061109T100000Z -FREEBUSY:20061110T090000Z/20061110T100000Z -FREEBUSY:20061111T090000Z/20061111T100000Z -FREEBUSY:20061112T090000Z/20061112T100000Z -FREEBUSY:20061113T090000Z/20061113T100000Z -FREEBUSY:20061114T090000Z/20061114T100000Z -FREEBUSY:20061115T090000Z/20061115T100000Z -FREEBUSY:20061116T090000Z/20061116T100000Z -FREEBUSY:20061117T090000Z/20061117T100000Z -FREEBUSY:20061118T090000Z/20061118T100000Z -FREEBUSY:20061119T090000Z/20061119T100000Z -FREEBUSY:20061120T090000Z/20061120T100000Z -FREEBUSY:20061121T090000Z/20061121T100000Z -FREEBUSY:20061122T090000Z/20061122T100000Z -FREEBUSY:20061123T090000Z/20061123T100000Z -FREEBUSY:20061124T090000Z/20061124T100000Z -FREEBUSY:20061125T090000Z/20061125T100000Z -FREEBUSY:20061126T090000Z/20061126T100000Z -FREEBUSY:20061127T090000Z/20061127T100000Z -FREEBUSY:20061128T090000Z/20061128T100000Z -FREEBUSY:20061129T090000Z/20061129T100000Z -FREEBUSY:20061130T090000Z/20061130T100000Z -FREEBUSY:20061201T090000Z/20061201T100000Z -FREEBUSY:20061202T090000Z/20061202T100000Z -FREEBUSY:20061203T090000Z/20061203T100000Z -FREEBUSY:20061204T090000Z/20061204T100000Z -FREEBUSY:20061205T090000Z/20061205T100000Z -FREEBUSY:20061206T090000Z/20061206T100000Z -FREEBUSY:20061207T090000Z/20061207T100000Z -FREEBUSY:20061208T090000Z/20061208T100000Z -FREEBUSY:20061209T090000Z/20061209T100000Z -FREEBUSY:20061210T090000Z/20061210T100000Z -FREEBUSY:20061211T090000Z/20061211T100000Z -FREEBUSY:20061212T090000Z/20061212T100000Z -FREEBUSY:20061213T090000Z/20061213T100000Z -FREEBUSY:20061214T090000Z/20061214T100000Z -FREEBUSY:20061215T090000Z/20061215T100000Z -FREEBUSY:20061216T090000Z/20061216T100000Z -FREEBUSY:20061217T090000Z/20061217T100000Z -FREEBUSY:20061218T090000Z/20061218T100000Z -FREEBUSY:20061219T090000Z/20061219T100000Z -FREEBUSY:20061220T090000Z/20061220T100000Z -FREEBUSY:20061221T090000Z/20061221T100000Z -FREEBUSY:20061222T090000Z/20061222T100000Z -FREEBUSY:20061223T090000Z/20061223T100000Z -FREEBUSY:20061224T090000Z/20061224T100000Z -FREEBUSY:20061225T090000Z/20061225T100000Z -FREEBUSY:20061226T090000Z/20061226T100000Z -FREEBUSY:20061227T090000Z/20061227T100000Z -FREEBUSY:20061228T090000Z/20061228T100000Z -FREEBUSY:20061229T090000Z/20061229T100000Z -FREEBUSY:20061230T090000Z/20061230T100000Z -FREEBUSY:20061231T090000Z/20061231T100000Z -FREEBUSY:20070101T090000Z/20070101T100000Z -FREEBUSY:20070102T090000Z/20070102T100000Z -FREEBUSY:20070103T090000Z/20070103T100000Z -FREEBUSY:20070104T090000Z/20070104T100000Z -FREEBUSY:20070105T090000Z/20070105T100000Z -FREEBUSY:20070106T090000Z/20070106T100000Z -FREEBUSY:20070107T090000Z/20070107T100000Z -FREEBUSY:20070108T090000Z/20070108T100000Z -FREEBUSY:20070109T090000Z/20070109T100000Z -FREEBUSY:20070110T090000Z/20070110T100000Z -FREEBUSY:20070111T090000Z/20070111T100000Z -FREEBUSY:20070112T090000Z/20070112T100000Z -FREEBUSY:20070113T090000Z/20070113T100000Z -FREEBUSY:20070114T090000Z/20070114T100000Z -FREEBUSY:20070115T090000Z/20070115T100000Z -FREEBUSY:20070116T090000Z/20070116T100000Z -FREEBUSY:20070117T090000Z/20070117T100000Z -FREEBUSY:20070118T090000Z/20070118T100000Z -FREEBUSY:20070119T090000Z/20070119T100000Z -FREEBUSY:20070120T090000Z/20070120T100000Z -FREEBUSY:20070121T090000Z/20070121T100000Z -FREEBUSY:20070122T090000Z/20070122T100000Z -FREEBUSY:20070123T090000Z/20070123T100000Z -FREEBUSY:20070124T090000Z/20070124T100000Z -FREEBUSY:20070125T090000Z/20070125T100000Z -FREEBUSY:20070126T090000Z/20070126T100000Z -FREEBUSY:20070127T090000Z/20070127T100000Z -FREEBUSY:20070128T090000Z/20070128T100000Z -FREEBUSY:20070129T090000Z/20070129T100000Z -FREEBUSY:20070130T090000Z/20070130T100000Z -FREEBUSY:20070131T090000Z/20070131T100000Z -FREEBUSY:20070201T090000Z/20070201T100000Z -FREEBUSY:20070202T090000Z/20070202T100000Z -FREEBUSY:20070203T090000Z/20070203T100000Z -FREEBUSY:20070204T090000Z/20070204T100000Z -FREEBUSY:20070205T090000Z/20070205T100000Z -FREEBUSY:20070206T090000Z/20070206T100000Z -FREEBUSY:20070207T090000Z/20070207T100000Z -FREEBUSY:20070208T090000Z/20070208T100000Z -FREEBUSY:20070209T090000Z/20070209T100000Z -FREEBUSY:20070210T090000Z/20070210T100000Z -FREEBUSY:20070211T090000Z/20070211T100000Z -FREEBUSY:20070212T090000Z/20070212T100000Z -FREEBUSY:20070213T090000Z/20070213T100000Z -FREEBUSY:20070214T090000Z/20070214T100000Z -FREEBUSY:20070215T090000Z/20070215T100000Z -FREEBUSY:20070216T090000Z/20070216T100000Z -FREEBUSY:20070217T090000Z/20070217T100000Z -FREEBUSY:20070218T090000Z/20070218T100000Z -FREEBUSY:20070219T090000Z/20070219T100000Z -FREEBUSY:20070220T090000Z/20070220T100000Z -FREEBUSY:20070221T090000Z/20070221T100000Z -FREEBUSY:20070222T090000Z/20070222T100000Z -FREEBUSY:20070223T090000Z/20070223T100000Z -FREEBUSY:20070224T090000Z/20070224T100000Z -FREEBUSY:20070225T090000Z/20070225T100000Z -FREEBUSY:20070226T090000Z/20070226T100000Z -FREEBUSY:20070227T090000Z/20070227T100000Z -FREEBUSY:20070228T090000Z/20070228T100000Z -FREEBUSY:20070301T090000Z/20070301T100000Z -FREEBUSY:20070302T090000Z/20070302T100000Z -FREEBUSY:20070303T090000Z/20070303T100000Z -FREEBUSY:20070304T090000Z/20070304T100000Z -FREEBUSY:20070305T090000Z/20070305T100000Z -FREEBUSY:20070306T090000Z/20070306T100000Z -FREEBUSY:20070307T090000Z/20070307T100000Z -FREEBUSY:20070308T090000Z/20070308T100000Z -FREEBUSY:20070309T090000Z/20070309T100000Z -FREEBUSY:20070310T090000Z/20070310T100000Z -FREEBUSY:20070311T090000Z/20070311T100000Z -FREEBUSY:20070312T090000Z/20070312T100000Z -FREEBUSY:20070313T090000Z/20070313T100000Z -FREEBUSY:20070314T090000Z/20070314T100000Z -FREEBUSY:20070315T090000Z/20070315T100000Z -FREEBUSY:20070316T090000Z/20070316T100000Z -FREEBUSY:20070317T090000Z/20070317T100000Z -FREEBUSY:20070318T100000Z/20070318T110000Z -FREEBUSY:20070319T100000Z/20070319T110000Z -FREEBUSY:20070320T100000Z/20070320T110000Z -FREEBUSY:20070321T100000Z/20070321T110000Z -FREEBUSY:20070322T100000Z/20070322T110000Z -FREEBUSY:20070323T100000Z/20070323T110000Z -FREEBUSY:20070324T100000Z/20070324T110000Z -FREEBUSY:20070325T100000Z/20070325T110000Z -FREEBUSY:20070326T100000Z/20070326T110000Z -FREEBUSY:20070327T100000Z/20070327T110000Z -FREEBUSY:20070328T100000Z/20070328T110000Z -FREEBUSY:20070329T100000Z/20070329T110000Z -FREEBUSY:20070330T100000Z/20070330T110000Z -FREEBUSY:20070331T100000Z/20070331T110000Z -FREEBUSY:20070401T100000Z/20070401T110000Z -FREEBUSY:20070402T100000Z/20070402T110000Z -FREEBUSY:20070403T100000Z/20070403T110000Z -FREEBUSY:20070404T100000Z/20070404T110000Z -FREEBUSY:20070405T100000Z/20070405T110000Z -FREEBUSY:20070406T100000Z/20070406T110000Z -FREEBUSY:20070407T100000Z/20070407T110000Z -FREEBUSY:20070408T100000Z/20070408T110000Z -FREEBUSY:20070409T100000Z/20070409T110000Z -FREEBUSY:20070410T100000Z/20070410T110000Z -FREEBUSY:20070411T100000Z/20070411T110000Z -FREEBUSY:20070412T100000Z/20070412T110000Z -FREEBUSY:20070413T100000Z/20070413T110000Z -FREEBUSY:20070414T100000Z/20070414T110000Z -FREEBUSY:20070415T100000Z/20070415T110000Z -FREEBUSY:20070416T100000Z/20070416T110000Z -FREEBUSY:20070417T100000Z/20070417T110000Z -FREEBUSY:20070418T100000Z/20070418T110000Z -FREEBUSY:20070419T100000Z/20070419T110000Z -FREEBUSY:20070420T100000Z/20070420T110000Z -FREEBUSY:20070421T100000Z/20070421T110000Z -FREEBUSY:20070422T100000Z/20070422T110000Z -FREEBUSY:20070423T100000Z/20070423T110000Z -FREEBUSY:20070424T100000Z/20070424T110000Z -FREEBUSY:20070425T100000Z/20070425T110000Z -FREEBUSY:20070426T100000Z/20070426T110000Z -FREEBUSY:20070427T100000Z/20070427T110000Z -FREEBUSY:20070428T100000Z/20070428T110000Z -FREEBUSY:20070429T100000Z/20070429T110000Z -FREEBUSY:20070430T100000Z/20070430T110000Z -FREEBUSY:20070501T100000Z/20070501T110000Z -FREEBUSY:20070502T100000Z/20070502T110000Z -FREEBUSY:20070503T100000Z/20070503T110000Z -FREEBUSY:20070504T100000Z/20070504T110000Z -FREEBUSY:20070505T100000Z/20070505T110000Z -FREEBUSY:20070506T100000Z/20070506T110000Z -FREEBUSY:20070507T100000Z/20070507T110000Z -FREEBUSY:20070508T100000Z/20070508T110000Z -FREEBUSY:20070509T100000Z/20070509T110000Z -FREEBUSY:20070510T100000Z/20070510T110000Z -FREEBUSY:20070511T100000Z/20070511T110000Z -FREEBUSY:20070512T100000Z/20070512T110000Z -FREEBUSY:20070513T100000Z/20070513T110000Z -FREEBUSY:20070514T100000Z/20070514T110000Z -FREEBUSY:20070515T100000Z/20070515T110000Z -FREEBUSY:20070516T100000Z/20070516T110000Z -FREEBUSY:20070517T100000Z/20070517T110000Z -FREEBUSY:20070518T100000Z/20070518T110000Z -FREEBUSY:20070519T100000Z/20070519T110000Z -FREEBUSY:20070520T100000Z/20070520T110000Z -FREEBUSY:20070521T100000Z/20070521T110000Z -FREEBUSY:20070522T100000Z/20070522T110000Z -FREEBUSY:20070523T100000Z/20070523T110000Z -FREEBUSY:20070524T100000Z/20070524T110000Z -FREEBUSY:20070525T100000Z/20070525T110000Z -FREEBUSY:20070526T100000Z/20070526T110000Z -FREEBUSY:20070527T100000Z/20070527T110000Z -FREEBUSY:20070528T100000Z/20070528T110000Z -FREEBUSY:20070529T100000Z/20070529T110000Z -FREEBUSY:20070530T100000Z/20070530T110000Z -FREEBUSY:20070531T100000Z/20070531T110000Z -FREEBUSY:20070601T100000Z/20070601T110000Z -FREEBUSY:20070602T100000Z/20070602T110000Z -FREEBUSY:20070603T100000Z/20070603T110000Z -FREEBUSY:20070604T100000Z/20070604T110000Z -FREEBUSY:20070605T100000Z/20070605T110000Z -FREEBUSY:20070606T100000Z/20070606T110000Z -FREEBUSY:20070607T100000Z/20070607T110000Z -FREEBUSY:20070608T100000Z/20070608T110000Z -FREEBUSY:20070609T100000Z/20070609T110000Z -FREEBUSY:20070610T100000Z/20070610T110000Z -FREEBUSY:20070611T100000Z/20070611T110000Z -FREEBUSY:20070612T100000Z/20070612T110000Z -FREEBUSY:20070613T100000Z/20070613T110000Z -FREEBUSY:20070614T100000Z/20070614T110000Z -FREEBUSY:20070615T100000Z/20070615T110000Z -FREEBUSY:20070616T100000Z/20070616T110000Z -FREEBUSY:20070617T100000Z/20070617T110000Z -FREEBUSY:20070618T100000Z/20070618T110000Z -FREEBUSY:20070619T100000Z/20070619T110000Z -FREEBUSY:20070620T100000Z/20070620T110000Z -FREEBUSY:20070621T100000Z/20070621T110000Z -FREEBUSY:20070622T100000Z/20070622T110000Z -FREEBUSY:20070623T100000Z/20070623T110000Z -FREEBUSY:20070624T100000Z/20070624T110000Z -FREEBUSY:20070625T100000Z/20070625T110000Z -FREEBUSY:20070626T100000Z/20070626T110000Z -FREEBUSY:20070627T100000Z/20070627T110000Z -FREEBUSY:20070628T100000Z/20070628T110000Z -FREEBUSY:20070629T100000Z/20070629T110000Z -FREEBUSY:20070630T100000Z/20070630T110000Z -END:VFREEBUSY +DTSTART:yyyymmddThhmmssZ +DTEND:yyyymmddThhmmssZ +FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z +FREEBUSY:20061101T233000Z/20061102T003000Z +FREEBUSY:20061031T210000Z/20061031T220000Z +FREEBUSY:20061101T210000Z/20061101T090000Z +FREEBUSY:20061109T080000Z/20061109T090000Z +FREEBUSY:20061116T080000Z/20061116T090000Z +FREEBUSY:20061123T080000Z/20061123T090000Z +FREEBUSY:20061130T080000Z/20061130T090000Z +FREEBUSY:20061207T080000Z/20061207T090000Z +FREEBUSY:20061214T080000Z/20061214T090000Z +FREEBUSY:20061221T080000Z/20061221T090000Z +FREEBUSY:20061228T080000Z/20061228T090000Z +FREEBUSY:20070104T080000Z/20070104T090000Z +FREEBUSY:20070111T080000Z/20070111T090000Z +FREEBUSY:20070118T080000Z/20070118T090000Z +FREEBUSY:20070125T080000Z/20070125T090000Z +FREEBUSY:20070201T080000Z/20070201T090000Z +FREEBUSY:20070208T080000Z/20070208T090000Z +FREEBUSY:20070215T080000Z/20070215T090000Z +FREEBUSY:20070222T080000Z/20070222T090000Z +FREEBUSY:20070301T080000Z/20070301T090000Z +FREEBUSY:20070308T080000Z/20070308T090000Z +FREEBUSY:20070315T080000Z/20070315T090000Z +FREEBUSY:20070322T090000Z/20070322T100000Z +FREEBUSY:20070329T090000Z/20070329T100000Z +FREEBUSY:20070405T090000Z/20070405T100000Z +FREEBUSY:20070412T090000Z/20070412T100000Z +FREEBUSY:20070419T090000Z/20070419T100000Z +FREEBUSY:20070426T090000Z/20070426T100000Z +FREEBUSY:20061223T030000Z/20061223T050000Z +FREEBUSY:20061103T030000Z/20061102T154500Z +FREEBUSY:20061116T140000Z/20061116T154500Z +FREEBUSY:20061130T140000Z/20061130T154500Z +FREEBUSY:20061214T140000Z/20061214T154500Z +FREEBUSY:20061228T140000Z/20061228T154500Z +FREEBUSY:20070111T140000Z/20070111T154500Z +FREEBUSY:20070125T140000Z/20070125T154500Z +FREEBUSY:20070208T140000Z/20070208T154500Z +FREEBUSY:20070222T140000Z/20070222T154500Z +FREEBUSY:20070308T140000Z/20070308T154500Z +FREEBUSY:20070322T150000Z/20070322T164500Z +FREEBUSY:20070405T150000Z/20070405T164500Z +FREEBUSY:20070419T150000Z/20070419T164500Z +FREEBUSY:20070503T150000Z/20070503T164500Z +FREEBUSY:20070517T150000Z/20070517T164500Z +FREEBUSY:20070531T150000Z/20070531T164500Z +FREEBUSY:20070614T150000Z/20070614T164500Z +FREEBUSY:20070628T150000Z/20070628T164500Z +FREEBUSY:20061102T183000Z/20061102T073000Z +FREEBUSY:20061202T053000Z/20061202T073000Z +FREEBUSY:20070102T053000Z/20070102T073000Z +FREEBUSY:20070202T053000Z/20070202T073000Z +FREEBUSY:20070302T053000Z/20070302T073000Z +FREEBUSY:20070402T063000Z/20070402T083000Z +FREEBUSY:20070502T063000Z/20070502T083000Z +FREEBUSY:20070602T063000Z/20070602T083000Z +FREEBUSY:20061001T090000Z/20061001T100000Z +FREEBUSY:20061002T090000Z/20061002T100000Z +FREEBUSY:20061003T090000Z/20061003T100000Z +FREEBUSY:20061004T090000Z/20061004T100000Z +FREEBUSY:20061005T090000Z/20061005T100000Z +FREEBUSY:20061006T090000Z/20061006T100000Z +FREEBUSY:20061007T090000Z/20061007T100000Z +FREEBUSY:20061008T090000Z/20061008T100000Z +FREEBUSY:20061009T090000Z/20061009T100000Z +FREEBUSY:20061010T090000Z/20061010T100000Z +FREEBUSY:20061011T090000Z/20061011T100000Z +FREEBUSY:20061012T090000Z/20061012T100000Z +FREEBUSY:20061013T090000Z/20061013T100000Z +FREEBUSY:20061014T090000Z/20061014T100000Z +FREEBUSY:20061015T090000Z/20061015T100000Z +FREEBUSY:20061016T090000Z/20061016T100000Z +FREEBUSY:20061017T090000Z/20061017T100000Z +FREEBUSY:20061018T090000Z/20061018T100000Z +FREEBUSY:20061019T090000Z/20061019T100000Z +FREEBUSY:20061020T090000Z/20061020T100000Z +FREEBUSY:20061021T090000Z/20061021T100000Z +FREEBUSY:20061022T090000Z/20061022T100000Z +FREEBUSY:20061023T090000Z/20061023T100000Z +FREEBUSY:20061024T090000Z/20061024T100000Z +FREEBUSY:20061025T090000Z/20061025T100000Z +FREEBUSY:20061026T090000Z/20061026T100000Z +FREEBUSY:20061027T090000Z/20061027T100000Z +FREEBUSY:20061028T090000Z/20061028T100000Z +FREEBUSY:20061029T090000Z/20061029T100000Z +FREEBUSY:20061030T090000Z/20061030T100000Z +FREEBUSY:20061031T090000Z/20061031T100000Z +FREEBUSY:20061101T090000Z/20061101T100000Z +FREEBUSY:20061102T090000Z/20061102T100000Z +FREEBUSY:20061103T090000Z/20061103T100000Z +FREEBUSY:20061104T090000Z/20061104T100000Z +FREEBUSY:20061105T090000Z/20061105T100000Z +FREEBUSY:20061106T090000Z/20061106T100000Z +FREEBUSY:20061107T090000Z/20061107T100000Z +FREEBUSY:20061108T090000Z/20061108T100000Z +FREEBUSY:20061109T090000Z/20061109T100000Z +FREEBUSY:20061110T090000Z/20061110T100000Z +FREEBUSY:20061111T090000Z/20061111T100000Z +FREEBUSY:20061112T090000Z/20061112T100000Z +FREEBUSY:20061113T090000Z/20061113T100000Z +FREEBUSY:20061114T090000Z/20061114T100000Z +FREEBUSY:20061115T090000Z/20061115T100000Z +FREEBUSY:20061116T090000Z/20061116T100000Z +FREEBUSY:20061117T090000Z/20061117T100000Z +FREEBUSY:20061118T090000Z/20061118T100000Z +FREEBUSY:20061119T090000Z/20061119T100000Z +FREEBUSY:20061120T090000Z/20061120T100000Z +FREEBUSY:20061121T090000Z/20061121T100000Z +FREEBUSY:20061122T090000Z/20061122T100000Z +FREEBUSY:20061123T090000Z/20061123T100000Z +FREEBUSY:20061124T090000Z/20061124T100000Z +FREEBUSY:20061125T090000Z/20061125T100000Z +FREEBUSY:20061126T090000Z/20061126T100000Z +FREEBUSY:20061127T090000Z/20061127T100000Z +FREEBUSY:20061128T090000Z/20061128T100000Z +FREEBUSY:20061129T090000Z/20061129T100000Z +FREEBUSY:20061130T090000Z/20061130T100000Z +FREEBUSY:20061201T090000Z/20061201T100000Z +FREEBUSY:20061202T090000Z/20061202T100000Z +FREEBUSY:20061203T090000Z/20061203T100000Z +FREEBUSY:20061204T090000Z/20061204T100000Z +FREEBUSY:20061205T090000Z/20061205T100000Z +FREEBUSY:20061206T090000Z/20061206T100000Z +FREEBUSY:20061207T090000Z/20061207T100000Z +FREEBUSY:20061208T090000Z/20061208T100000Z +FREEBUSY:20061209T090000Z/20061209T100000Z +FREEBUSY:20061210T090000Z/20061210T100000Z +FREEBUSY:20061211T090000Z/20061211T100000Z +FREEBUSY:20061212T090000Z/20061212T100000Z +FREEBUSY:20061213T090000Z/20061213T100000Z +FREEBUSY:20061214T090000Z/20061214T100000Z +FREEBUSY:20061215T090000Z/20061215T100000Z +FREEBUSY:20061216T090000Z/20061216T100000Z +FREEBUSY:20061217T090000Z/20061217T100000Z +FREEBUSY:20061218T090000Z/20061218T100000Z +FREEBUSY:20061219T090000Z/20061219T100000Z +FREEBUSY:20061220T090000Z/20061220T100000Z +FREEBUSY:20061221T090000Z/20061221T100000Z +FREEBUSY:20061222T090000Z/20061222T100000Z +FREEBUSY:20061223T090000Z/20061223T100000Z +FREEBUSY:20061224T090000Z/20061224T100000Z +FREEBUSY:20061225T090000Z/20061225T100000Z +FREEBUSY:20061226T090000Z/20061226T100000Z +FREEBUSY:20061227T090000Z/20061227T100000Z +FREEBUSY:20061228T090000Z/20061228T100000Z +FREEBUSY:20061229T090000Z/20061229T100000Z +FREEBUSY:20061230T090000Z/20061230T100000Z +FREEBUSY:20061231T090000Z/20061231T100000Z +FREEBUSY:20070101T090000Z/20070101T100000Z +FREEBUSY:20070102T090000Z/20070102T100000Z +FREEBUSY:20070103T090000Z/20070103T100000Z +FREEBUSY:20070104T090000Z/20070104T100000Z +FREEBUSY:20070105T090000Z/20070105T100000Z +FREEBUSY:20070106T090000Z/20070106T100000Z +FREEBUSY:20070107T090000Z/20070107T100000Z +FREEBUSY:20070108T090000Z/20070108T100000Z +FREEBUSY:20070109T090000Z/20070109T100000Z +FREEBUSY:20070110T090000Z/20070110T100000Z +FREEBUSY:20070111T090000Z/20070111T100000Z +FREEBUSY:20070112T090000Z/20070112T100000Z +FREEBUSY:20070113T090000Z/20070113T100000Z +FREEBUSY:20070114T090000Z/20070114T100000Z +FREEBUSY:20070115T090000Z/20070115T100000Z +FREEBUSY:20070116T090000Z/20070116T100000Z +FREEBUSY:20070117T090000Z/20070117T100000Z +FREEBUSY:20070118T090000Z/20070118T100000Z +FREEBUSY:20070119T090000Z/20070119T100000Z +FREEBUSY:20070120T090000Z/20070120T100000Z +FREEBUSY:20070121T090000Z/20070121T100000Z +FREEBUSY:20070122T090000Z/20070122T100000Z +FREEBUSY:20070123T090000Z/20070123T100000Z +FREEBUSY:20070124T090000Z/20070124T100000Z +FREEBUSY:20070125T090000Z/20070125T100000Z +FREEBUSY:20070126T090000Z/20070126T100000Z +FREEBUSY:20070127T090000Z/20070127T100000Z +FREEBUSY:20070128T090000Z/20070128T100000Z +FREEBUSY:20070129T090000Z/20070129T100000Z +FREEBUSY:20070130T090000Z/20070130T100000Z +FREEBUSY:20070131T090000Z/20070131T100000Z +FREEBUSY:20070201T090000Z/20070201T100000Z +FREEBUSY:20070202T090000Z/20070202T100000Z +FREEBUSY:20070203T090000Z/20070203T100000Z +FREEBUSY:20070204T090000Z/20070204T100000Z +FREEBUSY:20070205T090000Z/20070205T100000Z +FREEBUSY:20070206T090000Z/20070206T100000Z +FREEBUSY:20070207T090000Z/20070207T100000Z +FREEBUSY:20070208T090000Z/20070208T100000Z +FREEBUSY:20070209T090000Z/20070209T100000Z +FREEBUSY:20070210T090000Z/20070210T100000Z +FREEBUSY:20070211T090000Z/20070211T100000Z +FREEBUSY:20070212T090000Z/20070212T100000Z +FREEBUSY:20070213T090000Z/20070213T100000Z +FREEBUSY:20070214T090000Z/20070214T100000Z +FREEBUSY:20070215T090000Z/20070215T100000Z +FREEBUSY:20070216T090000Z/20070216T100000Z +FREEBUSY:20070217T090000Z/20070217T100000Z +FREEBUSY:20070218T090000Z/20070218T100000Z +FREEBUSY:20070219T090000Z/20070219T100000Z +FREEBUSY:20070220T090000Z/20070220T100000Z +FREEBUSY:20070221T090000Z/20070221T100000Z +FREEBUSY:20070222T090000Z/20070222T100000Z +FREEBUSY:20070223T090000Z/20070223T100000Z +FREEBUSY:20070224T090000Z/20070224T100000Z +FREEBUSY:20070225T090000Z/20070225T100000Z +FREEBUSY:20070226T090000Z/20070226T100000Z +FREEBUSY:20070227T090000Z/20070227T100000Z +FREEBUSY:20070228T090000Z/20070228T100000Z +FREEBUSY:20070301T090000Z/20070301T100000Z +FREEBUSY:20070302T090000Z/20070302T100000Z +FREEBUSY:20070303T090000Z/20070303T100000Z +FREEBUSY:20070304T090000Z/20070304T100000Z +FREEBUSY:20070305T090000Z/20070305T100000Z +FREEBUSY:20070306T090000Z/20070306T100000Z +FREEBUSY:20070307T090000Z/20070307T100000Z +FREEBUSY:20070308T090000Z/20070308T100000Z +FREEBUSY:20070309T090000Z/20070309T100000Z +FREEBUSY:20070310T090000Z/20070310T100000Z +FREEBUSY:20070311T090000Z/20070311T100000Z +FREEBUSY:20070312T090000Z/20070312T100000Z +FREEBUSY:20070313T090000Z/20070313T100000Z +FREEBUSY:20070314T090000Z/20070314T100000Z +FREEBUSY:20070315T090000Z/20070315T100000Z +FREEBUSY:20070316T090000Z/20070316T100000Z +FREEBUSY:20070317T090000Z/20070317T100000Z +FREEBUSY:20070318T100000Z/20070318T110000Z +FREEBUSY:20070319T100000Z/20070319T110000Z +FREEBUSY:20070320T100000Z/20070320T110000Z +FREEBUSY:20070321T100000Z/20070321T110000Z +FREEBUSY:20070322T100000Z/20070322T110000Z +FREEBUSY:20070323T100000Z/20070323T110000Z +FREEBUSY:20070324T100000Z/20070324T110000Z +FREEBUSY:20070325T100000Z/20070325T110000Z +FREEBUSY:20070326T100000Z/20070326T110000Z +FREEBUSY:20070327T100000Z/20070327T110000Z +FREEBUSY:20070328T100000Z/20070328T110000Z +FREEBUSY:20070329T100000Z/20070329T110000Z +FREEBUSY:20070330T100000Z/20070330T110000Z +FREEBUSY:20070331T100000Z/20070331T110000Z +FREEBUSY:20070401T100000Z/20070401T110000Z +FREEBUSY:20070402T100000Z/20070402T110000Z +FREEBUSY:20070403T100000Z/20070403T110000Z +FREEBUSY:20070404T100000Z/20070404T110000Z +FREEBUSY:20070405T100000Z/20070405T110000Z +FREEBUSY:20070406T100000Z/20070406T110000Z +FREEBUSY:20070407T100000Z/20070407T110000Z +FREEBUSY:20070408T100000Z/20070408T110000Z +FREEBUSY:20070409T100000Z/20070409T110000Z +FREEBUSY:20070410T100000Z/20070410T110000Z +FREEBUSY:20070411T100000Z/20070411T110000Z +FREEBUSY:20070412T100000Z/20070412T110000Z +FREEBUSY:20070413T100000Z/20070413T110000Z +FREEBUSY:20070414T100000Z/20070414T110000Z +FREEBUSY:20070415T100000Z/20070415T110000Z +FREEBUSY:20070416T100000Z/20070416T110000Z +FREEBUSY:20070417T100000Z/20070417T110000Z +FREEBUSY:20070418T100000Z/20070418T110000Z +FREEBUSY:20070419T100000Z/20070419T110000Z +FREEBUSY:20070420T100000Z/20070420T110000Z +FREEBUSY:20070421T100000Z/20070421T110000Z +FREEBUSY:20070422T100000Z/20070422T110000Z +FREEBUSY:20070423T100000Z/20070423T110000Z +FREEBUSY:20070424T100000Z/20070424T110000Z +FREEBUSY:20070425T100000Z/20070425T110000Z +FREEBUSY:20070426T100000Z/20070426T110000Z +FREEBUSY:20070427T100000Z/20070427T110000Z +FREEBUSY:20070428T100000Z/20070428T110000Z +FREEBUSY:20070429T100000Z/20070429T110000Z +FREEBUSY:20070430T100000Z/20070430T110000Z +FREEBUSY:20070501T100000Z/20070501T110000Z +FREEBUSY:20070502T100000Z/20070502T110000Z +FREEBUSY:20070503T100000Z/20070503T110000Z +FREEBUSY:20070504T100000Z/20070504T110000Z +FREEBUSY:20070505T100000Z/20070505T110000Z +FREEBUSY:20070506T100000Z/20070506T110000Z +FREEBUSY:20070507T100000Z/20070507T110000Z +FREEBUSY:20070508T100000Z/20070508T110000Z +FREEBUSY:20070509T100000Z/20070509T110000Z +FREEBUSY:20070510T100000Z/20070510T110000Z +FREEBUSY:20070511T100000Z/20070511T110000Z +FREEBUSY:20070512T100000Z/20070512T110000Z +FREEBUSY:20070513T100000Z/20070513T110000Z +FREEBUSY:20070514T100000Z/20070514T110000Z +FREEBUSY:20070515T100000Z/20070515T110000Z +FREEBUSY:20070516T100000Z/20070516T110000Z +FREEBUSY:20070517T100000Z/20070517T110000Z +FREEBUSY:20070518T100000Z/20070518T110000Z +FREEBUSY:20070519T100000Z/20070519T110000Z +FREEBUSY:20070520T100000Z/20070520T110000Z +FREEBUSY:20070521T100000Z/20070521T110000Z +FREEBUSY:20070522T100000Z/20070522T110000Z +FREEBUSY:20070523T100000Z/20070523T110000Z +FREEBUSY:20070524T100000Z/20070524T110000Z +FREEBUSY:20070525T100000Z/20070525T110000Z +FREEBUSY:20070526T100000Z/20070526T110000Z +FREEBUSY:20070527T100000Z/20070527T110000Z +FREEBUSY:20070528T100000Z/20070528T110000Z +FREEBUSY:20070529T100000Z/20070529T110000Z +FREEBUSY:20070530T100000Z/20070530T110000Z +FREEBUSY:20070531T100000Z/20070531T110000Z +FREEBUSY:20070601T100000Z/20070601T110000Z +FREEBUSY:20070602T100000Z/20070602T110000Z +FREEBUSY:20070603T100000Z/20070603T110000Z +FREEBUSY:20070604T100000Z/20070604T110000Z +FREEBUSY:20070605T100000Z/20070605T110000Z +FREEBUSY:20070606T100000Z/20070606T110000Z +FREEBUSY:20070607T100000Z/20070607T110000Z +FREEBUSY:20070608T100000Z/20070608T110000Z +FREEBUSY:20070609T100000Z/20070609T110000Z +FREEBUSY:20070610T100000Z/20070610T110000Z +FREEBUSY:20070611T100000Z/20070611T110000Z +FREEBUSY:20070612T100000Z/20070612T110000Z +FREEBUSY:20070613T100000Z/20070613T110000Z +FREEBUSY:20070614T100000Z/20070614T110000Z +FREEBUSY:20070615T100000Z/20070615T110000Z +FREEBUSY:20070616T100000Z/20070616T110000Z +FREEBUSY:20070617T100000Z/20070617T110000Z +FREEBUSY:20070618T100000Z/20070618T110000Z +FREEBUSY:20070619T100000Z/20070619T110000Z +FREEBUSY:20070620T100000Z/20070620T110000Z +FREEBUSY:20070621T100000Z/20070621T110000Z +FREEBUSY:20070622T100000Z/20070622T110000Z +FREEBUSY:20070623T100000Z/20070623T110000Z +FREEBUSY:20070624T100000Z/20070624T110000Z +FREEBUSY:20070625T100000Z/20070625T110000Z +FREEBUSY:20070626T100000Z/20070626T110000Z +FREEBUSY:20070627T100000Z/20070627T110000Z +FREEBUSY:20070628T100000Z/20070628T110000Z +FREEBUSY:20070629T100000Z/20070629T110000Z +FREEBUSY:20070630T100000Z/20070630T110000Z +END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/836-freebusy.test b/testing/tests/regression-suite/836-freebusy.test index e70758a3..6a39fba5 100644 --- a/testing/tests/regression-suite/836-freebusy.test +++ b/testing/tests/regression-suite/836-freebusy.test @@ -7,7 +7,7 @@ AUTH=user2:user2 URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 HEAD -REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/ -REPLACE=/^DTSTART:\d{8}T\d{6}$/DTSTART:yyyymmddThhmmss/ -REPLACE=/^DTEND:\d{8}T\d{6}$/DTEND:yyyymmddThhmmss/ +REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ +REPLACE=/^DTSTART:\d{8}T\d{6}Z\r?$/DTSTART:yyyymmddThhmmssZ/ +REPLACE=/^DTEND:\d{8}T\d{6}Z\r?$/DTEND:yyyymmddThhmmssZ/ diff --git a/testing/tests/regression-suite/837-freebusy.result b/testing/tests/regression-suite/837-freebusy.result index a3ab4dff..0c11e871 100644 --- a/testing/tests/regression-suite/837-freebusy.result +++ b/testing/tests/regression-suite/837-freebusy.result @@ -1,343 +1,344 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 14366 +Content-Length: 14720 Content-Type: text/calendar BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 -BEGIN:VFREEBUSY +CALSCALE:GREGORIAN +BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ -DTSTART:20060930T120000Z -DTEND:20070630T115959Z -FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z -FREEBUSY:20061101T233000Z/20061102T003000Z -FREEBUSY:20061031T210000Z/20061031T220000Z -FREEBUSY:20061101T210000Z/20061101T090000Z -FREEBUSY:20061109T080000Z/20061109T090000Z -FREEBUSY:20061116T080000Z/20061116T090000Z -FREEBUSY:20061123T080000Z/20061123T090000Z -FREEBUSY:20061130T080000Z/20061130T090000Z -FREEBUSY:20061207T080000Z/20061207T090000Z -FREEBUSY:20061214T080000Z/20061214T090000Z -FREEBUSY:20061221T080000Z/20061221T090000Z -FREEBUSY:20061228T080000Z/20061228T090000Z -FREEBUSY:20070104T080000Z/20070104T090000Z -FREEBUSY:20070111T080000Z/20070111T090000Z -FREEBUSY:20070118T080000Z/20070118T090000Z -FREEBUSY:20070125T080000Z/20070125T090000Z -FREEBUSY:20070201T080000Z/20070201T090000Z -FREEBUSY:20070208T080000Z/20070208T090000Z -FREEBUSY:20070215T080000Z/20070215T090000Z -FREEBUSY:20070222T080000Z/20070222T090000Z -FREEBUSY:20070301T080000Z/20070301T090000Z -FREEBUSY:20070308T080000Z/20070308T090000Z -FREEBUSY:20070315T080000Z/20070315T090000Z -FREEBUSY:20070322T090000Z/20070322T100000Z -FREEBUSY:20070329T090000Z/20070329T100000Z -FREEBUSY:20070405T090000Z/20070405T100000Z -FREEBUSY:20070412T090000Z/20070412T100000Z -FREEBUSY:20070419T090000Z/20070419T100000Z -FREEBUSY:20070426T090000Z/20070426T100000Z -FREEBUSY:20061223T030000Z/20061223T050000Z -FREEBUSY:20061103T030000Z/20061102T154500Z -FREEBUSY:20061116T140000Z/20061116T154500Z -FREEBUSY:20061130T140000Z/20061130T154500Z -FREEBUSY:20061214T140000Z/20061214T154500Z -FREEBUSY:20061228T140000Z/20061228T154500Z -FREEBUSY:20070111T140000Z/20070111T154500Z -FREEBUSY:20070125T140000Z/20070125T154500Z -FREEBUSY:20070208T140000Z/20070208T154500Z -FREEBUSY:20070222T140000Z/20070222T154500Z -FREEBUSY:20070308T140000Z/20070308T154500Z -FREEBUSY:20070322T150000Z/20070322T164500Z -FREEBUSY:20070405T150000Z/20070405T164500Z -FREEBUSY:20070419T150000Z/20070419T164500Z -FREEBUSY:20070503T150000Z/20070503T164500Z -FREEBUSY:20070517T150000Z/20070517T164500Z -FREEBUSY:20070531T150000Z/20070531T164500Z -FREEBUSY:20070614T150000Z/20070614T164500Z -FREEBUSY:20070628T150000Z/20070628T164500Z -FREEBUSY:20061102T183000Z/20061102T073000Z -FREEBUSY:20061202T053000Z/20061202T073000Z -FREEBUSY:20070102T053000Z/20070102T073000Z -FREEBUSY:20070202T053000Z/20070202T073000Z -FREEBUSY:20070302T053000Z/20070302T073000Z -FREEBUSY:20070402T063000Z/20070402T083000Z -FREEBUSY:20070502T063000Z/20070502T083000Z -FREEBUSY:20070602T063000Z/20070602T083000Z -FREEBUSY:20061001T090000Z/20061001T100000Z -FREEBUSY:20061002T090000Z/20061002T100000Z -FREEBUSY:20061003T090000Z/20061003T100000Z -FREEBUSY:20061004T090000Z/20061004T100000Z -FREEBUSY:20061005T090000Z/20061005T100000Z -FREEBUSY:20061006T090000Z/20061006T100000Z -FREEBUSY:20061007T090000Z/20061007T100000Z -FREEBUSY:20061008T090000Z/20061008T100000Z -FREEBUSY:20061009T090000Z/20061009T100000Z -FREEBUSY:20061010T090000Z/20061010T100000Z -FREEBUSY:20061011T090000Z/20061011T100000Z -FREEBUSY:20061012T090000Z/20061012T100000Z -FREEBUSY:20061013T090000Z/20061013T100000Z -FREEBUSY:20061014T090000Z/20061014T100000Z -FREEBUSY:20061015T090000Z/20061015T100000Z -FREEBUSY:20061016T090000Z/20061016T100000Z -FREEBUSY:20061017T090000Z/20061017T100000Z -FREEBUSY:20061018T090000Z/20061018T100000Z -FREEBUSY:20061019T090000Z/20061019T100000Z -FREEBUSY:20061020T090000Z/20061020T100000Z -FREEBUSY:20061021T090000Z/20061021T100000Z -FREEBUSY:20061022T090000Z/20061022T100000Z -FREEBUSY:20061023T090000Z/20061023T100000Z -FREEBUSY:20061024T090000Z/20061024T100000Z -FREEBUSY:20061025T090000Z/20061025T100000Z -FREEBUSY:20061026T090000Z/20061026T100000Z -FREEBUSY:20061027T090000Z/20061027T100000Z -FREEBUSY:20061028T090000Z/20061028T100000Z -FREEBUSY:20061029T090000Z/20061029T100000Z -FREEBUSY:20061030T090000Z/20061030T100000Z -FREEBUSY:20061031T090000Z/20061031T100000Z -FREEBUSY:20061101T090000Z/20061101T100000Z -FREEBUSY:20061102T090000Z/20061102T100000Z -FREEBUSY:20061103T090000Z/20061103T100000Z -FREEBUSY:20061104T090000Z/20061104T100000Z -FREEBUSY:20061105T090000Z/20061105T100000Z -FREEBUSY:20061106T090000Z/20061106T100000Z -FREEBUSY:20061107T090000Z/20061107T100000Z -FREEBUSY:20061108T090000Z/20061108T100000Z -FREEBUSY:20061109T090000Z/20061109T100000Z -FREEBUSY:20061110T090000Z/20061110T100000Z -FREEBUSY:20061111T090000Z/20061111T100000Z -FREEBUSY:20061112T090000Z/20061112T100000Z -FREEBUSY:20061113T090000Z/20061113T100000Z -FREEBUSY:20061114T090000Z/20061114T100000Z -FREEBUSY:20061115T090000Z/20061115T100000Z -FREEBUSY:20061116T090000Z/20061116T100000Z -FREEBUSY:20061117T090000Z/20061117T100000Z -FREEBUSY:20061118T090000Z/20061118T100000Z -FREEBUSY:20061119T090000Z/20061119T100000Z -FREEBUSY:20061120T090000Z/20061120T100000Z -FREEBUSY:20061121T090000Z/20061121T100000Z -FREEBUSY:20061122T090000Z/20061122T100000Z -FREEBUSY:20061123T090000Z/20061123T100000Z -FREEBUSY:20061124T090000Z/20061124T100000Z -FREEBUSY:20061125T090000Z/20061125T100000Z -FREEBUSY:20061126T090000Z/20061126T100000Z -FREEBUSY:20061127T090000Z/20061127T100000Z -FREEBUSY:20061128T090000Z/20061128T100000Z -FREEBUSY:20061129T090000Z/20061129T100000Z -FREEBUSY:20061130T090000Z/20061130T100000Z -FREEBUSY:20061201T090000Z/20061201T100000Z -FREEBUSY:20061202T090000Z/20061202T100000Z -FREEBUSY:20061203T090000Z/20061203T100000Z -FREEBUSY:20061204T090000Z/20061204T100000Z -FREEBUSY:20061205T090000Z/20061205T100000Z -FREEBUSY:20061206T090000Z/20061206T100000Z -FREEBUSY:20061207T090000Z/20061207T100000Z -FREEBUSY:20061208T090000Z/20061208T100000Z -FREEBUSY:20061209T090000Z/20061209T100000Z -FREEBUSY:20061210T090000Z/20061210T100000Z -FREEBUSY:20061211T090000Z/20061211T100000Z -FREEBUSY:20061212T090000Z/20061212T100000Z -FREEBUSY:20061213T090000Z/20061213T100000Z -FREEBUSY:20061214T090000Z/20061214T100000Z -FREEBUSY:20061215T090000Z/20061215T100000Z -FREEBUSY:20061216T090000Z/20061216T100000Z -FREEBUSY:20061217T090000Z/20061217T100000Z -FREEBUSY:20061218T090000Z/20061218T100000Z -FREEBUSY:20061219T090000Z/20061219T100000Z -FREEBUSY:20061220T090000Z/20061220T100000Z -FREEBUSY:20061221T090000Z/20061221T100000Z -FREEBUSY:20061222T090000Z/20061222T100000Z -FREEBUSY:20061223T090000Z/20061223T100000Z -FREEBUSY:20061224T090000Z/20061224T100000Z -FREEBUSY:20061225T090000Z/20061225T100000Z -FREEBUSY:20061226T090000Z/20061226T100000Z -FREEBUSY:20061227T090000Z/20061227T100000Z -FREEBUSY:20061228T090000Z/20061228T100000Z -FREEBUSY:20061229T090000Z/20061229T100000Z -FREEBUSY:20061230T090000Z/20061230T100000Z -FREEBUSY:20061231T090000Z/20061231T100000Z -FREEBUSY:20070101T090000Z/20070101T100000Z -FREEBUSY:20070102T090000Z/20070102T100000Z -FREEBUSY:20070103T090000Z/20070103T100000Z -FREEBUSY:20070104T090000Z/20070104T100000Z -FREEBUSY:20070105T090000Z/20070105T100000Z -FREEBUSY:20070106T090000Z/20070106T100000Z -FREEBUSY:20070107T090000Z/20070107T100000Z -FREEBUSY:20070108T090000Z/20070108T100000Z -FREEBUSY:20070109T090000Z/20070109T100000Z -FREEBUSY:20070110T090000Z/20070110T100000Z -FREEBUSY:20070111T090000Z/20070111T100000Z -FREEBUSY:20070112T090000Z/20070112T100000Z -FREEBUSY:20070113T090000Z/20070113T100000Z -FREEBUSY:20070114T090000Z/20070114T100000Z -FREEBUSY:20070115T090000Z/20070115T100000Z -FREEBUSY:20070116T090000Z/20070116T100000Z -FREEBUSY:20070117T090000Z/20070117T100000Z -FREEBUSY:20070118T090000Z/20070118T100000Z -FREEBUSY:20070119T090000Z/20070119T100000Z -FREEBUSY:20070120T090000Z/20070120T100000Z -FREEBUSY:20070121T090000Z/20070121T100000Z -FREEBUSY:20070122T090000Z/20070122T100000Z -FREEBUSY:20070123T090000Z/20070123T100000Z -FREEBUSY:20070124T090000Z/20070124T100000Z -FREEBUSY:20070125T090000Z/20070125T100000Z -FREEBUSY:20070126T090000Z/20070126T100000Z -FREEBUSY:20070127T090000Z/20070127T100000Z -FREEBUSY:20070128T090000Z/20070128T100000Z -FREEBUSY:20070129T090000Z/20070129T100000Z -FREEBUSY:20070130T090000Z/20070130T100000Z -FREEBUSY:20070131T090000Z/20070131T100000Z -FREEBUSY:20070201T090000Z/20070201T100000Z -FREEBUSY:20070202T090000Z/20070202T100000Z -FREEBUSY:20070203T090000Z/20070203T100000Z -FREEBUSY:20070204T090000Z/20070204T100000Z -FREEBUSY:20070205T090000Z/20070205T100000Z -FREEBUSY:20070206T090000Z/20070206T100000Z -FREEBUSY:20070207T090000Z/20070207T100000Z -FREEBUSY:20070208T090000Z/20070208T100000Z -FREEBUSY:20070209T090000Z/20070209T100000Z -FREEBUSY:20070210T090000Z/20070210T100000Z -FREEBUSY:20070211T090000Z/20070211T100000Z -FREEBUSY:20070212T090000Z/20070212T100000Z -FREEBUSY:20070213T090000Z/20070213T100000Z -FREEBUSY:20070214T090000Z/20070214T100000Z -FREEBUSY:20070215T090000Z/20070215T100000Z -FREEBUSY:20070216T090000Z/20070216T100000Z -FREEBUSY:20070217T090000Z/20070217T100000Z -FREEBUSY:20070218T090000Z/20070218T100000Z -FREEBUSY:20070219T090000Z/20070219T100000Z -FREEBUSY:20070220T090000Z/20070220T100000Z -FREEBUSY:20070221T090000Z/20070221T100000Z -FREEBUSY:20070222T090000Z/20070222T100000Z -FREEBUSY:20070223T090000Z/20070223T100000Z -FREEBUSY:20070224T090000Z/20070224T100000Z -FREEBUSY:20070225T090000Z/20070225T100000Z -FREEBUSY:20070226T090000Z/20070226T100000Z -FREEBUSY:20070227T090000Z/20070227T100000Z -FREEBUSY:20070228T090000Z/20070228T100000Z -FREEBUSY:20070301T090000Z/20070301T100000Z -FREEBUSY:20070302T090000Z/20070302T100000Z -FREEBUSY:20070303T090000Z/20070303T100000Z -FREEBUSY:20070304T090000Z/20070304T100000Z -FREEBUSY:20070305T090000Z/20070305T100000Z -FREEBUSY:20070306T090000Z/20070306T100000Z -FREEBUSY:20070307T090000Z/20070307T100000Z -FREEBUSY:20070308T090000Z/20070308T100000Z -FREEBUSY:20070309T090000Z/20070309T100000Z -FREEBUSY:20070310T090000Z/20070310T100000Z -FREEBUSY:20070311T090000Z/20070311T100000Z -FREEBUSY:20070312T090000Z/20070312T100000Z -FREEBUSY:20070313T090000Z/20070313T100000Z -FREEBUSY:20070314T090000Z/20070314T100000Z -FREEBUSY:20070315T090000Z/20070315T100000Z -FREEBUSY:20070316T090000Z/20070316T100000Z -FREEBUSY:20070317T090000Z/20070317T100000Z -FREEBUSY:20070318T100000Z/20070318T110000Z -FREEBUSY:20070319T100000Z/20070319T110000Z -FREEBUSY:20070320T100000Z/20070320T110000Z -FREEBUSY:20070321T100000Z/20070321T110000Z -FREEBUSY:20070322T100000Z/20070322T110000Z -FREEBUSY:20070323T100000Z/20070323T110000Z -FREEBUSY:20070324T100000Z/20070324T110000Z -FREEBUSY:20070325T100000Z/20070325T110000Z -FREEBUSY:20070326T100000Z/20070326T110000Z -FREEBUSY:20070327T100000Z/20070327T110000Z -FREEBUSY:20070328T100000Z/20070328T110000Z -FREEBUSY:20070329T100000Z/20070329T110000Z -FREEBUSY:20070330T100000Z/20070330T110000Z -FREEBUSY:20070331T100000Z/20070331T110000Z -FREEBUSY:20070401T100000Z/20070401T110000Z -FREEBUSY:20070402T100000Z/20070402T110000Z -FREEBUSY:20070403T100000Z/20070403T110000Z -FREEBUSY:20070404T100000Z/20070404T110000Z -FREEBUSY:20070405T100000Z/20070405T110000Z -FREEBUSY:20070406T100000Z/20070406T110000Z -FREEBUSY:20070407T100000Z/20070407T110000Z -FREEBUSY:20070408T100000Z/20070408T110000Z -FREEBUSY:20070409T100000Z/20070409T110000Z -FREEBUSY:20070410T100000Z/20070410T110000Z -FREEBUSY:20070411T100000Z/20070411T110000Z -FREEBUSY:20070412T100000Z/20070412T110000Z -FREEBUSY:20070413T100000Z/20070413T110000Z -FREEBUSY:20070414T100000Z/20070414T110000Z -FREEBUSY:20070415T100000Z/20070415T110000Z -FREEBUSY:20070416T100000Z/20070416T110000Z -FREEBUSY:20070417T100000Z/20070417T110000Z -FREEBUSY:20070418T100000Z/20070418T110000Z -FREEBUSY:20070419T100000Z/20070419T110000Z -FREEBUSY:20070420T100000Z/20070420T110000Z -FREEBUSY:20070421T100000Z/20070421T110000Z -FREEBUSY:20070422T100000Z/20070422T110000Z -FREEBUSY:20070423T100000Z/20070423T110000Z -FREEBUSY:20070424T100000Z/20070424T110000Z -FREEBUSY:20070425T100000Z/20070425T110000Z -FREEBUSY:20070426T100000Z/20070426T110000Z -FREEBUSY:20070427T100000Z/20070427T110000Z -FREEBUSY:20070428T100000Z/20070428T110000Z -FREEBUSY:20070429T100000Z/20070429T110000Z -FREEBUSY:20070430T100000Z/20070430T110000Z -FREEBUSY:20070501T100000Z/20070501T110000Z -FREEBUSY:20070502T100000Z/20070502T110000Z -FREEBUSY:20070503T100000Z/20070503T110000Z -FREEBUSY:20070504T100000Z/20070504T110000Z -FREEBUSY:20070505T100000Z/20070505T110000Z -FREEBUSY:20070506T100000Z/20070506T110000Z -FREEBUSY:20070507T100000Z/20070507T110000Z -FREEBUSY:20070508T100000Z/20070508T110000Z -FREEBUSY:20070509T100000Z/20070509T110000Z -FREEBUSY:20070510T100000Z/20070510T110000Z -FREEBUSY:20070511T100000Z/20070511T110000Z -FREEBUSY:20070512T100000Z/20070512T110000Z -FREEBUSY:20070513T100000Z/20070513T110000Z -FREEBUSY:20070514T100000Z/20070514T110000Z -FREEBUSY:20070515T100000Z/20070515T110000Z -FREEBUSY:20070516T100000Z/20070516T110000Z -FREEBUSY:20070517T100000Z/20070517T110000Z -FREEBUSY:20070518T100000Z/20070518T110000Z -FREEBUSY:20070519T100000Z/20070519T110000Z -FREEBUSY:20070520T100000Z/20070520T110000Z -FREEBUSY:20070521T100000Z/20070521T110000Z -FREEBUSY:20070522T100000Z/20070522T110000Z -FREEBUSY:20070523T100000Z/20070523T110000Z -FREEBUSY:20070524T100000Z/20070524T110000Z -FREEBUSY:20070525T100000Z/20070525T110000Z -FREEBUSY:20070526T100000Z/20070526T110000Z -FREEBUSY:20070527T100000Z/20070527T110000Z -FREEBUSY:20070528T100000Z/20070528T110000Z -FREEBUSY:20070529T100000Z/20070529T110000Z -FREEBUSY:20070530T100000Z/20070530T110000Z -FREEBUSY:20070531T100000Z/20070531T110000Z -FREEBUSY:20070601T100000Z/20070601T110000Z -FREEBUSY:20070602T100000Z/20070602T110000Z -FREEBUSY:20070603T100000Z/20070603T110000Z -FREEBUSY:20070604T100000Z/20070604T110000Z -FREEBUSY:20070605T100000Z/20070605T110000Z -FREEBUSY:20070606T100000Z/20070606T110000Z -FREEBUSY:20070607T100000Z/20070607T110000Z -FREEBUSY:20070608T100000Z/20070608T110000Z -FREEBUSY:20070609T100000Z/20070609T110000Z -FREEBUSY:20070610T100000Z/20070610T110000Z -FREEBUSY:20070611T100000Z/20070611T110000Z -FREEBUSY:20070612T100000Z/20070612T110000Z -FREEBUSY:20070613T100000Z/20070613T110000Z -FREEBUSY:20070614T100000Z/20070614T110000Z -FREEBUSY:20070615T100000Z/20070615T110000Z -FREEBUSY:20070616T100000Z/20070616T110000Z -FREEBUSY:20070617T100000Z/20070617T110000Z -FREEBUSY:20070618T100000Z/20070618T110000Z -FREEBUSY:20070619T100000Z/20070619T110000Z -FREEBUSY:20070620T100000Z/20070620T110000Z -FREEBUSY:20070621T100000Z/20070621T110000Z -FREEBUSY:20070622T100000Z/20070622T110000Z -FREEBUSY:20070623T100000Z/20070623T110000Z -FREEBUSY:20070624T100000Z/20070624T110000Z -FREEBUSY:20070625T100000Z/20070625T110000Z -FREEBUSY:20070626T100000Z/20070626T110000Z -FREEBUSY:20070627T100000Z/20070627T110000Z -FREEBUSY:20070628T100000Z/20070628T110000Z -FREEBUSY:20070629T100000Z/20070629T110000Z -FREEBUSY:20070630T100000Z/20070630T110000Z -END:VFREEBUSY +DTSTART:yyyymmddThhmmss +DTEND:yyyymmddThhmmss +FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000Z/20061223T080000Z +FREEBUSY:20061101T233000Z/20061102T003000Z +FREEBUSY:20061031T210000Z/20061031T220000Z +FREEBUSY:20061101T210000Z/20061101T090000Z +FREEBUSY:20061109T080000Z/20061109T090000Z +FREEBUSY:20061116T080000Z/20061116T090000Z +FREEBUSY:20061123T080000Z/20061123T090000Z +FREEBUSY:20061130T080000Z/20061130T090000Z +FREEBUSY:20061207T080000Z/20061207T090000Z +FREEBUSY:20061214T080000Z/20061214T090000Z +FREEBUSY:20061221T080000Z/20061221T090000Z +FREEBUSY:20061228T080000Z/20061228T090000Z +FREEBUSY:20070104T080000Z/20070104T090000Z +FREEBUSY:20070111T080000Z/20070111T090000Z +FREEBUSY:20070118T080000Z/20070118T090000Z +FREEBUSY:20070125T080000Z/20070125T090000Z +FREEBUSY:20070201T080000Z/20070201T090000Z +FREEBUSY:20070208T080000Z/20070208T090000Z +FREEBUSY:20070215T080000Z/20070215T090000Z +FREEBUSY:20070222T080000Z/20070222T090000Z +FREEBUSY:20070301T080000Z/20070301T090000Z +FREEBUSY:20070308T080000Z/20070308T090000Z +FREEBUSY:20070315T080000Z/20070315T090000Z +FREEBUSY:20070322T090000Z/20070322T100000Z +FREEBUSY:20070329T090000Z/20070329T100000Z +FREEBUSY:20070405T090000Z/20070405T100000Z +FREEBUSY:20070412T090000Z/20070412T100000Z +FREEBUSY:20070419T090000Z/20070419T100000Z +FREEBUSY:20070426T090000Z/20070426T100000Z +FREEBUSY:20061223T030000Z/20061223T050000Z +FREEBUSY:20061103T030000Z/20061102T154500Z +FREEBUSY:20061116T140000Z/20061116T154500Z +FREEBUSY:20061130T140000Z/20061130T154500Z +FREEBUSY:20061214T140000Z/20061214T154500Z +FREEBUSY:20061228T140000Z/20061228T154500Z +FREEBUSY:20070111T140000Z/20070111T154500Z +FREEBUSY:20070125T140000Z/20070125T154500Z +FREEBUSY:20070208T140000Z/20070208T154500Z +FREEBUSY:20070222T140000Z/20070222T154500Z +FREEBUSY:20070308T140000Z/20070308T154500Z +FREEBUSY:20070322T150000Z/20070322T164500Z +FREEBUSY:20070405T150000Z/20070405T164500Z +FREEBUSY:20070419T150000Z/20070419T164500Z +FREEBUSY:20070503T150000Z/20070503T164500Z +FREEBUSY:20070517T150000Z/20070517T164500Z +FREEBUSY:20070531T150000Z/20070531T164500Z +FREEBUSY:20070614T150000Z/20070614T164500Z +FREEBUSY:20070628T150000Z/20070628T164500Z +FREEBUSY:20061102T183000Z/20061102T073000Z +FREEBUSY:20061202T053000Z/20061202T073000Z +FREEBUSY:20070102T053000Z/20070102T073000Z +FREEBUSY:20070202T053000Z/20070202T073000Z +FREEBUSY:20070302T053000Z/20070302T073000Z +FREEBUSY:20070402T063000Z/20070402T083000Z +FREEBUSY:20070502T063000Z/20070502T083000Z +FREEBUSY:20070602T063000Z/20070602T083000Z +FREEBUSY:20061001T090000Z/20061001T100000Z +FREEBUSY:20061002T090000Z/20061002T100000Z +FREEBUSY:20061003T090000Z/20061003T100000Z +FREEBUSY:20061004T090000Z/20061004T100000Z +FREEBUSY:20061005T090000Z/20061005T100000Z +FREEBUSY:20061006T090000Z/20061006T100000Z +FREEBUSY:20061007T090000Z/20061007T100000Z +FREEBUSY:20061008T090000Z/20061008T100000Z +FREEBUSY:20061009T090000Z/20061009T100000Z +FREEBUSY:20061010T090000Z/20061010T100000Z +FREEBUSY:20061011T090000Z/20061011T100000Z +FREEBUSY:20061012T090000Z/20061012T100000Z +FREEBUSY:20061013T090000Z/20061013T100000Z +FREEBUSY:20061014T090000Z/20061014T100000Z +FREEBUSY:20061015T090000Z/20061015T100000Z +FREEBUSY:20061016T090000Z/20061016T100000Z +FREEBUSY:20061017T090000Z/20061017T100000Z +FREEBUSY:20061018T090000Z/20061018T100000Z +FREEBUSY:20061019T090000Z/20061019T100000Z +FREEBUSY:20061020T090000Z/20061020T100000Z +FREEBUSY:20061021T090000Z/20061021T100000Z +FREEBUSY:20061022T090000Z/20061022T100000Z +FREEBUSY:20061023T090000Z/20061023T100000Z +FREEBUSY:20061024T090000Z/20061024T100000Z +FREEBUSY:20061025T090000Z/20061025T100000Z +FREEBUSY:20061026T090000Z/20061026T100000Z +FREEBUSY:20061027T090000Z/20061027T100000Z +FREEBUSY:20061028T090000Z/20061028T100000Z +FREEBUSY:20061029T090000Z/20061029T100000Z +FREEBUSY:20061030T090000Z/20061030T100000Z +FREEBUSY:20061031T090000Z/20061031T100000Z +FREEBUSY:20061101T090000Z/20061101T100000Z +FREEBUSY:20061102T090000Z/20061102T100000Z +FREEBUSY:20061103T090000Z/20061103T100000Z +FREEBUSY:20061104T090000Z/20061104T100000Z +FREEBUSY:20061105T090000Z/20061105T100000Z +FREEBUSY:20061106T090000Z/20061106T100000Z +FREEBUSY:20061107T090000Z/20061107T100000Z +FREEBUSY:20061108T090000Z/20061108T100000Z +FREEBUSY:20061109T090000Z/20061109T100000Z +FREEBUSY:20061110T090000Z/20061110T100000Z +FREEBUSY:20061111T090000Z/20061111T100000Z +FREEBUSY:20061112T090000Z/20061112T100000Z +FREEBUSY:20061113T090000Z/20061113T100000Z +FREEBUSY:20061114T090000Z/20061114T100000Z +FREEBUSY:20061115T090000Z/20061115T100000Z +FREEBUSY:20061116T090000Z/20061116T100000Z +FREEBUSY:20061117T090000Z/20061117T100000Z +FREEBUSY:20061118T090000Z/20061118T100000Z +FREEBUSY:20061119T090000Z/20061119T100000Z +FREEBUSY:20061120T090000Z/20061120T100000Z +FREEBUSY:20061121T090000Z/20061121T100000Z +FREEBUSY:20061122T090000Z/20061122T100000Z +FREEBUSY:20061123T090000Z/20061123T100000Z +FREEBUSY:20061124T090000Z/20061124T100000Z +FREEBUSY:20061125T090000Z/20061125T100000Z +FREEBUSY:20061126T090000Z/20061126T100000Z +FREEBUSY:20061127T090000Z/20061127T100000Z +FREEBUSY:20061128T090000Z/20061128T100000Z +FREEBUSY:20061129T090000Z/20061129T100000Z +FREEBUSY:20061130T090000Z/20061130T100000Z +FREEBUSY:20061201T090000Z/20061201T100000Z +FREEBUSY:20061202T090000Z/20061202T100000Z +FREEBUSY:20061203T090000Z/20061203T100000Z +FREEBUSY:20061204T090000Z/20061204T100000Z +FREEBUSY:20061205T090000Z/20061205T100000Z +FREEBUSY:20061206T090000Z/20061206T100000Z +FREEBUSY:20061207T090000Z/20061207T100000Z +FREEBUSY:20061208T090000Z/20061208T100000Z +FREEBUSY:20061209T090000Z/20061209T100000Z +FREEBUSY:20061210T090000Z/20061210T100000Z +FREEBUSY:20061211T090000Z/20061211T100000Z +FREEBUSY:20061212T090000Z/20061212T100000Z +FREEBUSY:20061213T090000Z/20061213T100000Z +FREEBUSY:20061214T090000Z/20061214T100000Z +FREEBUSY:20061215T090000Z/20061215T100000Z +FREEBUSY:20061216T090000Z/20061216T100000Z +FREEBUSY:20061217T090000Z/20061217T100000Z +FREEBUSY:20061218T090000Z/20061218T100000Z +FREEBUSY:20061219T090000Z/20061219T100000Z +FREEBUSY:20061220T090000Z/20061220T100000Z +FREEBUSY:20061221T090000Z/20061221T100000Z +FREEBUSY:20061222T090000Z/20061222T100000Z +FREEBUSY:20061223T090000Z/20061223T100000Z +FREEBUSY:20061224T090000Z/20061224T100000Z +FREEBUSY:20061225T090000Z/20061225T100000Z +FREEBUSY:20061226T090000Z/20061226T100000Z +FREEBUSY:20061227T090000Z/20061227T100000Z +FREEBUSY:20061228T090000Z/20061228T100000Z +FREEBUSY:20061229T090000Z/20061229T100000Z +FREEBUSY:20061230T090000Z/20061230T100000Z +FREEBUSY:20061231T090000Z/20061231T100000Z +FREEBUSY:20070101T090000Z/20070101T100000Z +FREEBUSY:20070102T090000Z/20070102T100000Z +FREEBUSY:20070103T090000Z/20070103T100000Z +FREEBUSY:20070104T090000Z/20070104T100000Z +FREEBUSY:20070105T090000Z/20070105T100000Z +FREEBUSY:20070106T090000Z/20070106T100000Z +FREEBUSY:20070107T090000Z/20070107T100000Z +FREEBUSY:20070108T090000Z/20070108T100000Z +FREEBUSY:20070109T090000Z/20070109T100000Z +FREEBUSY:20070110T090000Z/20070110T100000Z +FREEBUSY:20070111T090000Z/20070111T100000Z +FREEBUSY:20070112T090000Z/20070112T100000Z +FREEBUSY:20070113T090000Z/20070113T100000Z +FREEBUSY:20070114T090000Z/20070114T100000Z +FREEBUSY:20070115T090000Z/20070115T100000Z +FREEBUSY:20070116T090000Z/20070116T100000Z +FREEBUSY:20070117T090000Z/20070117T100000Z +FREEBUSY:20070118T090000Z/20070118T100000Z +FREEBUSY:20070119T090000Z/20070119T100000Z +FREEBUSY:20070120T090000Z/20070120T100000Z +FREEBUSY:20070121T090000Z/20070121T100000Z +FREEBUSY:20070122T090000Z/20070122T100000Z +FREEBUSY:20070123T090000Z/20070123T100000Z +FREEBUSY:20070124T090000Z/20070124T100000Z +FREEBUSY:20070125T090000Z/20070125T100000Z +FREEBUSY:20070126T090000Z/20070126T100000Z +FREEBUSY:20070127T090000Z/20070127T100000Z +FREEBUSY:20070128T090000Z/20070128T100000Z +FREEBUSY:20070129T090000Z/20070129T100000Z +FREEBUSY:20070130T090000Z/20070130T100000Z +FREEBUSY:20070131T090000Z/20070131T100000Z +FREEBUSY:20070201T090000Z/20070201T100000Z +FREEBUSY:20070202T090000Z/20070202T100000Z +FREEBUSY:20070203T090000Z/20070203T100000Z +FREEBUSY:20070204T090000Z/20070204T100000Z +FREEBUSY:20070205T090000Z/20070205T100000Z +FREEBUSY:20070206T090000Z/20070206T100000Z +FREEBUSY:20070207T090000Z/20070207T100000Z +FREEBUSY:20070208T090000Z/20070208T100000Z +FREEBUSY:20070209T090000Z/20070209T100000Z +FREEBUSY:20070210T090000Z/20070210T100000Z +FREEBUSY:20070211T090000Z/20070211T100000Z +FREEBUSY:20070212T090000Z/20070212T100000Z +FREEBUSY:20070213T090000Z/20070213T100000Z +FREEBUSY:20070214T090000Z/20070214T100000Z +FREEBUSY:20070215T090000Z/20070215T100000Z +FREEBUSY:20070216T090000Z/20070216T100000Z +FREEBUSY:20070217T090000Z/20070217T100000Z +FREEBUSY:20070218T090000Z/20070218T100000Z +FREEBUSY:20070219T090000Z/20070219T100000Z +FREEBUSY:20070220T090000Z/20070220T100000Z +FREEBUSY:20070221T090000Z/20070221T100000Z +FREEBUSY:20070222T090000Z/20070222T100000Z +FREEBUSY:20070223T090000Z/20070223T100000Z +FREEBUSY:20070224T090000Z/20070224T100000Z +FREEBUSY:20070225T090000Z/20070225T100000Z +FREEBUSY:20070226T090000Z/20070226T100000Z +FREEBUSY:20070227T090000Z/20070227T100000Z +FREEBUSY:20070228T090000Z/20070228T100000Z +FREEBUSY:20070301T090000Z/20070301T100000Z +FREEBUSY:20070302T090000Z/20070302T100000Z +FREEBUSY:20070303T090000Z/20070303T100000Z +FREEBUSY:20070304T090000Z/20070304T100000Z +FREEBUSY:20070305T090000Z/20070305T100000Z +FREEBUSY:20070306T090000Z/20070306T100000Z +FREEBUSY:20070307T090000Z/20070307T100000Z +FREEBUSY:20070308T090000Z/20070308T100000Z +FREEBUSY:20070309T090000Z/20070309T100000Z +FREEBUSY:20070310T090000Z/20070310T100000Z +FREEBUSY:20070311T090000Z/20070311T100000Z +FREEBUSY:20070312T090000Z/20070312T100000Z +FREEBUSY:20070313T090000Z/20070313T100000Z +FREEBUSY:20070314T090000Z/20070314T100000Z +FREEBUSY:20070315T090000Z/20070315T100000Z +FREEBUSY:20070316T090000Z/20070316T100000Z +FREEBUSY:20070317T090000Z/20070317T100000Z +FREEBUSY:20070318T100000Z/20070318T110000Z +FREEBUSY:20070319T100000Z/20070319T110000Z +FREEBUSY:20070320T100000Z/20070320T110000Z +FREEBUSY:20070321T100000Z/20070321T110000Z +FREEBUSY:20070322T100000Z/20070322T110000Z +FREEBUSY:20070323T100000Z/20070323T110000Z +FREEBUSY:20070324T100000Z/20070324T110000Z +FREEBUSY:20070325T100000Z/20070325T110000Z +FREEBUSY:20070326T100000Z/20070326T110000Z +FREEBUSY:20070327T100000Z/20070327T110000Z +FREEBUSY:20070328T100000Z/20070328T110000Z +FREEBUSY:20070329T100000Z/20070329T110000Z +FREEBUSY:20070330T100000Z/20070330T110000Z +FREEBUSY:20070331T100000Z/20070331T110000Z +FREEBUSY:20070401T100000Z/20070401T110000Z +FREEBUSY:20070402T100000Z/20070402T110000Z +FREEBUSY:20070403T100000Z/20070403T110000Z +FREEBUSY:20070404T100000Z/20070404T110000Z +FREEBUSY:20070405T100000Z/20070405T110000Z +FREEBUSY:20070406T100000Z/20070406T110000Z +FREEBUSY:20070407T100000Z/20070407T110000Z +FREEBUSY:20070408T100000Z/20070408T110000Z +FREEBUSY:20070409T100000Z/20070409T110000Z +FREEBUSY:20070410T100000Z/20070410T110000Z +FREEBUSY:20070411T100000Z/20070411T110000Z +FREEBUSY:20070412T100000Z/20070412T110000Z +FREEBUSY:20070413T100000Z/20070413T110000Z +FREEBUSY:20070414T100000Z/20070414T110000Z +FREEBUSY:20070415T100000Z/20070415T110000Z +FREEBUSY:20070416T100000Z/20070416T110000Z +FREEBUSY:20070417T100000Z/20070417T110000Z +FREEBUSY:20070418T100000Z/20070418T110000Z +FREEBUSY:20070419T100000Z/20070419T110000Z +FREEBUSY:20070420T100000Z/20070420T110000Z +FREEBUSY:20070421T100000Z/20070421T110000Z +FREEBUSY:20070422T100000Z/20070422T110000Z +FREEBUSY:20070423T100000Z/20070423T110000Z +FREEBUSY:20070424T100000Z/20070424T110000Z +FREEBUSY:20070425T100000Z/20070425T110000Z +FREEBUSY:20070426T100000Z/20070426T110000Z +FREEBUSY:20070427T100000Z/20070427T110000Z +FREEBUSY:20070428T100000Z/20070428T110000Z +FREEBUSY:20070429T100000Z/20070429T110000Z +FREEBUSY:20070430T100000Z/20070430T110000Z +FREEBUSY:20070501T100000Z/20070501T110000Z +FREEBUSY:20070502T100000Z/20070502T110000Z +FREEBUSY:20070503T100000Z/20070503T110000Z +FREEBUSY:20070504T100000Z/20070504T110000Z +FREEBUSY:20070505T100000Z/20070505T110000Z +FREEBUSY:20070506T100000Z/20070506T110000Z +FREEBUSY:20070507T100000Z/20070507T110000Z +FREEBUSY:20070508T100000Z/20070508T110000Z +FREEBUSY:20070509T100000Z/20070509T110000Z +FREEBUSY:20070510T100000Z/20070510T110000Z +FREEBUSY:20070511T100000Z/20070511T110000Z +FREEBUSY:20070512T100000Z/20070512T110000Z +FREEBUSY:20070513T100000Z/20070513T110000Z +FREEBUSY:20070514T100000Z/20070514T110000Z +FREEBUSY:20070515T100000Z/20070515T110000Z +FREEBUSY:20070516T100000Z/20070516T110000Z +FREEBUSY:20070517T100000Z/20070517T110000Z +FREEBUSY:20070518T100000Z/20070518T110000Z +FREEBUSY:20070519T100000Z/20070519T110000Z +FREEBUSY:20070520T100000Z/20070520T110000Z +FREEBUSY:20070521T100000Z/20070521T110000Z +FREEBUSY:20070522T100000Z/20070522T110000Z +FREEBUSY:20070523T100000Z/20070523T110000Z +FREEBUSY:20070524T100000Z/20070524T110000Z +FREEBUSY:20070525T100000Z/20070525T110000Z +FREEBUSY:20070526T100000Z/20070526T110000Z +FREEBUSY:20070527T100000Z/20070527T110000Z +FREEBUSY:20070528T100000Z/20070528T110000Z +FREEBUSY:20070529T100000Z/20070529T110000Z +FREEBUSY:20070530T100000Z/20070530T110000Z +FREEBUSY:20070531T100000Z/20070531T110000Z +FREEBUSY:20070601T100000Z/20070601T110000Z +FREEBUSY:20070602T100000Z/20070602T110000Z +FREEBUSY:20070603T100000Z/20070603T110000Z +FREEBUSY:20070604T100000Z/20070604T110000Z +FREEBUSY:20070605T100000Z/20070605T110000Z +FREEBUSY:20070606T100000Z/20070606T110000Z +FREEBUSY:20070607T100000Z/20070607T110000Z +FREEBUSY:20070608T100000Z/20070608T110000Z +FREEBUSY:20070609T100000Z/20070609T110000Z +FREEBUSY:20070610T100000Z/20070610T110000Z +FREEBUSY:20070611T100000Z/20070611T110000Z +FREEBUSY:20070612T100000Z/20070612T110000Z +FREEBUSY:20070613T100000Z/20070613T110000Z +FREEBUSY:20070614T100000Z/20070614T110000Z +FREEBUSY:20070615T100000Z/20070615T110000Z +FREEBUSY:20070616T100000Z/20070616T110000Z +FREEBUSY:20070617T100000Z/20070617T110000Z +FREEBUSY:20070618T100000Z/20070618T110000Z +FREEBUSY:20070619T100000Z/20070619T110000Z +FREEBUSY:20070620T100000Z/20070620T110000Z +FREEBUSY:20070621T100000Z/20070621T110000Z +FREEBUSY:20070622T100000Z/20070622T110000Z +FREEBUSY:20070623T100000Z/20070623T110000Z +FREEBUSY:20070624T100000Z/20070624T110000Z +FREEBUSY:20070625T100000Z/20070625T110000Z +FREEBUSY:20070626T100000Z/20070626T110000Z +FREEBUSY:20070627T100000Z/20070627T110000Z +FREEBUSY:20070628T100000Z/20070628T110000Z +FREEBUSY:20070629T100000Z/20070629T110000Z +FREEBUSY:20070630T100000Z/20070630T110000Z +END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/837-freebusy.test b/testing/tests/regression-suite/837-freebusy.test index f8475323..7647c451 100644 --- a/testing/tests/regression-suite/837-freebusy.test +++ b/testing/tests/regression-suite/837-freebusy.test @@ -7,7 +7,7 @@ AUTH=user3:user3 URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 HEAD -REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/ -REPLACE=/^DTSTART:\d{8}T\d{6}$/DTSTART:yyyymmddThhmmss/ -REPLACE=/^DTEND:\d{8}T\d{6}$/DTEND:yyyymmddThhmmss/ +REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ +REPLACE=/^DTSTART:\d{8}T\d{6}Z\r?$/DTSTART:yyyymmddThhmmss/ +REPLACE=/^DTEND:\d{8}T\d{6}Z\r?$/DTEND:yyyymmddThhmmss/