X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fical_dezonify.c;h=04d41e7c90b0887cd5c2b02dac946bd8028d4c4c;hb=6fa6542eb4a8f390488f2a453baec1bf8de1a1fb;hp=ce448a84e113178a582ce7e202a61a4a13233b1d;hpb=f9f3d96f461ddf73c50b7c04503dba4c0f8608b8;p=citadel.git

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ce448a84e..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,32 +23,38 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
+#include <syslog.h>
+#include <libical/ical.h>
+#include <libcitadel.h>
 #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 <ical.h>
 #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.
  */
-icaltimezone *get_default_icaltimezone(void)
-{
+icaltimezone *get_default_icaltimezone(void) {
+
         icaltimezone *zone = NULL;
+	char *default_zone_name = CtdlGetConfigStr("c_default_cal_zone");
 
-	if (!zone) {
-                zone = icaltimezone_get_builtin_timezone(config.c_default_cal_zone);
-	}
         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;
 }
 
@@ -75,16 +88,28 @@ void ical_dezonify_backend(icalcomponent *cal,
 
 		/* Convert it to an icaltimezone type. */
 		if (tzid != NULL) {
-			lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+			/* syslog(LOG_DEBUG, "                * 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");
+				/* syslog(LOG_DEBUG, "                * ...and we handle that internally.\n"); */
 			}
 			else {
+				/* try attached first */
 				t = icalcomponent_get_timezone(cal, tzid);
-				lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+/*
+				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");
+					}
+*/
+				}
 			}
 		}
 
@@ -108,24 +133,24 @@ void ical_dezonify_backend(icalcomponent *cal,
 		return;
 	}
 
-	lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+	/* syslog(LOG_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
 
-	if (TheTime.is_utc) {
-		lprintf(9, "                * This property is ALREADY UTC.\n");
+	if (icaltime_is_utc(TheTime)) {
+		/* syslog(LOG_DEBUG, "                * 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;
+		/* 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(9, "                * Timezone prop found.  Converting to UTC.\n");
+			/* syslog(LOG_DEBUG, "                * Timezone prop found.  Converting to UTC.\n"); */
 		}
 		else {
-			lprintf(9, "                * Converting default timezone to UTC.\n");
+			/* syslog(LOG_DEBUG, "                * Converting default timezone to UTC.\n"); */
 		}
 
 		if (t == NULL) {
@@ -136,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(9, "                * 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) {
@@ -206,7 +231,7 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
-	lprintf(9, "ical_dezonify() started\n");
+	/* syslog(LOG_DEBUG, "ical_dezonify() started\n"); */
 
 	/* Convert all times to UTC */
 	ical_dezonify_recurse(cal, cal);
@@ -218,8 +243,5 @@ void ical_dezonify(icalcomponent *cal) {
 		icalcomponent_free(vt);
 	}
 
-	lprintf(9, "ical_dezonify() completed\n");
+	/* syslog(LOG_DEBUG, "ical_dezonify() completed\n"); */
 }
-
-
-#endif /* CITADEL_WITH_CALENDAR_SERVICE */