RSSC: remove old malloc not needed anymore.

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 0f0027c4f8d914beacf776c462a6972a942a43a7..41c67a7e7556261649db1aac46e37e2b7f7e6d6e 100644 (file)
--- 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,32 +13,42 @@
 #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 = config.c_default_cal_zone;
+       //char *default_zone_name = "America/New_York";
 
-       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_ALERT,
+                       "Unable to load '%s' time zone.  Defaulting to UTC.\n",
+                       default_zone_name);
                 zone = icaltimezone_get_utc_timezone();
        }
+       if (!zone) {
+               syslog(LOG_ALERT, "Unable to load UTC time zone!\n");
+       }
         return zone;
 }
 
@@ -55,13 +62,13 @@ icaltimezone *get_default_icaltimezone(void)
  */
 void ical_dezonify_backend(icalcomponent *cal,
                        icalcomponent *rcal,
-                       icalproperty *prop)
-{
+                       icalproperty *prop) {
 
        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;
@@ -75,7 +82,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");
+                                       }
+*/
+                               }
+                       }
                }
 
        }
@@ -98,17 +127,24 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       lprintf(CTDL_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+       /* syslog(LOG_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, "                * This property is ALREADY UTC.\n"); */
        }
+
+       else if (utc_declared_as_tzid) {
+               /* syslog(LOG_DEBUG, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
+               TheTime.is_utc = 1;
+       }
+
        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) {
@@ -123,7 +159,7 @@ void ical_dezonify_backend(icalcomponent *cal,
        }
 
        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) {
@@ -165,11 +201,9 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
        /*
         * 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)
@@ -191,7 +225,7 @@ void ical_dezonify_recurse(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_recurse(cal, cal);
@@ -203,8 +237,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 */