X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fical_dezonify.c;h=c50f75621d3b491086a9846e45d5181c06f34f05;hb=86a1d535af8c52cc9536b03b707eed2d8674da31;hp=0748bc91766b73786170d0bc44c22af50db96c40;hpb=227c92b79dbb6aed6e4e0e045e4f2f63f77a7f2e;p=citadel.git diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c index 0748bc917..c50f75621 100644 --- a/webcit/ical_dezonify.c +++ b/webcit/ical_dezonify.c @@ -1,49 +1,37 @@ /* - * $Id$ - * * 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. - * */ - -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#ifdef HAVE_FCNTL_H -#include -#endif -#include -#include -#include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_LIMITS_H -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include #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. + * + */ +icaltimezone *get_default_icaltimezone(void) { + + icaltimezone *zone = NULL; + const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone); -#ifdef WEBCIT_WITH_CALENDAR_SERVICE + if (!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; +} /* @@ -59,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; @@ -74,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 + } + } } } @@ -97,15 +112,47 @@ void ical_dezonify_backend(icalcomponent *cal, return; } - /* Do the conversion. */ - if (t != NULL) { - icaltimezone_convert_time(&TheTime, - t, - icaltimezone_get_utc_timezone() - ); +#ifdef DBG_ICAL + syslog(9, " * Was: %s\n", icaltime_as_ical_string(TheTime)); +#endif + + if (TheTime.is_utc) { +#ifdef DBG_ICAL + syslog(9, " * This property is ALREADY UTC.\n"); +#endif } - TheTime.is_utc = 1; + + 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) { +#ifdef DBG_ICAL + syslog(9, " * Timezone prop found. Converting to UTC.\n"); +#endif + } + else { +#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()); + TheTime.is_utc = 1; + } + icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER); +#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) { @@ -126,7 +173,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; @@ -140,18 +187,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) @@ -173,8 +218,12 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) { void ical_dezonify(icalcomponent *cal) { icalcomponent *vt = NULL; +#ifdef DBG_ICAL + syslog(9, "ical_dezonify() started\n"); +#endif + /* 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( @@ -183,7 +232,8 @@ void ical_dezonify(icalcomponent *cal) { icalcomponent_free(vt); } +#ifdef DBG_ICAL + syslog(9, "ical_dezonify() completed\n"); +#endif } - -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */