]> code.citadel.org Git - citadel.git/blobdiff - webcit/calendar.c
* Made all the title boxes the same background color. The old scheme was
[citadel.git] / webcit / calendar.c
index 70368254a6b436672df8ac2301b18516cfdcd144..01dd192b1df89a9708168d955d1270dfe831dd4b 100644 (file)
 #include "webcit.h"
 #include "webserver.h"
 
-#ifndef HAVE_ICAL_H
+#ifndef WEBCIT_WITH_CALENDAR_SERVICE
 
 /*
  * Handler stubs for builds with no calendar library available
  */
-void cal_process_attachment(char *part_source) {
+void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 
        wprintf("<I>This message contains calendaring/scheduling information,"
                " but support for calendars is not available on this "
@@ -44,157 +44,281 @@ void cal_process_attachment(char *part_source) {
 }
 
 void display_calendar(long msgnum) {
-       wprintf("<i>Cannot display calendar item</i><br>\n");
+       wprintf("<i>"
+               "Cannot display calendar item.  You are seeing this error "
+               "because your WebCit service has not been installed with "
+               "calendar support.  Please contact your system administrator."
+               "</i><br>\n");
 }
 
 void display_task(long msgnum) {
-       wprintf("<i>Cannot display item from task list</i><br>\n");
+       wprintf("<i>"
+               "Cannot display to-do item.  You are seeing this error "
+               "because your WebCit service has not been installed with "
+               "calendar support.  Please contact your system administrator."
+               "</i><br>\n");
 }
 
-#else /* HAVE_ICAL_H */
+#else /* WEBCIT_WITH_CALENDAR_SERVICE */
 
 
 /******   End of handler stubs.  Everything below this line is real.   ******/
 
 
-/*
- * Process a single calendar component.
- * It won't be a compound component at this point because those have
- * already been broken down by cal_process_object().
- */
-void cal_process_subcomponent(icalcomponent *cal) {
-       wprintf("cal_process_subcomponent() called<BR>\n");
-       wprintf("cal_process_subcomponent() exiting<BR>\n");
-}
-
-
-
 
 
 /*
  * Process a calendar object
  * ...at this point it's already been deserialized by cal_process_attachment()
+ *
  */
-void cal_process_object(icalcomponent *cal) {
+void cal_process_object(icalcomponent *cal,
+                       int recursion_level,
+                       long msgnum,
+                       char *cal_partnum
+) {
        icalcomponent *c;
-       int num_subcomponents = 0;
-
-       wprintf("cal_process_object() called<BR>\n");
-
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through all sub-components<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
-               cal_process_subcomponent(c);
-               ++num_subcomponents;
+       icalproperty *method = NULL;
+       icalproperty_method the_method = ICAL_METHOD_NONE;
+       icalproperty *p;
+       struct icaltimetype t;
+       time_t tt;
+       char buf[SIZ];
+       char conflict_name[SIZ];
+       int is_update = 0;
+
+       /* Leading HTML for the display of this object */
+       if (recursion_level == 0) {
+               wprintf("<CENTER><TABLE border=0>\n");
+       }
+
+       /* Look for a method */
+       method = icalcomponent_get_first_property(cal, ICAL_METHOD_PROPERTY);
+
+       /* See what we need to do with this */
+       if (method != NULL) {
+               the_method = icalproperty_get_method(method);
+               switch(the_method) {
+                   case ICAL_METHOD_REQUEST:
+                       wprintf("<TR><TD COLSPAN=2>\n"
+                               "<IMG ALIGN=CENTER "
+                               "SRC=\"/static/vcalendar.gif\">"
+                               "&nbsp;&nbsp;"  
+                               "<B>Meeting invitation</B>"
+                               "</TD></TR>\n"
+                       );
+                       break;
+                   case ICAL_METHOD_REPLY:
+                       wprintf("<TR><TD COLSPAN=2>\n"
+                               "<IMG ALIGN=CENTER "
+                               "SRC=\"/static/vcalendar.gif\">"
+                               "&nbsp;&nbsp;"  
+                               "<B>Attendee's reply to your invitation</B>"
+                               "</TD></TR>\n"
+                       );
+                       break;
+                   case ICAL_METHOD_PUBLISH:
+                       wprintf("<TR><TD COLSPAN=2>\n"
+                               "<IMG ALIGN=CENTER "
+                               "SRC=\"/static/vcalendar.gif\">"
+                               "&nbsp;&nbsp;"  
+                               "<B>Published event</B>"
+                               "</TD></TR>\n"
+                       );
+                       break;
+                   default:
+                       wprintf("<TR><TD COLSPAN=2>"
+                               "I don't know what to do with this.</TD></TR>"
+                               "\n");
+                       break;
+               }
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VEVENTs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VEVENT_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VEVENT_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
+       p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY);
+       if (p != NULL) {
+               wprintf("<TR><TD><B>Summary:</B></TD><TD>");
+               escputs((char *)icalproperty_get_comment(p));
+               wprintf("</TD></TR>\n");
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VTODOs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VTODO_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VTODO_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
+       p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY);
+       if (p != NULL) {
+               wprintf("<TR><TD><B>Location:</B></TD><TD>");
+               escputs((char *)icalproperty_get_comment(p));
+               wprintf("</TD></TR>\n");
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VJOURNALs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VJOURNAL_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VJOURNAL_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
-       }
+       /*
+        * Only show start/end times if we're actually looking at the VEVENT
+        * component.  Otherwise it shows bogus dates for things like timezone.
+        */
+       if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) {
+
+               p = icalcomponent_get_first_property(cal,
+                                               ICAL_DTSTART_PROPERTY);
+               if (p != NULL) {
+                       t = icalproperty_get_dtstart(p);
+
+                       if (t.is_date) {
+                               wprintf("<TR><TD><B>Date:"
+                                       "</B></TD><TD>"
+                                       "%s %d, %d</TD></TR>",
+                                       months[t.month - 1],
+                                       t.day, t.year
+                               );
+                       }
+                       else {
+                               tt = icaltime_as_timet(t);
+                               fmt_date(buf, tt);
+                               wprintf("<TR><TD><B>Starting date/time:"
+                                       "</B></TD><TD>"
+                                       "%s</TD></TR>", buf
+                               );
+                       }
+               }
+       
+               p = icalcomponent_get_first_property(cal, ICAL_DTEND_PROPERTY);
+               if (p != NULL) {
+                       t = icalproperty_get_dtend(p);
+                       tt = icaltime_as_timet(t);
+                       fmt_date(buf, tt);
+                       wprintf("<TR><TD><B>Ending date/time:</B></TD><TD>"
+                               "%s</TD></TR>", buf
+                       );
+               }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VCALENDARs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VCALENDAR_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VCALENDAR_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VFREEBUSYs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VFREEBUSY_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VFREEBUSY_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
+       p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY);
+       if (p != NULL) {
+               wprintf("<TR><TD><B>Description:</B></TD><TD>");
+               escputs((char *)icalproperty_get_comment(p));
+               wprintf("</TD></TR>\n");
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VALARMs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VALARM_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VALARM_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
-       }
+       /* If the component has attendees, iterate through them. */
+       for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); (p != NULL); p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) {
+               wprintf("<TR><TD><B>Attendee:</B></TD><TD>");
+               strcpy(buf, icalproperty_get_attendee(p));
+               if (!strncasecmp(buf, "MAILTO:", 7)) {
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VTIMEZONEs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VTIMEZONE_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VTIMEZONE_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
-       }
+                       /* screen name or email address */
+                       strcpy(buf, &buf[7]);
+                       striplt(buf);
+                       escputs(buf);
+                       wprintf(" ");
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VSCHEDULEs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VSCHEDULE_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VSCHEDULE_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
+                       /* participant status */
+                       partstat_as_string(buf, p);
+                       escputs(buf);
+               }
+               wprintf("</TD></TR>\n");
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VQUERYs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VQUERY_COMPONENT);
+       /* If the component has subcomponents, recurse through them. */
+       for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
            (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VQUERY_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
+           c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
+               /* Recursively process subcomponent */
+               cal_process_object(c, recursion_level+1, msgnum, cal_partnum);
        }
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VCARs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VCAR_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VCAR_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
-       }
+       /* If this is a REQUEST, display conflicts and buttons */
+       if (the_method == ICAL_METHOD_REQUEST) {
+
+               /* Check for conflicts */
+               lprintf(9, "Checking server calendar for conflicts...\n");
+               serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
+               serv_gets(buf);
+               if (buf[0] == '1') {
+                       while (serv_gets(buf), strcmp(buf, "000")) {
+                               extract(conflict_name, buf, 3);
+                               is_update = extract_int(buf, 4);
+                               wprintf("<TR><TD><B><I>%s</I></B></TD>"
+                                       "<TD>"
+                                       "%s "
+                                       "<I>&quot;",
+
+                                       (is_update ?
+                                               "Update:" :
+                                               "CONFLICT:"
+                                       ),
+
+                                       (is_update ?
+                                               "This is an update of" :
+                                               "This event would conflict with"
+                                       )
+               
+                               );
+                               escputs(conflict_name);
+                               wprintf("&quot;</I> "
+                                       "which is already in your calendar."
+                                       "</TD></TR>\n");
+                       }
+               }
+               lprintf(9, "...done.\n");
+
+               /* Display the Accept/Decline buttons */
+               wprintf("<TR><TD COLSPAN=2>"
+                       "<FORM METHOD=\"GET\" "
+                       "ACTION=\"/respond_to_request\">\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Accept\">\n"
+                       "&nbsp;&nbsp;"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Tentative\">\n"
+                       "&nbsp;&nbsp;"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Decline\">\n"
+                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
+                               "VALUE=\"%ld\">"
+                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
+                               "VALUE=\"%s\">"
+                       "</FORM>"
+                       "</TD></TR>\n",
+                       msgnum, cal_partnum
+               );
 
-       /* Iterate through all subcomponents */
-       wprintf("Iterating through VCOMMANDs<BR>\n");
-       for (c = icalcomponent_get_first_component(cal, ICAL_VCOMMAND_COMPONENT);
-           (c != 0);
-           c = icalcomponent_get_next_component(cal, ICAL_VCOMMAND_COMPONENT)) {
-               cal_process_subcomponent(c);
-               --num_subcomponents;
        }
 
-       if (num_subcomponents != 0) {
-               wprintf("Warning: %d subcomponents unhandled<BR>\n",
-                       num_subcomponents);
+       /* If this is a REPLY, display update button */
+       if (the_method == ICAL_METHOD_REPLY) {
+
+               /***********
+                * In the future, if we want to validate this object before
+                * continuing, we can do it this way:
+               serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum);
+               serv_gets(buf);
+               }
+                ***********/
+
+               /* Display the update buttons */
+               wprintf("<TR><TD COLSPAN=2>"
+                       "Click <i>Update</i> to accept this reply and "
+                       "update your calendar."
+                       "<FORM METHOD=\"GET\" "
+                       "ACTION=\"/handle_rsvp\">\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Update\">\n"
+                       "&nbsp;&nbsp;"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Ignore\">\n"
+                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
+                               "VALUE=\"%ld\">"
+                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
+                               "VALUE=\"%s\">"
+                       "</FORM>"
+                       "</TD></TR>\n",
+                       msgnum, cal_partnum
+               );
+
        }
 
-       wprintf("cal_process_object() exiting<BR>\n");
+       /* Trailing HTML for the display of this object */
+       if (recursion_level == 0) {
+
+               wprintf("</TR></TABLE></CENTER>\n");
+       }
 }
 
 
@@ -202,24 +326,133 @@ void cal_process_object(icalcomponent *cal) {
  * Deserialize a calendar object in a message so it can be processed.
  * (This is the main entry point for these things)
  */
-void cal_process_attachment(char *part_source) {
+void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
        icalcomponent *cal;
 
-       wprintf("Processing calendar attachment<BR>\n");
        cal = icalcomponent_new_from_string(part_source);
 
        if (cal == NULL) {
-               wprintf("Error parsing calendar object: %s<BR>\n",
-                       icalerror_strerror(icalerrno));
+               wprintf("Error parsing calendar object<BR>\n");
                return;
        }
 
-       cal_process_object(cal);
+       ical_dezonify(cal);
+       cal_process_object(cal, 0, msgnum, cal_partnum);
 
        /* Free the memory we obtained from libical's constructor */
        icalcomponent_free(cal);
 }
 
+
+
+
+/*
+ * Respond to a meeting request
+ */
+void respond_to_request(void) {
+       char buf[SIZ];
+
+       output_headers(3);
+
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
+       );
+
+       serv_printf("ICAL respond|%s|%s|%s|",
+               bstr("msgnum"),
+               bstr("cal_partnum"),
+               bstr("sc")
+       );
+       serv_gets(buf);
+
+       if (buf[0] == '2') {
+               wprintf("<TABLE BORDER=0><TR><TD>"
+                       "<IMG SRC=\"static/vcalendar.gif\" ALIGN=CENTER>"
+                       "</TD><TD>"
+               );
+               if (!strcasecmp(bstr("sc"), "accept")) {
+                       wprintf("You have accepted this meeting invitation.  "
+                               "It has been entered into your calendar, "
+                       );
+               } else if (!strcasecmp(bstr("sc"), "tentative")) {
+                       wprintf("You have tentatively accepted this meeting invitation.  "
+                               "It has been 'pencilled in' to your calendar, "
+                       );
+               } else if (!strcasecmp(bstr("sc"), "decline")) {
+                       wprintf("You have declined this meeting invitation.  "
+                               "It has <b>not</b> been entered into your calendar, "
+                       );
+               }
+               wprintf("and a reply has been sent to the meeting organizer."
+                       "</TD></TR></TABLE>\n"
+               );
+       } else {
+               wprintf("<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
+                       "%s\n", &buf[4]);
+       }
+
+       wprintf("<A HREF=\"/dotskip?room=");
+       urlescputs(WC->wc_roomname);
+       wprintf("\"><BR>Return to messages</A><BR>\n");
+
+       wDumpContent(1);
+}
+
+
+
+/*
+ * Handle an incoming RSVP
+ */
+void handle_rsvp(void) {
+       char buf[SIZ];
+
+       output_headers(3);
+
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
+               "Update your calendar with this RSVP</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
+       );
+
+       serv_printf("ICAL handle_rsvp|%s|%s|%s|",
+               bstr("msgnum"),
+               bstr("cal_partnum"),
+               bstr("sc")
+       );
+       serv_gets(buf);
+
+       if (buf[0] == '2') {
+               wprintf("<TABLE BORDER=0><TR><TD>"
+                       "<IMG SRC=\"static/vcalendar.gif\" ALIGN=CENTER>"
+                       "</TD><TD>"
+               );
+               if (!strcasecmp(bstr("sc"), "update")) {
+                       wprintf("Your calendar has been updated "
+                               "to reflect this RSVP."
+                       );
+               } else if (!strcasecmp(bstr("sc"), "ignore")) {
+                       wprintf("You have chosen to ignore this RSVP. "
+                               "Your calendar has <b>not</b> been updated."
+                       );
+               }
+               wprintf("</TD></TR></TABLE>\n"
+               );
+       } else {
+               wprintf("<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
+                       "%s\n", &buf[4]);
+       }
+
+       wprintf("<A HREF=\"/dotskip?room=");
+       urlescputs(WC->wc_roomname);
+       wprintf("\"><BR>Return to messages</A><BR>\n");
+
+       wDumpContent(1);
+}
+
+
+
+
 /*****************************************************************************/
 
 
@@ -256,16 +489,19 @@ void display_individual_task(icalcomponent *vtodo, long msgnum) {
        icalproperty *p;
 
        p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
-       wprintf("<LI><A HREF=\"/display_edit_task?msgnum=%ld\">", msgnum);
+       wprintf("<A HREF=\"/display_edit_task?msgnum=%ld&taskrm=", msgnum);
+       urlescputs(WC->wc_roomname);
+       wprintf("\">");
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf("</A>\n");
+       wprintf("</A><BR>\n");
 }
 
 
 /*
  * Display a task by itself (for editing)
+ *
  */
 void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        icalcomponent *vtodo;
@@ -278,6 +514,22 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
+
+               /* If we're looking at a fully encapsulated VCALENDAR
+                * rather than a VTODO component, attempt to use the first
+                * relevant VTODO subcomponent.  If there is none, the
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
+                       display_edit_individual_task(
+                               icalcomponent_get_first_component(
+                                       vtodo, ICAL_VTODO_COMPONENT
+                               ), msgnum
+                       );
+                       return;
+               }
        }
        else {
                vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
@@ -285,10 +537,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Edit task</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");
@@ -354,6 +605,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
 /*
  * Save an edited task
+ *
  */
 void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        char buf[SIZ];
@@ -364,6 +616,21 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
+               /* If we're looking at a fully encapsulated VCALENDAR
+                * rather than a VTODO component, attempt to use the first
+                * relevant VTODO subcomponent.  If there is none, the
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
+                       save_individual_task(
+                               icalcomponent_get_first_component(
+                                       vtodo, ICAL_VTODO_COMPONENT
+                               ), msgnum
+                       );
+                       return;
+               }
        }
        else {
                vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
@@ -377,6 +644,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                while (prop = icalcomponent_get_first_property(vtodo,
                      ICAL_SUMMARY_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
+                       icalproperty_free(prop);
                }
                icalcomponent_add_property(vtodo,
                        icalproperty_new_summary(bstr("summary")));
@@ -384,6 +652,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                while (prop = icalcomponent_get_first_property(vtodo,
                      ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
+                       icalproperty_free(prop);
                }
                icalcomponent_add_property(vtodo,
                        icalproperty_new_description(bstr("description")));
@@ -391,6 +660,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                while (prop = icalcomponent_get_first_property(vtodo,
                      ICAL_DTSTART_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
+                       icalproperty_free(prop);
                }
                icalcomponent_add_property(vtodo,
                        icalproperty_new_dtstart(
@@ -401,6 +671,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                while (prop = icalcomponent_get_first_property(vtodo,
                      ICAL_DUE_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
+                       icalproperty_free(prop);
                }
                icalcomponent_add_property(vtodo,
                        icalproperty_new_due(
@@ -416,12 +687,17 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                        serv_puts("");
                        serv_puts(icalcomponent_as_ical_string(vtodo));
                        serv_puts("000");
+
+                       /* Probably not necessary; the server will see the UID
+                        * of the object and delete the old one anyway, but
+                        * just in case...
+                        */
                        delete_existing = 1;
                }
        }
 
        /*
-        * If the user clicked 'Delete' then delete it, period.
+        * If the user clicked 'Delete' then explicitly delete the message.
         */
        if (!strcasecmp(bstr("sc"), "Delete")) {
                delete_existing = 1;
@@ -447,6 +723,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
  * type, we load the message and hunt for that MIME type.  If found, we load
  * the relevant part, deserialize it into a libical component, filter it for
  * the requested object type, and feed it to the specified handler.
+ *
  */
 void display_using_handler(long msgnum,
                        char *mimetype,
@@ -490,6 +767,8 @@ void display_using_handler(long msgnum,
                        cal = icalcomponent_new_from_string(relevant_source);
                        if (cal != NULL) {
 
+                               ical_dezonify(cal);
+
                                /* Simple components of desired type */
                                if (icalcomponent_isa(cal) == which_kind) {
                                        callback(cal, msgnum);
@@ -526,6 +805,11 @@ void display_task(long msgnum) {
 void display_edit_task(void) {
        long msgnum = 0L;
 
+       /* Force change the room if we have to */
+       if (strlen(bstr("taskrm")) > 0) {
+               gotoroom(bstr("taskrm"), 0);
+       }
+
        msgnum = atol(bstr("msgnum"));
        if (msgnum > 0L) {
                /* existing task */
@@ -573,9 +857,10 @@ void save_event(void) {
        long msgnum = 0L;
 
        msgnum = atol(bstr("msgnum"));
+
        if (msgnum > 0L) {
                display_using_handler(msgnum, "text/calendar",
-                               ICAL_VTODO_COMPONENT,
+                               ICAL_VEVENT_COMPONENT,
                                save_individual_event);
        }
        else {
@@ -583,4 +868,47 @@ void save_event(void) {
        }
 }
 
-#endif /* HAVE_ICAL_H */
+
+
+
+
+/*
+ * freebusy display (for client software)
+ */
+void do_freebusy(char *req) {
+       char who[SIZ];
+       char buf[SIZ];
+       char *fb;
+
+       extract_token(who, req, 1, ' ');
+       if (!strncasecmp(who, "/freebusy/", 10)) {
+               strcpy(who, &who[10]);
+       }
+       unescape_input(who);
+
+       if ( (!strcasecmp(&who[strlen(who)-4], ".vcf"))
+          || (!strcasecmp(&who[strlen(who)-4], ".vfb")) ) {
+               who[strlen(who)-4] = 0;
+       }
+
+       lprintf(9, "freebusy requested for <%s>\n", who);
+       serv_printf("ICAL freebusy|%s", who);
+       serv_gets(buf);
+
+       if (buf[0] != '1') {
+               wprintf("HTTP/1.0 404 %s\n", &buf[4]);
+               output_headers(0);
+               wprintf("Content-Type: text/plain\n");
+               wprintf("\n");
+               wprintf("%s\n", &buf[4]);
+               return;
+       }
+
+       fb = read_server_text();
+       http_transmit_thing(fb, strlen(fb), "text/calendar", 0);
+       free(fb);
+}
+
+
+
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */