From 3bc5cf584b0478cba1a44a3fba6d4feeac8312ae Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Thu, 4 Jan 2007 09:46:34 +1300
Subject: [PATCH] Send correct list of timezones with calendar export of
 collection.

---
 inc/caldav-GET.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/caldav-GET.php b/inc/caldav-GET.php
index 7a6f30fe..f2183906 100644
--- a/inc/caldav-GET.php
+++ b/inc/caldav-GET.php
@@ -27,7 +27,7 @@ else {
 dbg_error_log("get", "%s", $qry->querystring );
 if ( $qry->Exec("GET") && $qry->rows == 1 ) {
   $event = $qry->Fetch();
-  header( "Content-length: ".strlen($event->caldav_data) );
+  header( "Content-Length: ".strlen($event->caldav_data) );
   $request->DoResponse( 200, ($request->method == "HEAD" ? "" : $event->caldav_data), "text/calendar" );
 }
 else if ( $qry->rows < 1 ) {
@@ -44,7 +44,7 @@ else if ( $qry->rows > 1 ) {
   while( $event = $qry->Fetch() ) {
     $ical = new iCalendar( array( "icalendar" => $event->caldav_data ) );
     if ( isset($ical->tz_locn) && $ical->tz_locn != "" && isset($ical->vtimezone) && $ical->vtimezone != "" ) {
-      $timezones[$ical->tz_locn] = $ical->vtimezone;
+      $timezones[$ical->Get("tzid")] = $ical->vtimezone;
     }
     $response .= $ical->JustThisBitPlease("VEVENT");
   }
@@ -52,7 +52,7 @@ else if ( $qry->rows > 1 ) {
     $response .= $vtimezone;
   }
   $response .= iCalendar::iCalFooter();
-  header( "Content-length: ".strlen($response) );
+  header( "Content-Length: ".strlen($response) );
   $request->DoResponse( 200, ($request->method == "HEAD" ? "" : $response), "text/calendar" );
 }
 else {