* add Michael Meskes patch: make time in task due dates optional

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 9f846457bcad176c4d733bfad1c2c102a036fc7d..6cad617fffa5c4df16e4786b5f7179e5bbab3e0a 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -81,7 +81,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
        }
 
        wprintf(_("Hour: "));
-       wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
+       wprintf("<SELECT NAME=\"%s_hour\" ID=\"%s_hour\" SIZE=\"1\">\n", prefix, prefix);
        for (i=0; i<=23; ++i) {
 
                if (time_format == WC_TIMEFORMAT_24) {
@@ -101,7 +101,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
        wprintf("</SELECT>\n");
 
        wprintf(_("Minute: "));
-       wprintf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
+       wprintf("<SELECT NAME=\"%s_minute\" ID=\"%s_minute\" SIZE=\"1\">\n", prefix, prefix);
        for (i=0; i<=59; ++i) {
                if ( (i % 5 == 0) || (tm.tm_min == i) ) {
                        wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
@@ -122,27 +122,27 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
  */
 void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
        char vname[32];
-       struct tm tm;
-       struct icaltimetype t2;
 
-       /* Stuff tm with zero values */
-       memset(&tm, 0, sizeof(struct tm));
+       if (!t) return;
 
-       /* Get the year/month/date all in one shot */
-       strptime((char*)BSTR(prefix), "%Y-%m-%d", &tm);
+       /* Stuff with zero values */
+       memset(t, 0, sizeof(struct icaltimetype));
+
+       /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */
+       sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day);
 
        /* hour */
        sprintf(vname, "%s_hour", prefix);
-       tm.tm_hour = IBSTR(vname);
+       t->hour = IBSTR(vname);
 
        /* minute */
        sprintf(vname, "%s_minute", prefix);
-       tm.tm_min = IBSTR(vname);
+       t->minute = 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));
+       /* time zone is set to the default zone for this server */
+       t->is_utc = 0;
+       t->is_date = 0;
+       t->zone = get_default_icaltimezone();
 }
 
 
@@ -150,18 +150,17 @@ void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
  * Get date (no time) from a web form and convert it into an icaltimetype struct.
  */
 void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) {
-       struct tm tm;
-       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);
-       memcpy(t, &t2, sizeof(struct icaltimetype));
+       if (!t) return;
+
+       /* Stuff with zero values */
+       memset(t, 0, sizeof(struct icaltimetype));
+
+       /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */
+       sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day);
+
+       /* time zone is set to the default zone for this server */
+       t->is_utc = 1;
+       t->is_date = 1;
 }
 
 
@@ -218,10 +217,9 @@ void partstat_as_string(char *buf, icalproperty *attendee) {
  * 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.)
+ * those timezones along with the supplied subcomponent.  (Increase the size of the array if you need to.)
+ *
+ * Note: if you change anything here, change it in Citadel server's ical_send_out_invitations() too.
  */
 icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        icalcomponent *encaps;
@@ -265,7 +263,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                  || (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
+                       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;
@@ -281,7 +279,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                                }
 
                                icalproperty_set_parameter(p,
-                                       icalparameter_new_tzid(icaltimezone_get_location((icaltimezone *)z))
+                                       icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z))
                                );
                        }
                }
@@ -303,8 +301,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        /* Attach any timezones we need */
        if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
                icalcomponent *zc;
-               zc = icalcomponent_new_vtimezone();
-               /* FIXME actually put something in here!!!! */
+               zc = icalcomponent_new_clone(icaltimezone_get_component((icaltimezone *)attached_zones[i]));
                icalcomponent_add_component(encaps, zc);
        }