* ical_encapsulate_subcomponent() now knows when it is responsible

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 07faad27ba6dd5b5697902adfd12703898586a9e..0953a5ce9d9f4930b41e11ebafc6313e446f0450 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -121,40 +121,27 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
  * Get date/time from a web form and convert it into an icaltimetype struct.
  */
 void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
-       char datebuf[32];
        char vname[32];
        struct tm tm;
+       struct icaltimetype t2;
 
-       /* Stuff tm with some zero values */
-       tm.tm_year = 0;
-       tm.tm_sec = 0;
-       tm.tm_min = 0;
-       tm.tm_hour = 0;
-       tm.tm_mday = 0;
-       tm.tm_mon = 0;
-       int hour = 0;
-       int minute = 0;
+       /* Stuff tm with zero values */
+       memset(&tm, 0, sizeof(struct tm));
 
-       struct icaltimetype t2;
-       
+       /* Get the year/month/date all in one shot */
        strptime((char*)BSTR(prefix), "%Y-%m-%d", &tm);
-       sprintf(vname, "%s_hour", prefix);      hour = IBSTR(vname);
-       sprintf(vname, "%s_minute", prefix);    minute = IBSTR(vname);
-       tm.tm_hour = hour;
-       tm.tm_min = minute;
-       strftime(&datebuf[0], 32, "%Y%m%dT%H%M%S", &tm);
-
-       /* old
-        * t2 = icaltime_from_string(datebuf);
-        */
 
-       /* unavailable
-        * t2 = icaltime_from_string_with_zone(datebuf, get_default_icaltimezone() );
-        */
+       /* hour */
+       sprintf(vname, "%s_hour", prefix);
+       tm.tm_hour = IBSTR(vname);
 
-       /* new */
-       t2 = icaltime_from_timet_with_zone(mktime(&tm), 0, get_default_icaltimezone());
+       /* minute */
+       sprintf(vname, "%s_minute", prefix);
+       tm.tm_min = IBSTR(vname);
 
+       /* now convert to icaltimetyepe */
+       t2 = icaltime_from_timet_with_zone(mktime(&tm), 0, get_default_icaltimezone());
+       t2.zone = get_default_icaltimezone();
        memcpy(t, &t2, sizeof(struct icaltimetype));
 }
 
@@ -164,14 +151,13 @@ void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
  */
 void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) {
        struct tm tm;
-       /* Stuff tm with some zero values */
-       tm.tm_sec = 0;
-       tm.tm_min = 0;
-       tm.tm_hour = 0;
-       tm.tm_mday = 0;
-       tm.tm_mon = 0;
        time_t tm_t;
        struct icaltimetype t2;         
+
+       /* Stuff tm with zero values */
+       memset(&tm, 0, sizeof(struct tm));
+
+       /* Convert from string to icaltimetype */
        strptime((char *)BSTR(prefix), "%Y-%m-%d", &tm);
        tm_t = mktime(&tm);
        t2 = icaltime_from_timet(tm_t, 1);
@@ -234,6 +220,8 @@ void partstat_as_string(char *buf, icalproperty *attendee) {
  */
 icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        icalcomponent *encaps;
+       icalproperty *p;
+       struct icaltimetype t;
 
        if (subcomp == NULL) {
                lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
@@ -248,6 +236,35 @@ 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)) {
+                               lprintf(9, "FIXME ATTACH TIMEZONE, datetime=%s, tzid=%s\n",
+                                       icaltime_as_ical_string(t),
+                                       icaltime_get_tzid(t)
+                               );
+                       }
+               }
+       }
+
        /* Encapsulate the VEVENT component into a complete VCALENDAR */
        encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
        if (encaps == NULL) {