From e576d884a33efb3c0c89a1c200a53c959a9d69e4 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Wed, 22 Nov 2006 20:58:18 +1300
Subject: [PATCH] Switch to use new function for date presentation.

---
 inc/freebusy-GET.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/inc/freebusy-GET.php b/inc/freebusy-GET.php
index afe84fa1..d69cfbf4 100644
--- a/inc/freebusy-GET.php
+++ b/inc/freebusy-GET.php
@@ -1,19 +1,18 @@
 <?php
-
 require_once("iCalendar.php");
 
-  header("Content-type: text/plain");
-
-  $sql = "SELECT caldav_data.caldav_type AS type, calendar_item.uid, calendar_item.rrule ";
-  $sql .= ", to_char(dtstart at time zone 'UTC',".iCalendar::SqlUTCFormat().") AS dtstart ";
-  $sql .= ", to_char(dtend at time zone 'UTC',".iCalendar::SqlUTCFormat().") AS dtend ";
-  $sql .= ", to_char(due at time zone 'UTC',".iCalendar::SqlUTCFormat().") AS due ";
-  $sql .= ", to_char(dtstamp,".iCalendar::SqlUTCFormat().")  AS dtstamp ";
-  $sql .= ", to_char(last_modified,".iCalendar::SqlUTCFormat().")  AS \"last-modified\" ";
-  $sql .= " FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name)";
-  $sql .= " WHERE caldav_data.dav_name ~ ".qpg("^".$request_path)." ";
+  $sql = 'SELECT caldav_data.caldav_type AS type, calendar_item.uid, calendar_item.rrule ';
+  $sql .= ', to_ical_utc(dtstart)  AS dtstart ';
+  $sql .= ', to_ical_utc(dtend)    AS dtend ';
+  $sql .= ', to_ical_utc(due)      AS due ';
+  $sql .= ', to_ical_utc(dtstamp)  AS dtstamp ';
+  $sql .= ', to_ical_utc(last_modified)  AS "last-modified" ';
+  $sql .= ' FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name) ';
+  $sql .= ' WHERE caldav_data.dav_name ~ '.qpg("^".$request_path);
   $qry = new PgQuery( $sql );
 
+  header("Content-type: text/calendar");
+
   echo iCalendar::iCalHeader();
 
   $freebusy_properties = array( "uid", "dtstamp", "dtstart", "duration", "last-modified", "rrule" );
@@ -25,4 +24,5 @@ require_once("iCalendar.php");
     }
   }
   echo iCalendar::iCalFooter();
+
 ?>
\ No newline at end of file