libical, expat, and libsieve are now *required*.

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ccc46d4316960b04a6da35a35ac5523b585c010c..d3c7ed5d893e5282b34eb3d6b6086bda77f02683 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -16,18 +16,42 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
+#include <ical.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "sysdep_decls.h"
 #include "support.h"
 #include "config.h"
-
-#ifdef CITADEL_WITH_CALENDAR_SERVICE
-#include <ical.h>
 #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.
+ */
+icaltimezone *get_default_icaltimezone(void) {
+
+        icaltimezone *zone = NULL;
+       char *default_zone_name = config.c_default_cal_zone;
+       //char *default_zone_name = "America/New_York";
+
+        if (!zone) {
+                zone = icaltimezone_get_builtin_timezone(default_zone_name);
+        }
+        if (!zone) {
+               lprintf(CTDL_ALERT,
+                       "Unable to load '%s' time zone.  Defaulting to UTC.\n",
+                       default_zone_name);
+                zone = icaltimezone_get_utc_timezone();
+       }
+       if (!zone) {
+               lprintf(1, "Unable to load UTC time zone!\n");
+       }
+        return zone;
+}
+
+
 /*
  * Back end function for ical_dezonify()
  *
@@ -41,8 +65,9 @@ void ical_dezonify_backend(icalcomponent *cal,
 
        icaltimezone *t = NULL;
        icalparameter *param;
-       const char *tzid;
+       const char *tzid = NULL;
        struct icaltimetype TheTime;
+       int utc_declared_as_tzid = 0;   /**< Component declared 'TZID=GMT' instead of using Z syntax */
 
        /* Give me nothing and I will give you nothing in return. */
        if (cal == NULL) return;
@@ -56,7 +81,17 @@ void ical_dezonify_backend(icalcomponent *cal,
 
                /* Convert it to an icaltimezone type. */
                if (tzid != NULL) {
-                       t = icalcomponent_get_timezone(cal, tzid);
+                       /* lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid); */
+                       if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
+                               utc_declared_as_tzid = 1;
+                               /* lprintf(9, "                * ...and we handle that internally.\n"); */
+                       }
+                       else {
+                               t = icalcomponent_get_timezone(cal, tzid);
+                               /* lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+                                       (t ? "DO" : "DO NOT")
+                               ); */
+                       }
                }
 
        }
@@ -79,15 +114,39 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       /* Do the conversion. */
-       if (t != NULL) {
+       /* lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
+
+       if (TheTime.is_utc) {
+               /* lprintf(9, "                * This property is ALREADY UTC.\n"); */
+       }
+
+       else if (utc_declared_as_tzid) {
+               /* lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
+               TheTime.is_utc = 1;
+       }
+
+       else {
+               /* Do the conversion. */
+               if (t != NULL) {
+                       /* lprintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
+               }
+               else {
+                       /* lprintf(9, "                * 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(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime)); */
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -108,7 +167,7 @@ void ical_dezonify_backend(icalcomponent *cal,
 /*
  * Recursive portion of ical_dezonify()
  */
-void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
+void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
        icalcomponent *c;
        icalproperty *p;
 
@@ -122,18 +181,16 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
                                        rcal, ICAL_ANY_COMPONENT)
        ) {
                if (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT) {
-                       ical_dezonify_recur(cal, c);
+                       ical_dezonify_recurse(cal, c);
                }
        }
 
        /*
         * Now look for DTSTART and DTEND properties
         */
-       for (p=icalcomponent_get_first_property(
-                               rcal, ICAL_ANY_PROPERTY);
+       for (p=icalcomponent_get_first_property(rcal, ICAL_ANY_PROPERTY);
                p != NULL;
-               p = icalcomponent_get_next_property(
-                               rcal, ICAL_ANY_PROPERTY)
+               p = icalcomponent_get_next_property(rcal, ICAL_ANY_PROPERTY)
        ) {
                if (
                        (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
@@ -155,8 +212,10 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
+       /* lprintf(9, "ical_dezonify() started\n"); */
+
        /* Convert all times to UTC */
-       ical_dezonify_recur(cal, cal);
+       ical_dezonify_recurse(cal, cal);
 
        /* Strip out VTIMEZONE subcomponents -- we don't need them anymore */
        while (vt = icalcomponent_get_first_component(
@@ -165,7 +224,5 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
+       /* lprintf(9, "ical_dezonify() completed\n"); */
 }
-
-
-#endif /* CITADEL_WITH_CALENDAR_SERVICE */