Make a note of the fact that we've hardcoded

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 6055cc0d87e3c8e01efd953e0e73ff83cc29f31c..d83cbc35be109b022ad324dc9c2bf8acdf70dd4e 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -9,6 +9,7 @@
 
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
@@ -27,6 +28,28 @@
 #include "ical_dezonify.h"
 
 
+/*
+ * Figure out which time zone needs to be used for timestamps that are
+ * not UTC and do not have a time zone specified.
+ *
+ * FIXME - most sites are not in New York :)
+ */
+icaltimezone *get_default_icaltimezone(void) {
+
+        char *location = NULL;
+        icaltimezone *zone = NULL;
+
+        location = "America/New_York";
+        if (location) {
+                zone = icaltimezone_get_builtin_timezone(location);
+        }
+        if (!zone) {
+                zone = icaltimezone_get_utc_timezone();
+       }
+        return zone;
+}
+
+
 /*
  * Back end function for ical_dezonify()
  *
@@ -78,15 +101,32 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       /* Do the conversion. */
-       if (t != NULL) {
+       lprintf(CTDL_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+       if (TheTime.is_utc) {
+               lprintf(CTDL_DEBUG, "                * This property is ALREADY UTC.\n");
+       }
+       else {
+               /* Do the conversion. */
+               if (t != NULL) {
+                       lprintf(CTDL_DEBUG, "                * Timezone prop found.  Converting to UTC.\n");
+               }
+               else {
+                       lprintf(CTDL_DEBUG, "                * Converting default timezone to UTC.\n");
+               }
+
+               if (t == NULL) {
+                       t = get_default_icaltimezone();
+               }
+
                icaltimezone_convert_time(&TheTime,
                                        t,
                                        icaltimezone_get_utc_timezone()
                );
+               TheTime.is_utc = 1;
        }
-       TheTime.is_utc = 1;
+
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
+       lprintf(CTDL_DEBUG, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -154,6 +194,8 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
+       lprintf(CTDL_DEBUG, "ical_dezonify() started\n");
+
        /* Convert all times to UTC */
        ical_dezonify_recur(cal, cal);
 
@@ -164,6 +206,7 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
+       lprintf(CTDL_DEBUG, "ical_dezonify() completed\n");
 }