/*
* $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.
*
*/
-
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#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) {
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ icaltimezone *zone = NULL;
+ const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone);
+
+ 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);
+#ifdef DBG_ICAL
+ lprintf(9, " * Stringy supplied timezone is: '%s'\n", tzid);
+#endif
+ if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
+ utc_declared_as_tzid = 1;
+#ifdef DBG_ICAL
+ lprintf(9, " * ...and we handle that internally.\n");
+#endif
+ }
+ else {
+ /* try attached first */
+ t = icalcomponent_get_timezone(cal, tzid);
+#ifdef DBG_ICAL
+ lprintf(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) {
+ lprintf(9, " * Using system tzdata!\n");
+ }
+#endif
+ }
+ }
}
}
return;
}
- /* Do the conversion. */
- if (t != NULL) {
- icaltimezone_convert_time(&TheTime,
- t,
- icaltimezone_get_utc_timezone()
- );
+#ifdef DBG_ICAL
+ lprintf(9, " * Was: %s\n", icaltime_as_ical_string(TheTime));
+#endif
+
+ if (TheTime.is_utc) {
+#ifdef DBG_ICAL
+ lprintf(9, " * This property is ALREADY UTC.\n");
+#endif
+ }
+
+ else if (utc_declared_as_tzid) {
+#ifdef DBG_ICAL
+ lprintf(9, " * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+#endif
+ TheTime.is_utc = 1;
}
- TheTime.is_utc = 1;
+
+ else {
+ /* Do the conversion. */
+ if (t != NULL) {
+#ifdef DBG_ICAL
+ lprintf(9, " * Timezone prop found. Converting to UTC.\n");
+#endif
+ }
+ else {
+#ifdef DBG_ICAL
+ lprintf(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
+ lprintf(9, " * Now: %s\n", icaltime_as_ical_string(TheTime));
+#endif
/* Now add the converted property back in. */
if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
/*
* 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)
void ical_dezonify(icalcomponent *cal) {
icalcomponent *vt = NULL;
+#ifdef DBG_ICAL
+ lprintf(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(
icalcomponent_free(vt);
}
+#ifdef DBG_ICAL
+ lprintf(9, "ical_dezonify() completed\n");
+#endif
}
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
projects / citadel.git / blobdiff