diff --git a/inc/caldav-POST.php b/inc/caldav-POST.php index 86dce713..c11a90fe 100644 --- a/inc/caldav-POST.php +++ b/inc/caldav-POST.php @@ -94,8 +94,8 @@ function handle_freebusy_request( $ic ) { $busy_tentative = array(); /** @TODO prove this is correct */ $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',".iCalendar::SqlDateFormat().") AS start, "; - $sql .= "to_char(calendar_item.dtend at time zone 'GMT',".iCalendar::SqlDateFormat().") AS finish "; + $sql .= "to_char(calendar_item.dtstart at time zone 'GMT',".iCalendar::SqlUTCFormat().") AS start, "; + $sql .= "to_char(calendar_item.dtend at time zone 'GMT',".iCalendar::SqlUTCFormat().") AS finish "; $sql .= "FROM usr INNER JOIN collection USING (user_no) INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id)".$where; if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY dav_id"; $qry = new PgQuery( $sql, $attendee_email ); diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result index e43a3e3a..2f40758b 100644 --- a/testing/tests/regression-suite/244-Moz-POST-FB.result +++ b/testing/tests/regression-suite/244-Moz-POST-FB.result @@ -22,7 +22,6 @@ FREEBUSY;FBTYPE=BUSY:20081020T090000Z/20081020T093000Z FREEBUSY;FBTYPE=BUSY:20081021T090000Z/20081021T093000Z FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z -FREEBUSY;FBTYPE=BUSY:20081024T090000Z/20081024T093000Z FREEBUSY;FBTYPE=BUSY:20081027T090000Z/20081027T093000Z FREEBUSY;FBTYPE=BUSY:20081028T090000Z/20081028T093000Z FREEBUSY;FBTYPE=BUSY:20081029T090000Z/20081029T093000Z @@ -32,7 +31,7 @@ FREEBUSY;FBTYPE=BUSY:20081103T090000Z/20081103T093000Z FREEBUSY;FBTYPE=BUSY:20081104T090000Z/20081104T093000Z FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z -FREEBUSY;FBTYPE=BUSY:20081023T120000Z/20081023T130000Z +FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z FREEBUSY;FBTYPE=BUSY:20081030T120000Z/20081030T130000Z END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/516-iCal-POST.result b/testing/tests/regression-suite/516-iCal-POST.result index 442b6eb6..de4417dd 100644 --- a/testing/tests/regression-suite/516-iCal-POST.result +++ b/testing/tests/regression-suite/516-iCal-POST.result @@ -19,7 +19,7 @@ ORGANIZER:mailto:user1@example.net X-WR-ATTENDEE:mailto:user2@example.net FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z -FREEBUSY;FBTYPE=BUSY:20081023T120000Z/20081023T130000Z +FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/880-Freebusy-POST.result b/testing/tests/regression-suite/880-Freebusy-POST.result index 4794264a..7890fe1d 100644 --- a/testing/tests/regression-suite/880-Freebusy-POST.result +++ b/testing/tests/regression-suite/880-Freebusy-POST.result @@ -61,7 +61,6 @@ ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: FREEBUSY;FBTYPE=BUSY:20081021T090000Z/20081021T093000Z FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z -FREEBUSY;FBTYPE=BUSY:20081024T090000Z/20081024T093000Z FREEBUSY;FBTYPE=BUSY:20081027T090000Z/20081027T093000Z FREEBUSY;FBTYPE=BUSY:20081028T090000Z/20081028T093000Z FREEBUSY;FBTYPE=BUSY:20081029T090000Z/20081029T093000Z @@ -72,7 +71,7 @@ FREEBUSY;FBTYPE=BUSY:20081104T090000Z/20081104T093000Z FREEBUSY;FBTYPE=BUSY:20081105T090000Z/20081105T093000Z FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z -FREEBUSY;FBTYPE=BUSY:20081023T120000Z/20081023T130000Z +FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z FREEBUSY;FBTYPE=BUSY:20081030T120000Z/20081030T130000Z END:VFREEBUSY END:VCALENDAR