X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fical_dezonify.c;h=41c67a7e7556261649db1aac46e37e2b7f7e6d6e;hb=489820aa544023dba04463b8474a22ff78ced029;hp=662840c41105b81548cf409a139da7a9f5227861;hpb=c060bde622627b09ed131a146ea217e36b4adf62;p=citadel.git

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 662840c41..41c67a7e7 100644
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -1,10 +1,7 @@
 /* 
- * $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.
- *
  */
 
 
@@ -16,7 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <ical.h>
+#include <syslog.h>
+#include <libical/ical.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -26,6 +24,8 @@
 #include "config.h"
 #include "ical_dezonify.h"
 
+#include "ctdl_module.h"
+
 
 /*
  * Figure out which time zone needs to be used for timestamps that are
@@ -41,13 +41,13 @@ icaltimezone *get_default_icaltimezone(void) {
                 zone = icaltimezone_get_builtin_timezone(default_zone_name);
         }
         if (!zone) {
-		CtdlLogPrintf(CTDL_ALERT,
+		syslog(LOG_ALERT,
 			"Unable to load '%s' time zone.  Defaulting to UTC.\n",
 			default_zone_name);
                 zone = icaltimezone_get_utc_timezone();
 	}
 	if (!zone) {
-		CtdlLogPrintf(1, "Unable to load UTC time zone!\n");
+		syslog(LOG_ALERT, "Unable to load UTC time zone!\n");
 	}
         return zone;
 }
@@ -82,16 +82,28 @@ void ical_dezonify_backend(icalcomponent *cal,
 
 		/* Convert it to an icaltimezone type. */
 		if (tzid != NULL) {
-			/* CtdlLogPrintf(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;
-				/* CtdlLogPrintf(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);
-				/* CtdlLogPrintf(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");
+					}
+*/
+				}
 			}
 		}
 
@@ -115,24 +127,24 @@ void ical_dezonify_backend(icalcomponent *cal,
 		return;
 	}
 
-	/* CtdlLogPrintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
+	/* syslog(LOG_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
 
 	if (TheTime.is_utc) {
-		/* CtdlLogPrintf(9, "                * This property is ALREADY UTC.\n"); */
+		/* syslog(LOG_DEBUG, "                * This property is ALREADY UTC.\n"); */
 	}
 
 	else if (utc_declared_as_tzid) {
-		/* CtdlLogPrintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
+		/* syslog(LOG_DEBUG, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
 		TheTime.is_utc = 1;
 	}
 
 	else {
 		/* Do the conversion. */
 		if (t != NULL) {
-			/* CtdlLogPrintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
+			/* syslog(LOG_DEBUG, "                * Timezone prop found.  Converting to UTC.\n"); */
 		}
 		else {
-			/* CtdlLogPrintf(9, "                * Converting default timezone to UTC.\n"); */
+			/* syslog(LOG_DEBUG, "                * Converting default timezone to UTC.\n"); */
 		}
 
 		if (t == NULL) {
@@ -147,7 +159,7 @@ void ical_dezonify_backend(icalcomponent *cal,
 	}
 
 	icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-	/* CtdlLogPrintf(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) {
@@ -213,7 +225,7 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
-	/* CtdlLogPrintf(9, "ical_dezonify() started\n"); */
+	/* syslog(LOG_DEBUG, "ical_dezonify() started\n"); */
 
 	/* Convert all times to UTC */
 	ical_dezonify_recurse(cal, cal);
@@ -225,5 +237,5 @@ void ical_dezonify(icalcomponent *cal) {
 		icalcomponent_free(vt);
 	}
 
-	/* CtdlLogPrintf(9, "ical_dezonify() completed\n"); */
+	/* syslog(LOG_DEBUG, "ical_dezonify() completed\n"); */
 }