libical3 compatibility , patches submitted by Adrian Bunk

[citadel.git] / webcit / ical_dezonify.c

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 24e8d88c2336e6b2751da82cf095e206f414b4e4..de444a9d5522a791e5a56083c0195b9de0323dcf 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -1,22 +1,15 @@
 /* 
- * $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.
  *
  * Everything here will work on both a fully encapsulated VCALENDAR component
  * or any type of subcomponent.
- *
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-
 /*
  * Figure out which time zone needs to be used for timestamps that are
  * not UTC and do not have a time zone specified.
@@ -25,17 +18,17 @@
 icaltimezone *get_default_icaltimezone(void) {
 
         icaltimezone *zone = NULL;
-       char *default_zone_name = serv_info.serv_default_cal_zone;
+       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);
+               syslog(LOG_WARNING, "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");
+               syslog(LOG_ERR, "Unable to load UTC time zone!\n");
        }
         return zone;
 }
@@ -70,16 +63,32 @@ void ical_dezonify_backend(icalcomponent *cal,
 
                /* Convert it to an icaltimezone type. */
                if (tzid != NULL) {
-                       lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+#ifdef DBG_ICAL
+                       syslog(LOG_DEBUG, "                * Stringy supplied timezone is: '%s'\n", tzid);
+#endif
                        if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
                                utc_declared_as_tzid = 1;
-                               lprintf(9, "                * ...and we handle that internally.\n");
+#ifdef DBG_ICAL
+                               syslog(LOG_DEBUG, "                * ...and we handle that internally.\n");
+#endif
                        }
                        else {
+                               /* try attached first */
                                t = icalcomponent_get_timezone(cal, tzid);
-                               lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+#ifdef DBG_ICAL
+                               syslog(LOG_DEBUG, "                * ...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) {
+                                               syslog(LOG_DEBUG, "                * Using system tzdata!\n");
+                                       }
+#endif
+                               }
                        }
                }
 
@@ -103,39 +112,47 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+#ifdef DBG_ICAL
+       syslog(LOG_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+#endif
 
-       if (TheTime.is_utc) {
-               lprintf(9, "                * This property is ALREADY UTC.\n");
+       if (icaltime_is_utc(TheTime)) {
+#ifdef DBG_ICAL
+               syslog(LOG_DEBUG, "                * This property is ALREADY UTC.\n");
+#endif
        }
 
        else if (utc_declared_as_tzid) {
-               lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
-               TheTime.is_utc = 1;
+#ifdef DBG_ICAL
+               syslog(LOG_DEBUG, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+#endif
+               TheTime.zone = icaltimezone_get_utc_timezone();
        }
 
        else {
                /* Do the conversion. */
                if (t != NULL) {
-                       lprintf(9, "                * Timezone prop found.  Converting to UTC.\n");
+#ifdef DBG_ICAL
+                       syslog(LOG_DEBUG, "                * Timezone prop found.  Converting to UTC.\n");
+#endif
                }
                else {
-                       lprintf(9, "                * Converting default timezone to UTC.\n");
+#ifdef DBG_ICAL
+                       syslog(LOG_DEBUG, "                * Converting default timezone to UTC.\n");
+#endif
                }
 
                if (t == NULL) {
-                       t = icaltimezone_copy(get_default_icaltimezone());
+                       t = get_default_icaltimezone();
                }
-               icaltimezone_convert_time(&TheTime,
-                                         t,
-                                         icaltimezone_get_utc_timezone()
-                       );
-               icaltimezone_free (t, 1);
-               TheTime.is_utc = 1;
+               icaltimezone_convert_time(&TheTime, t, icaltimezone_get_utc_timezone());
+               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));
+#ifdef DBG_ICAL
+       syslog(LOG_DEBUG, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+#endif
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -201,7 +218,9 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
-       lprintf(9, "ical_dezonify() started\n");
+#ifdef DBG_ICAL
+       syslog(LOG_DEBUG, "ical_dezonify() started\n");
+#endif
 
        /* Convert all times to UTC */
        ical_dezonify_recurse(cal, cal);
@@ -213,8 +232,8 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
-       lprintf(9, "ical_dezonify() completed\n");
+#ifdef DBG_ICAL
+       syslog(LOG_DEBUG, "ical_dezonify() completed\n");
+#endif
 }
 
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */