* When encapsulating a VEVENT into a full VCALENDAR

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index c8ed2c269a6a31e110a0f9b56586d808b3a7e9bd..21b8e063f8f5ece9bf71e069e96c8ce0904c45cf 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -141,7 +141,7 @@ void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
 
        /* now convert to icaltimetyepe */
        t2 = icaltime_from_timet_with_zone(mktime(&tm), 0, get_default_icaltimezone());
-       lprintf(9, "CONVERTEDZ0R... %s\n", icaltime_as_ical_string(t2));
+       t2.zone = get_default_icaltimezone();
        memcpy(t, &t2, sizeof(struct icaltimetype));
 }
 
@@ -214,12 +214,24 @@ void partstat_as_string(char *buf, icalproperty *attendee) {
        }
 }
 
-
 /*
- * Utility function to encapsulate a subcomponent into a full VCALENDAR
+ * Utility function to encapsulate a subcomponent into a full VCALENDAR.
+ *
+ * We also scan for any date/time properties that reference timezones, and attach
+ * those timezones along with the supplied subcomponent.  (Yes, I used a fixed
+ * size array in order to avoid complexity.  Increase the size if you think you
+ * need to, but if you're really referencing more than 5 time zones in a single
+ * calendar event, it probably means you're an idiot and deserve to lose.)
  */
 icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        icalcomponent *encaps;
+       icalproperty *p;
+       struct icaltimetype t;
+       const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
+       int i;
+       const icaltimezone *z;
+       int num_zones_attached = 0;
+       int zone_already_attached;
 
        if (subcomp == NULL) {
                lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
@@ -234,6 +246,47 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                return subcomp;
        }
 
+       /* search for... */
+       for (p = icalcomponent_get_first_property(subcomp, ICAL_ANY_PROPERTY);
+            p != NULL;
+            p = icalcomponent_get_next_property(subcomp, ICAL_ANY_PROPERTY))
+       {
+               if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY)
+                 || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
+               ) {
+                       t = icalproperty_get_dtstart(p);        // it's safe to use dtstart for all of them
+                       if ((icaltime_is_valid_time(t)) && (z=icaltime_get_timezone(t), z)) {
+                       
+                               zone_already_attached = 0;
+                               for (i=0; i<5; ++i) {
+                                       if (z == attached_zones[i]) {
+                                               ++zone_already_attached;
+                                               lprintf(9, "zone already attached!!\n");
+                                       }
+                               }
+                               if ((!zone_already_attached) && (num_zones_attached < 5)) {
+                                       lprintf(9, "attaching zone %d!\n", num_zones_attached);
+                                       attached_zones[num_zones_attached++] = z;
+                               }
+
+                               icalproperty_set_parameter(p,
+                                       icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z))
+                               );
+                       }
+               }
+       }
+
        /* Encapsulate the VEVENT component into a complete VCALENDAR */
        encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
        if (encaps == NULL) {
@@ -247,6 +300,13 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        /* Set the Version Number */
        icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
 
+       /* Attach any timezones we need */
+       if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
+               icalcomponent *zc;
+               zc = icalcomponent_new_clone(icaltimezone_get_component((icaltimezone *)attached_zones[i]));
+               icalcomponent_add_component(encaps, zc);
+       }
+
        /* Encapsulate the subcomponent inside */
        icalcomponent_add_component(encaps, subcomp);