/*
* $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"
* 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;
+ char *default_zone_name = serv_info.serv_default_cal_zone;
- location = "America/New_York";
- if (location) {
- zone = icaltimezone_get_builtin_timezone(location);
+ if (!zone) {
+ zone = icaltimezone_get_builtin_timezone(default_zone_name);
}
if (!zone) {
+ lprintf(1, "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;
}
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;
/* 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")
+ );
+ }
}
}
}
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) {
}
if (t == NULL) {
- t = get_default_icaltimezone();
+ icaltimezone_convert_time(&TheTime,
+ get_default_icaltimezone(),
+ icaltimezone_get_utc_timezone()
+ );
+ }
+ else {
+ icaltimezone_convert_time(&TheTime,
+ t,
+ icaltimezone_get_utc_timezone()
+ );
+ icaltimezone_free (t, 1);
}
-
- icaltimezone_convert_time(&TheTime,
- t,
- icaltimezone_get_utc_timezone()
- );
TheTime.is_utc = 1;
}
/*
* 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;
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)
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(