X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fical_dezonify.c;h=04d41e7c90b0887cd5c2b02dac946bd8028d4c4c;hb=6fa6542eb4a8f390488f2a453baec1bf8de1a1fb;hp=d7fb476709a9084c9d4b66a99f2775e3ad0222c4;hpb=414eec778eeca798b131b44a7d96cf7947f57c0b;p=citadel.git diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c index d7fb47670..04d41e7c9 100644 --- a/citadel/ical_dezonify.c +++ b/citadel/ical_dezonify.c @@ -1,10 +1,17 @@ -/* - * $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. * + * Copyright (c) 1987-2017 by the citadel.org team + * + * This program is open source software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ @@ -16,51 +23,38 @@ #include #include #include +#include +#include +#include #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 #include "ical_dezonify.h" +#include "ctdl_module.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 = CtdlGetConfigStr("c_default_cal_zone"); - - -/* - This doesn't even belong here. - I'm just keeping it here until I put it somewhere permanent. - - icalarray *zones; - int i; - zones = icaltimezone_get_builtin_timezones(); - for (i = 0; i < zones->num_elements; i++) { - lprintf(CTDL_DEBUG, "%s\n", icaltimezone_get_location(icalarray_element_at(zones, i))); - } - */ - - - location = "America/New_York"; - if (location) { - zone = icaltimezone_get_builtin_timezone(location); + if (!zone) { + zone = icaltimezone_get_builtin_timezone(default_zone_name); } if (!zone) { + syslog(LOG_ERR, "ical: Unable to load '%s' time zone. Defaulting to UTC.", default_zone_name); zone = icaltimezone_get_utc_timezone(); } + if (!zone) { + syslog(LOG_ERR, "ical: unable to load UTC time zone!"); + } return zone; } @@ -78,8 +72,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; @@ -93,7 +88,29 @@ void ical_dezonify_backend(icalcomponent *cal, /* Convert it to an icaltimezone type. */ if (tzid != NULL) { - t = icalcomponent_get_timezone(cal, tzid); + /* syslog(LOG_DEBUG, " * Stringy supplied timezone is: '%s'\n", tzid); */ + if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) { + utc_declared_as_tzid = 1; + /* syslog(LOG_DEBUG, " * ...and we handle that internally.\n"); */ + } + else { + /* try attached first */ + t = icalcomponent_get_timezone(cal, tzid); +/* + syslog(LOG_DEBUG, " * ...and I %s have tzdata for that zone.\n", + (t ? "DO" : "DO NOT") + ); +*/ + /* then try built-in timezones */ + if (!t) { + t = icaltimezone_get_builtin_timezone(tzid); +/* + if (t) { + syslog(LOG_DEBUG, " * Using system tzdata!\n"); + } +*/ + } + } } } @@ -116,17 +133,24 @@ void ical_dezonify_backend(icalcomponent *cal, return; } - lprintf(CTDL_DEBUG, " * Was: %s\n", icaltime_as_ical_string(TheTime)); - if (TheTime.is_utc) { - lprintf(CTDL_DEBUG, " * This property is ALREADY UTC.\n"); + /* syslog(LOG_DEBUG, " * Was: %s\n", icaltime_as_ical_string(TheTime)); */ + + if (icaltime_is_utc(TheTime)) { + /* syslog(LOG_DEBUG, " * This property is ALREADY UTC.\n"); */ + } + + else if (utc_declared_as_tzid) { + /* syslog(LOG_DEBUG, " * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */ + TheTime.zone = icaltimezone_get_utc_timezone(); } + else { /* Do the conversion. */ if (t != NULL) { - lprintf(CTDL_DEBUG, " * Timezone prop found. Converting to UTC.\n"); + /* syslog(LOG_DEBUG, " * Timezone prop found. Converting to UTC.\n"); */ } else { - lprintf(CTDL_DEBUG, " * Converting default timezone to UTC.\n"); + /* syslog(LOG_DEBUG, " * Converting default timezone to UTC.\n"); */ } if (t == NULL) { @@ -137,11 +161,11 @@ void ical_dezonify_backend(icalcomponent *cal, t, icaltimezone_get_utc_timezone() ); - TheTime.is_utc = 1; + TheTime.zone = icaltimezone_get_utc_timezone(); } icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER); - lprintf(CTDL_DEBUG, " * Now: %s\n", icaltime_as_ical_string(TheTime)); + /* syslog(LOG_DEBUG, " * Now: %s\n", icaltime_as_ical_string(TheTime)); */ /* Now add the converted property back in. */ if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) { @@ -162,7 +186,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; @@ -176,18 +200,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) @@ -209,10 +231,10 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) { void ical_dezonify(icalcomponent *cal) { icalcomponent *vt = NULL; - lprintf(CTDL_DEBUG, "ical_dezonify() started\n"); + /* syslog(LOG_DEBUG, "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( @@ -221,8 +243,5 @@ void ical_dezonify(icalcomponent *cal) { icalcomponent_free(vt); } - lprintf(CTDL_DEBUG, "ical_dezonify() completed\n"); + /* syslog(LOG_DEBUG, "ical_dezonify() completed\n"); */ } - - -#endif /* CITADEL_WITH_CALENDAR_SERVICE */