nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-27 00:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guess the timezone of VALUE=DATE events in freebusy

Browse Source 
Resolves #146
This commit is contained in:
Jamie McClymont 2018-10-29 14:16:49 +13:00
parent bc61d51f5b
commit 91aaf48648
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/freebusy-functions.php
View File

@ -34,7 +34,8 @@ function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null
$sql = 'SELECT caldav_data.caldav_data, calendar_item.rrule, calendar_item.transp, calendar_item.status, ';
$sql .= "to_char(calendar_item.dtstart at time zone 'GMT',".AWLDatabase::SqlUTCFormat.') AS start, ';
$sql .= "to_char(calendar_item.dtend at time zone 'GMT',".AWLDatabase::SqlUTCFormat.') AS finish, ';
$sql .= "calendar_item.class, calendar_item.dav_id ";
$sql .= "calendar_item.class, calendar_item.dav_id, ";
$sql .= "collection.timezone AS collection_tzid ";
$sql .= 'FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name,collection_id) ';
$sql .= 'INNER JOIN collection USING(collection_id)';
$sql .= $where;
@ -53,6 +54,7 @@ function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null
$ics = new vComponent($calendar_object->caldav_data);
$expanded = expand_event_instances($ics, $range_start, $range_end);
$expansion = $expanded->GetComponents( array('VEVENT'=>true,'VTODO'=>true,'VJOURNAL'=>true) );
$collection_tzid = $calendar_object->collection_tzid;
dbg_error_log( "freebusy", "=================== $calendar_object->dav_id ======================== %s -> %s, %s %s", $calendar_object->start, $calendar_object->finish, $calendar_object->class, $extra );
$dtstart_type = 'DTSTART';
foreach( $expansion AS $k => $v ) {
@ -62,7 +64,13 @@ function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null
$dtstart_type = 'DUE';
$start_date = $v->GetProperty($dtstart_type);
}
$start_date = new RepeatRuleDateTime($start_date);
if ($start_date->GetParameterValue('VALUE') == 'DATE' && isset($collection_tzid)) {
$start_date = new RepeatRuleDateTime($start_date->Value()."T000000", new RepeatRuleTimeZone($collection_tzid));
} else {
$start_date = new RepeatRuleDateTime($start_date);
}
$duration = $v->GetProperty('DURATION');
$duration = ( !isset($duration) ? 'P1D' : $duration->Value());
$end_date = clone($start_date);

48
testing/tests/regression-suite/0889-POST-freebusy.result
View File

@ -1454,9 +1454,9 @@ FREEBUSY:20081109T180000Z/20081110T040000Z
FREEBUSY:20081110T180000Z/20081111T040000Z
FREEBUSY:20081110T184500Z/20081110T193000Z
FREEBUSY:20081111T180000Z/20081112T040000Z
FREEBUSY:20081112T110000Z/20081113T110000Z
FREEBUSY:20081112T180000Z/20081113T040000Z
FREEBUSY:20081112T184500Z/20081112T193000Z
FREEBUSY:20081112T230000Z/20081113T230000Z
FREEBUSY:20081113T180000Z/20081114T040000Z
FREEBUSY:20081116T180000Z/20081117T040000Z
FREEBUSY:20081117T180000Z/20081118T040000Z
@ -1485,9 +1485,9 @@ FREEBUSY:20081207T180000Z/20081208T040000Z
FREEBUSY:20081208T180000Z/20081209T040000Z
FREEBUSY:20081208T184500Z/20081208T193000Z
FREEBUSY:20081209T180000Z/20081210T040000Z
FREEBUSY:20081210T110000Z/20081211T110000Z
FREEBUSY:20081210T180000Z/20081211T040000Z
FREEBUSY:20081210T184500Z/20081210T193000Z
FREEBUSY:20081210T230000Z/20081211T230000Z
FREEBUSY:20081211T180000Z/20081212T040000Z
FREEBUSY:20081214T180000Z/20081215T040000Z
FREEBUSY:20081215T180000Z/20081216T040000Z
@ -1516,9 +1516,9 @@ FREEBUSY:20090104T180000Z/20090105T040000Z
FREEBUSY:20090105T180000Z/20090106T040000Z
FREEBUSY:20090105T184500Z/20090105T193000Z
FREEBUSY:20090106T180000Z/20090107T040000Z
FREEBUSY:20090107T110000Z/20090108T110000Z
FREEBUSY:20090107T180000Z/20090108T040000Z
FREEBUSY:20090107T184500Z/20090107T193000Z
FREEBUSY:20090107T230000Z/20090108T230000Z
FREEBUSY:20090108T180000Z/20090109T040000Z
FREEBUSY:20090111T180000Z/20090112T040000Z
FREEBUSY:20090112T180000Z/20090113T040000Z
@ -1554,9 +1554,9 @@ FREEBUSY:20090208T180000Z/20090209T040000Z
FREEBUSY:20090209T180000Z/20090210T040000Z
FREEBUSY:20090209T184500Z/20090209T193000Z
FREEBUSY:20090210T180000Z/20090211T040000Z
FREEBUSY:20090211T110000Z/20090212T110000Z
FREEBUSY:20090211T180000Z/20090212T040000Z
FREEBUSY:20090211T184500Z/20090211T193000Z
FREEBUSY:20090211T230000Z/20090212T230000Z
FREEBUSY:20090212T180000Z/20090213T040000Z
FREEBUSY:20090215T180000Z/20090216T040000Z
FREEBUSY:20090216T180000Z/20090217T040000Z
@ -1585,9 +1585,9 @@ FREEBUSY:20090308T180000Z/20090309T040000Z
FREEBUSY:20090309T180000Z/20090310T040000Z
FREEBUSY:20090309T184500Z/20090309T193000Z
FREEBUSY:20090310T180000Z/20090311T040000Z
FREEBUSY:20090311T110000Z/20090312T110000Z
FREEBUSY:20090311T180000Z/20090312T040000Z
FREEBUSY:20090311T184500Z/20090311T193000Z
FREEBUSY:20090311T230000Z/20090312T230000Z
FREEBUSY:20090312T180000Z/20090313T040000Z
FREEBUSY:20090315T180000Z/20090316T040000Z
FREEBUSY:20090316T180000Z/20090317T040000Z
@ -1616,9 +1616,9 @@ FREEBUSY:20090405T190000Z/20090406T050000Z
FREEBUSY:20090406T190000Z/20090407T050000Z
FREEBUSY:20090406T194500Z/20090406T203000Z
FREEBUSY:20090407T190000Z/20090408T050000Z
FREEBUSY:20090408T120000Z/20090409T120000Z
FREEBUSY:20090408T190000Z/20090409T050000Z
FREEBUSY:20090408T194500Z/20090408T203000Z
FREEBUSY:20090408T220000Z/20090409T220000Z
FREEBUSY:20090409T190000Z/20090410T050000Z
FREEBUSY:20090412T190000Z/20090413T050000Z
FREEBUSY:20090413T190000Z/20090414T050000Z
@ -1647,9 +1647,9 @@ FREEBUSY:20090503T190000Z/20090504T050000Z
FREEBUSY:20090504T190000Z/20090505T050000Z
FREEBUSY:20090504T194500Z/20090504T203000Z
FREEBUSY:20090505T190000Z/20090506T050000Z
FREEBUSY:20090506T120000Z/20090507T120000Z
FREEBUSY:20090506T190000Z/20090507T050000Z
FREEBUSY:20090506T194500Z/20090506T203000Z
FREEBUSY:20090506T220000Z/20090507T220000Z
FREEBUSY:20090507T190000Z/20090508T050000Z
FREEBUSY:20090510T190000Z/20090511T050000Z
FREEBUSY:20090511T190000Z/20090512T050000Z
@ -1685,9 +1685,9 @@ FREEBUSY:20090607T190000Z/20090608T050000Z
FREEBUSY:20090608T190000Z/20090609T050000Z
FREEBUSY:20090608T194500Z/20090608T203000Z
FREEBUSY:20090609T190000Z/20090610T050000Z
FREEBUSY:20090610T120000Z/20090611T120000Z
FREEBUSY:20090610T190000Z/20090611T050000Z
FREEBUSY:20090610T194500Z/20090610T203000Z
FREEBUSY:20090610T220000Z/20090611T220000Z
FREEBUSY:20090611T190000Z/20090612T050000Z
FREEBUSY:20090614T190000Z/20090615T050000Z
FREEBUSY:20090615T190000Z/20090616T050000Z
@ -1716,9 +1716,9 @@ FREEBUSY:20090705T190000Z/20090706T050000Z
FREEBUSY:20090706T190000Z/20090707T050000Z
FREEBUSY:20090706T194500Z/20090706T203000Z
FREEBUSY:20090707T190000Z/20090708T050000Z
FREEBUSY:20090708T120000Z/20090709T120000Z
FREEBUSY:20090708T190000Z/20090709T050000Z
FREEBUSY:20090708T194500Z/20090708T203000Z
FREEBUSY:20090708T220000Z/20090709T220000Z
FREEBUSY:20090709T190000Z/20090710T050000Z
FREEBUSY:20090712T190000Z/20090713T050000Z
FREEBUSY:20090713T190000Z/20090714T050000Z
@ -1754,9 +1754,9 @@ FREEBUSY:20090809T190000Z/20090810T050000Z
FREEBUSY:20090810T190000Z/20090811T050000Z
FREEBUSY:20090810T194500Z/20090810T203000Z
FREEBUSY:20090811T190000Z/20090812T050000Z
FREEBUSY:20090812T120000Z/20090813T120000Z
FREEBUSY:20090812T190000Z/20090813T050000Z
FREEBUSY:20090812T194500Z/20090812T203000Z
FREEBUSY:20090812T220000Z/20090813T220000Z
FREEBUSY:20090813T190000Z/20090814T050000Z
FREEBUSY:20090816T190000Z/20090817T050000Z
FREEBUSY:20090817T190000Z/20090818T050000Z
@ -1785,9 +1785,9 @@ FREEBUSY:20090906T190000Z/20090907T050000Z
FREEBUSY:20090907T190000Z/20090908T050000Z
FREEBUSY:20090907T194500Z/20090907T203000Z
FREEBUSY:20090908T190000Z/20090909T050000Z
FREEBUSY:20090909T120000Z/20090910T120000Z
FREEBUSY:20090909T190000Z/20090910T050000Z
FREEBUSY:20090909T194500Z/20090909T203000Z
FREEBUSY:20090909T220000Z/20090910T220000Z
FREEBUSY:20090910T190000Z/20090911T050000Z
FREEBUSY:20090913T190000Z/20090914T050000Z
FREEBUSY:20090914T190000Z/20090915T050000Z
@ -1817,9 +1817,9 @@ FREEBUSY:20091005T120000Z/20091005T130000Z
FREEBUSY:20091005T180000Z/20091006T040000Z
FREEBUSY:20091005T184500Z/20091005T193000Z
FREEBUSY:20091006T180000Z/20091007T040000Z
FREEBUSY:20091007T110000Z/20091008T110000Z
FREEBUSY:20091007T180000Z/20091008T040000Z
FREEBUSY:20091007T184500Z/20091007T193000Z
FREEBUSY:20091007T220000Z/20091008T220000Z
FREEBUSY:20091008T180000Z/20091009T040000Z
FREEBUSY:20091011T180000Z/20091012T040000Z
FREEBUSY:20091012T180000Z/20091013T040000Z
@ -1855,9 +1855,9 @@ FREEBUSY:20091108T180000Z/20091109T040000Z
FREEBUSY:20091109T180000Z/20091110T040000Z
FREEBUSY:20091109T184500Z/20091109T193000Z
FREEBUSY:20091110T180000Z/20091111T040000Z
FREEBUSY:20091111T110000Z/20091112T110000Z
FREEBUSY:20091111T180000Z/20091112T040000Z
FREEBUSY:20091111T184500Z/20091111T193000Z
FREEBUSY:20091111T230000Z/20091112T230000Z
FREEBUSY:20091112T180000Z/20091113T040000Z
FREEBUSY:20091115T180000Z/20091116T040000Z
FREEBUSY:20091116T180000Z/20091117T040000Z
@ -1886,9 +1886,9 @@ FREEBUSY:20091206T180000Z/20091207T040000Z
FREEBUSY:20091207T180000Z/20091208T040000Z
FREEBUSY:20091207T184500Z/20091207T193000Z
FREEBUSY:20091208T180000Z/20091209T040000Z
FREEBUSY:20091209T110000Z/20091210T110000Z
FREEBUSY:20091209T180000Z/20091210T040000Z
FREEBUSY:20091209T184500Z/20091209T193000Z
FREEBUSY:20091209T230000Z/20091210T230000Z
FREEBUSY:20091210T180000Z/20091211T040000Z
FREEBUSY:20091213T180000Z/20091214T040000Z
FREEBUSY:20091214T180000Z/20091215T040000Z
@ -1917,9 +1917,9 @@ FREEBUSY:20100103T180000Z/20100104T040000Z
FREEBUSY:20100104T180000Z/20100105T040000Z
FREEBUSY:20100104T184500Z/20100104T193000Z
FREEBUSY:20100105T180000Z/20100106T040000Z
FREEBUSY:20100106T110000Z/20100107T110000Z
FREEBUSY:20100106T180000Z/20100107T040000Z
FREEBUSY:20100106T184500Z/20100106T193000Z
FREEBUSY:20100106T230000Z/20100107T230000Z
FREEBUSY:20100107T180000Z/20100108T040000Z
FREEBUSY:20100110T180000Z/20100111T040000Z
FREEBUSY:20100111T180000Z/20100112T040000Z
@ -1955,9 +1955,9 @@ FREEBUSY:20100207T180000Z/20100208T040000Z
FREEBUSY:20100208T180000Z/20100209T040000Z
FREEBUSY:20100208T184500Z/20100208T193000Z
FREEBUSY:20100209T180000Z/20100210T040000Z
FREEBUSY:20100210T110000Z/20100211T110000Z
FREEBUSY:20100210T180000Z/20100211T040000Z
FREEBUSY:20100210T184500Z/20100210T193000Z
FREEBUSY:20100210T230000Z/20100211T230000Z
FREEBUSY:20100211T180000Z/20100212T040000Z
FREEBUSY:20100214T180000Z/20100215T040000Z
FREEBUSY:20100215T180000Z/20100216T040000Z
@ -1986,9 +1986,9 @@ FREEBUSY:20100307T180000Z/20100308T040000Z
FREEBUSY:20100308T180000Z/20100309T040000Z
FREEBUSY:20100308T184500Z/20100308T193000Z
FREEBUSY:20100309T180000Z/20100310T040000Z
FREEBUSY:20100310T110000Z/20100311T110000Z
FREEBUSY:20100310T180000Z/20100311T040000Z
FREEBUSY:20100310T184500Z/20100310T193000Z
FREEBUSY:20100310T230000Z/20100311T230000Z
FREEBUSY:20100311T180000Z/20100312T040000Z
FREEBUSY:20100314T180000Z/20100315T040000Z
FREEBUSY:20100315T180000Z/20100316T040000Z
@ -2017,9 +2017,9 @@ FREEBUSY:20100404T190000Z/20100405T050000Z
FREEBUSY:20100405T190000Z/20100406T050000Z
FREEBUSY:20100405T194500Z/20100405T203000Z
FREEBUSY:20100406T190000Z/20100407T050000Z
FREEBUSY:20100407T120000Z/20100408T120000Z
FREEBUSY:20100407T190000Z/20100408T050000Z
FREEBUSY:20100407T194500Z/20100407T203000Z
FREEBUSY:20100407T220000Z/20100408T220000Z
FREEBUSY:20100408T190000Z/20100409T050000Z
FREEBUSY:20100411T190000Z/20100412T050000Z
FREEBUSY:20100412T190000Z/20100413T050000Z
@ -2055,9 +2055,9 @@ FREEBUSY:20100509T190000Z/20100510T050000Z
FREEBUSY:20100510T190000Z/20100511T050000Z
FREEBUSY:20100510T194500Z/20100510T203000Z
FREEBUSY:20100511T190000Z/20100512T050000Z
FREEBUSY:20100512T120000Z/20100513T120000Z
FREEBUSY:20100512T190000Z/20100513T050000Z
FREEBUSY:20100512T194500Z/20100512T203000Z
FREEBUSY:20100512T220000Z/20100513T220000Z
FREEBUSY:20100513T190000Z/20100514T050000Z
FREEBUSY:20100516T190000Z/20100517T050000Z
FREEBUSY:20100517T190000Z/20100518T050000Z
@ -2086,9 +2086,9 @@ FREEBUSY:20100606T190000Z/20100607T050000Z
FREEBUSY:20100607T190000Z/20100608T050000Z
FREEBUSY:20100607T194500Z/20100607T203000Z
FREEBUSY:20100608T190000Z/20100609T050000Z
FREEBUSY:20100609T120000Z/20100610T120000Z
FREEBUSY:20100609T190000Z/20100610T050000Z
FREEBUSY:20100609T194500Z/20100609T203000Z
FREEBUSY:20100609T220000Z/20100610T220000Z
FREEBUSY:20100610T190000Z/20100611T050000Z
FREEBUSY:20100613T190000Z/20100614T050000Z
FREEBUSY:20100614T190000Z/20100615T050000Z
@ -2117,9 +2117,9 @@ FREEBUSY:20100704T190000Z/20100705T050000Z
FREEBUSY:20100705T190000Z/20100706T050000Z
FREEBUSY:20100705T194500Z/20100705T203000Z
FREEBUSY:20100706T190000Z/20100707T050000Z
FREEBUSY:20100707T120000Z/20100708T120000Z
FREEBUSY:20100707T190000Z/20100708T050000Z
FREEBUSY:20100707T194500Z/20100707T203000Z
FREEBUSY:20100707T220000Z/20100708T220000Z
FREEBUSY:20100708T190000Z/20100709T050000Z
FREEBUSY:20100711T190000Z/20100712T050000Z
FREEBUSY:20100712T190000Z/20100713T050000Z
@ -2155,9 +2155,9 @@ FREEBUSY:20100808T190000Z/20100809T050000Z
FREEBUSY:20100809T190000Z/20100810T050000Z
FREEBUSY:20100809T194500Z/20100809T203000Z
FREEBUSY:20100810T190000Z/20100811T050000Z
FREEBUSY:20100811T120000Z/20100812T120000Z
FREEBUSY:20100811T190000Z/20100812T050000Z
FREEBUSY:20100811T194500Z/20100811T203000Z
FREEBUSY:20100811T220000Z/20100812T220000Z
FREEBUSY:20100812T190000Z/20100813T050000Z
FREEBUSY:20100815T190000Z/20100816T050000Z
FREEBUSY:20100816T190000Z/20100817T050000Z
@ -2186,9 +2186,9 @@ FREEBUSY:20100905T190000Z/20100906T050000Z
FREEBUSY:20100906T190000Z/20100907T050000Z
FREEBUSY:20100906T194500Z/20100906T203000Z
FREEBUSY:20100907T190000Z/20100908T050000Z
FREEBUSY:20100908T120000Z/20100909T120000Z
FREEBUSY:20100908T190000Z/20100909T050000Z
FREEBUSY:20100908T194500Z/20100908T203000Z
FREEBUSY:20100908T220000Z/20100909T220000Z
FREEBUSY:20100909T190000Z/20100910T050000Z
FREEBUSY:20100912T190000Z/20100913T050000Z
FREEBUSY:20100913T190000Z/20100914T050000Z
@ -2217,9 +2217,9 @@ FREEBUSY:20101003T180000Z/20101004T040000Z
FREEBUSY:20101004T180000Z/20101005T040000Z
FREEBUSY:20101004T184500Z/20101004T193000Z
FREEBUSY:20101005T180000Z/20101006T040000Z
FREEBUSY:20101006T110000Z/20101007T110000Z
FREEBUSY:20101006T180000Z/20101007T040000Z
FREEBUSY:20101006T184500Z/20101006T193000Z
FREEBUSY:20101006T220000Z/20101007T220000Z
FREEBUSY:20101007T180000Z/20101008T040000Z
FREEBUSY:20101010T180000Z/20101011T040000Z
FREEBUSY:20101011T180000Z/20101012T040000Z