X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fical_dezonify.c;h=c50f75621d3b491086a9846e45d5181c06f34f05;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=0dbf47818a66d3085d9d31d64436415c773577f8;hpb=2fd279056306208b84c5f5908b0d6e820dc71876;p=citadel.git

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 0dbf47818..c50f75621 100644
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -1,42 +1,35 @@
 /* 
- * $Id$ 
- */
-/**
- * \defgroup IcalDezonify normalize ical dates to UTC
  * Function to go through an ical component set and convert all non-UTC
  * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
  *
  * Everything here will work on both a fully encapsulated VCALENDAR component
  * or any type of subcomponent.
- *
- * \ingroup Calendaring
  */
-/*@{*/
 
 #include "webcit.h"
 #include "webserver.h"
 
-
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-
 /*
  * 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) {
 
         icaltimezone *zone = NULL;
+	const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone);
 
         if (!zone) {
-                zone = icaltimezone_get_builtin_timezone(serv_info.serv_default_cal_zone);
+                zone = icaltimezone_get_builtin_timezone(default_zone_name);
         }
         if (!zone) {
+		syslog(1, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
                 zone = icaltimezone_get_utc_timezone();
 	}
+	if (!zone) {
+		syslog(1, "Unable to load UTC time zone!\n");
+	}
         return zone;
 }
 
@@ -54,8 +47,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;
@@ -69,7 +63,33 @@ void ical_dezonify_backend(icalcomponent *cal,
 
 		/* Convert it to an icaltimezone type. */
 		if (tzid != NULL) {
-			t = icalcomponent_get_timezone(cal, tzid);
+#ifdef DBG_ICAL
+			syslog(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+#endif
+			if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
+				utc_declared_as_tzid = 1;
+#ifdef DBG_ICAL
+				syslog(9, "                * ...and we handle that internally.\n");
+#endif
+			}
+			else {
+				/* try attached first */
+				t = icalcomponent_get_timezone(cal, tzid);
+#ifdef DBG_ICAL
+				syslog(9, "                * ...and I %s have tzdata for that zone.\n",
+					(t ? "DO" : "DO NOT")
+				);
+#endif
+				/* then try built-in timezones */
+				if (!t) {
+					t = icaltimezone_get_builtin_timezone(tzid);
+#ifdef DBG_ICAL
+					if (t) {
+						syslog(9, "                * Using system tzdata!\n");
+					}
+#endif
+				}
+			}
 		}
 
 	}
@@ -92,32 +112,47 @@ void ical_dezonify_backend(icalcomponent *cal,
 		return;
 	}
 
-	/* lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
+#ifdef DBG_ICAL
+	syslog(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+#endif
+
 	if (TheTime.is_utc) {
-		/* lprintf(9, "                * This property is ALREADY UTC.\n"); */
+#ifdef DBG_ICAL
+		syslog(9, "                * This property is ALREADY UTC.\n");
+#endif
 	}
+
+	else if (utc_declared_as_tzid) {
+#ifdef DBG_ICAL
+		syslog(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+#endif
+		TheTime.is_utc = 1;
+	}
+
 	else {
 		/* Do the conversion. */
 		if (t != NULL) {
-			/* lprintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
+#ifdef DBG_ICAL
+			syslog(9, "                * Timezone prop found.  Converting to UTC.\n");
+#endif
 		}
 		else {
-			/* lprintf(9, "                * Converting default timezone to UTC.\n"); */
+#ifdef DBG_ICAL
+			syslog(9, "                * Converting default timezone to UTC.\n");
+#endif
 		}
 
 		if (t == NULL) {
 			t = get_default_icaltimezone();
 		}
-
-		icaltimezone_convert_time(&TheTime,
-					t,
-					icaltimezone_get_utc_timezone()
-		);
+		icaltimezone_convert_time(&TheTime, t, icaltimezone_get_utc_timezone());
 		TheTime.is_utc = 1;
 	}
 
 	icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-	/* lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime)); */
+#ifdef DBG_ICAL
+	syslog(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+#endif
 
 	/* Now add the converted property back in. */
 	if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -159,11 +194,9 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 	/*
 	 * 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)
@@ -185,7 +218,9 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
-	/* lprintf(9, "ical_dezonify() started\n"); */
+#ifdef DBG_ICAL
+	syslog(9, "ical_dezonify() started\n");
+#endif
 
 	/* Convert all times to UTC */
 	ical_dezonify_recurse(cal, cal);
@@ -197,8 +232,8 @@ void ical_dezonify(icalcomponent *cal) {
 		icalcomponent_free(vt);
 	}
 
-	/* lprintf(9, "ical_dezonify() completed\n"); */
+#ifdef DBG_ICAL
+	syslog(9, "ical_dezonify() completed\n");
+#endif
 }
 
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */