X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fical_dezonify.c;h=463af2f0cc2985280b37fbcb9173ab26e49ed98d;hb=a2fda4eafb51bbf58c04471522aa2d0f116c797e;hp=f7ead4e3da53940210662f2876cd134cb8152fa9;hpb=4180f65d04e2e7ebf461c805af0002a489e93b82;p=citadel.git

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index f7ead4e3d..463af2f0c 100644
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -9,24 +9,49 @@
 
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
 #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 HAVE_ICAL_H
-#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) {
+		CtdlLogPrintf(CTDL_ALERT,
+			"Unable to load '%s' time zone.  Defaulting to UTC.\n",
+			default_zone_name);
+                zone = icaltimezone_get_utc_timezone();
+	}
+	if (!zone) {
+		CtdlLogPrintf(1, "Unable to load UTC time zone!\n");
+	}
+        return zone;
+}
+
+
 /*
  * Back end function for ical_dezonify()
  *
@@ -38,25 +63,38 @@ void ical_dezonify_backend(icalcomponent *cal,
 			icalcomponent *rcal,
 			icalproperty *prop) {
 
-	icaltimezone *t;
+	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;
 
 	/* Hunt for a TZID parameter in this property. */
 	param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
-	if (param == NULL) return;
 
 	/* Get the stringish name of this TZID. */
-	tzid = icalparameter_get_tzid(param);
-	if (tzid == NULL) return;
+	if (param != NULL) {
+		tzid = icalparameter_get_tzid(param);
+
+		/* Convert it to an icaltimezone type. */
+		if (tzid != NULL) {
+			/* CtdlLogPrintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid); */
+			if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
+				utc_declared_as_tzid = 1;
+				/* CtdlLogPrintf(9, "                * ...and we handle that internally.\n"); */
+			}
+			else {
+				t = icalcomponent_get_timezone(cal, tzid);
+				/* CtdlLogPrintf(9, "                * ...and I %s have tzdata for that zone.\n",
+					(t ? "DO" : "DO NOT")
+				); */
+			}
+		}
 
-	/* Convert it to an icaltimezone type. */
-	t = icalcomponent_get_timezone(cal, tzid);
-	if (t == NULL) return;
+	}
 
 	/* Now we know the timezone.  Convert to UTC. */
 
@@ -76,13 +114,39 @@ void ical_dezonify_backend(icalcomponent *cal,
 		return;
 	}
 
-	/* Do the conversion. */
-	icaltimezone_convert_time(&TheTime,
-				t,
-				icaltimezone_get_utc_timezone()
-	);
-	TheTime.is_utc = 1;
+	/* CtdlLogPrintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
+
+	if (TheTime.is_utc) {
+		/* CtdlLogPrintf(9, "                * This property is ALREADY UTC.\n"); */
+	}
+
+	else if (utc_declared_as_tzid) {
+		/* CtdlLogPrintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
+		TheTime.is_utc = 1;
+	}
+
+	else {
+		/* Do the conversion. */
+		if (t != NULL) {
+			/* CtdlLogPrintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
+		}
+		else {
+			/* CtdlLogPrintf(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;
+	}
+
 	icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
+	/* CtdlLogPrintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime)); */
 
 	/* Now add the converted property back in. */
 	if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -103,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;
 
@@ -117,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)
@@ -150,8 +212,10 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
+	/* CtdlLogPrintf(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(
@@ -160,7 +224,5 @@ void ical_dezonify(icalcomponent *cal) {
 		icalcomponent_free(vt);
 	}
 
+	/* CtdlLogPrintf(9, "ical_dezonify() completed\n"); */
 }
-
-
-#endif /* HAVE_ICAL_H */