* serv_getln now is a wrapper around existing functionality. a new temporary var...
[citadel.git] / webcit / calendar.c
index f6f1251c390fae7d60610e2967ca50aa8557a4ae..48a0f1fc793461630d2a70e8d70a03643e94f9c4 100644 (file)
@@ -1,80 +1,27 @@
 /*
  * $Id$
+ *
+ * Functions which handle calendar objects and their processing/display.
  */
-/**
- * \defgroup calav Functions which handle calendar objects and their processing/display.
- * \ingroup Calendaring
- */
-/* @{ */
 
 #include "webcit.h"
 #include "webserver.h"
 
-#ifndef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
- * \brief get around non existing types
- * Handler stubs for builds with no calendar library available
- * \param part_source dummy pointer to the source
- * \param msgnum number of the mesage in the db
- * \param cal_partnum number of the calendar part
- */
-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 "
-               "particular system.  Please ask your system administrator to "
-               "install a new version of the Citadel web service with "
-               "calendaring enabled.</I><br />\n")
-       );
-
-}
-
-/**
- * \brief say we can't display calendar items
- * \param msgnum number of the mesage in our db
- */
-void display_calendar(long msgnum) {
-       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"));
-}
-
-/**
- * \brief say we can't display task items
- * \param msgnum number of the mesage in our db
- */
-void display_task(long msgnum) {
-       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"));
-}
-/** ok, we have calendaring available */
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-
-/******   End of handler stubs.  Everything below this line is real.   ******/
 
-
-
-
-/**
- * \brief Process a calendar object
- * ...at this point it's already been deserialized by cal_process_attachment()
- * \param cal the calendar object
- * \param recursion_level call stack depth ??????
- * \param msgnum number of the mesage in our db
- * \param cal_partnum of the calendar object ???? 
+/*
+ * Process a calendar object.  At this point it's already been deserialized by cal_process_attachment()
+ *
+ * cal:                        the calendar object
+ * recursion_level:    Number of times we've recursed into this function
+ * msgnum:             Message number on the Citadel server
+ * cal_partnum:                MIME part number within that message containing the calendar object
  */
-void cal_process_object(icalcomponent *cal,
+void cal_process_object(StrBuf *Target,
+                       icalcomponent *cal,
                        int recursion_level,
                        long msgnum,
-                       char *cal_partnum
-{
+                       const char *cal_partnum) 
+{
        icalcomponent *c;
        icalproperty *method = NULL;
        icalproperty_method the_method = ICAL_METHOD_NONE;
@@ -90,69 +37,77 @@ void cal_process_object(icalcomponent *cal,
 
        sprintf(divname, "rsvp%04x", ++divcount);
 
-       /** Leading HTML for the display of this object */
+       /* Convert timezones to something easy to display.
+        * It's safe to do this in memory because we're only changing it on the
+        * display side -- when we tell the server to do something with the object,
+        * the server will be working with its original copy in the database.
+        */
+       if ((cal) && (recursion_level == 0)) {
+               ical_dezonify(cal);
+       }
+
+       /* Leading HTML for the display of this object */
        if (recursion_level == 0) {
-               wprintf("<div class=\"mimepart\">\n");
+               StrBufAppendPrintf(Target, "<div class=\"mimepart\">\n");
        }
 
-       /** Look for a method */
+       /* Look for a method */
        method = icalcomponent_get_first_property(cal, ICAL_METHOD_PROPERTY);
 
-       /** See what we need to do with this */
+       /* See what we need to do with this */
        if (method != NULL) {
-               the_method = icalproperty_get_method(method);
                char *title;
+               the_method = icalproperty_get_method(method);
 
-               wprintf("<div id=\"%s_title\">", divname);
-               wprintf("<img src=\"static/calarea_48x.gif\">");
-               wprintf("<span>");
+               StrBufAppendPrintf(Target, "<div id=\"%s_title\">", divname);
+               StrBufAppendPrintf(Target, "<img src=\"static/calarea_48x.gif\">");
+               StrBufAppendPrintf(Target, "<span>");
                switch(the_method) {
-                   case ICAL_METHOD_REQUEST:
+               case ICAL_METHOD_REQUEST:
                        title = _("Meeting invitation");
                        break;
-                   case ICAL_METHOD_REPLY:
+               case ICAL_METHOD_REPLY:
                        title = _("Attendee's reply to your invitation");
                        break;
-                   case ICAL_METHOD_PUBLISH:
+               case ICAL_METHOD_PUBLISH:
                        title = _("Published event");
                        break;
-                   default:
+               default:
                        title = _("This is an unknown type of calendar item.");
                        break;
                }
-               wprintf("</span>");
+               StrBufAppendPrintf(Target, "</span>");
 
-               wprintf("&nbsp;&nbsp;%s",title);
-               wprintf("</div>");
+               StrBufAppendPrintf(Target, "&nbsp;&nbsp;%s",title);
+               StrBufAppendPrintf(Target, "</div>");
        }
 
-       wprintf("<dl>");
+       StrBufAppendPrintf(Target, "<dl>");
        p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY);
        if (p != NULL) {
-               wprintf("<dt>");
-               wprintf(_("Summary:"));
-               wprintf("</dt><dd>");
-               escputs((char *)icalproperty_get_comment(p));
-               wprintf("</dd>\n");
+               StrBufAppendPrintf(Target, "<dt>");
+               StrBufAppendPrintf(Target, _("Summary:"));
+               StrBufAppendPrintf(Target, "</dt><dd>");
+               StrEscAppend(Target, NULL, (char *)icalproperty_get_comment(p), 0, 0);
+               StrBufAppendPrintf(Target, "</dd>\n");
        }
 
        p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY);
        if (p != NULL) {
-               wprintf("<dt>");
-               wprintf(_("Location:"));
-               wprintf("</dt><dd>");
-               escputs((char *)icalproperty_get_comment(p));
-               wprintf("</dd>\n");
+               StrBufAppendPrintf(Target, "<dt>");
+               StrBufAppendPrintf(Target, _("Location:"));
+               StrBufAppendPrintf(Target, "</dt><dd>");
+               StrEscAppend(Target, NULL, (char *)icalproperty_get_comment(p), 0, 0);
+               StrBufAppendPrintf(Target, "</dd>\n");
        }
 
-       /**
+       /*
         * 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);
+               p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
 
@@ -164,16 +119,16 @@ void cal_process_object(icalcomponent *cal,
                                d_tm.tm_mon = t.month - 1;
                                d_tm.tm_mday = t.day;
                                wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
-                               wprintf("<dt>");
-                               wprintf(_("Date:"));
-                               wprintf("</dt><dd>%s</dd>", d_str);
+                               StrBufAppendPrintf(Target, "<dt>");
+                               StrBufAppendPrintf(Target, _("Date:"));
+                               StrBufAppendPrintf(Target, "</dt><dd>%s</dd>", d_str);
                        }
                        else {
                                tt = icaltime_as_timet(t);
-                               fmt_date(buf, tt, 0);
-                               wprintf("<dt>");
-                               wprintf(_("Starting date/time:"));
-                               wprintf("</dt><dd>%s</dd>", buf);
+                               webcit_fmt_date(buf, 256, tt, DATEFMT_FULL);
+                               StrBufAppendPrintf(Target, "<dt>");
+                               StrBufAppendPrintf(Target, _("Starting date/time:"));
+                               StrBufAppendPrintf(Target, "</dt><dd>%s</dd>", buf);
                        }
                }
        
@@ -181,53 +136,63 @@ void cal_process_object(icalcomponent *cal,
                if (p != NULL) {
                        t = icalproperty_get_dtend(p);
                        tt = icaltime_as_timet(t);
-                       fmt_date(buf, tt, 0);
-                       wprintf("<dt>");
-                       wprintf(_("Ending date/time:"));
-                       wprintf("</dt><dd>%s</dd>", buf);
+                       webcit_fmt_date(buf, 256, tt, DATEFMT_FULL);
+                       StrBufAppendPrintf(Target, "<dt>");
+                       StrBufAppendPrintf(Target, _("Ending date/time:"));
+                       StrBufAppendPrintf(Target, "</dt><dd>%s</dd>", buf);
                }
 
        }
 
        p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
-               wprintf("<dt>");
-               wprintf(_("Description:"));
-               wprintf("</dt><dd>");
-               escputs((char *)icalproperty_get_comment(p));
-               wprintf("</dd>\n");
+               StrBufAppendPrintf(Target, "<dt>");
+               StrBufAppendPrintf(Target, _("Description:"));
+               StrBufAppendPrintf(Target, "</dt><dd>");
+               StrEscAppend(Target, NULL, (char *)icalproperty_get_comment(p), 0, 0);
+               StrBufAppendPrintf(Target, "</dd>\n");
        }
 
-       /** 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("<dt>");
-               wprintf(_("Attendee:"));
-               wprintf("</dt><dd>");
+       if (icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY)) {
+               /* Unusual string syntax used here in order to re-use existing translations */
+               StrBufAppendPrintf(Target, "<dt>%s:</dt><dd>%s.</dd>\n",
+                       _("Recurrence"),
+                       _("This is a recurring event")
+               );
+       }
+
+       /* 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)) {
+               StrBufAppendPrintf(Target, "<dt>");
+               StrBufAppendPrintf(Target, _("Attendee:"));
+               StrBufAppendPrintf(Target, "</dt><dd>");
                safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
                if (!strncasecmp(buf, "MAILTO:", 7)) {
 
                        /** screen name or email address */
                        strcpy(buf, &buf[7]);
                        striplt(buf);
-                       escputs(buf);
-                       wprintf(" ");
+                       StrEscAppend(Target, NULL, buf, 0, 0);
+                       StrBufAppendPrintf(Target, " ");
 
                        /** participant status */
                        partstat_as_string(buf, p);
-                       escputs(buf);
+                       StrEscAppend(Target, NULL, buf, 0, 0);
                }
-               wprintf("</dd>\n");
+               StrBufAppendPrintf(Target, "</dd>\n");
        }
 
-       /** If the component has subcomponents, recurse through them. */
+       /* 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_ANY_COMPONENT)) {
+            (c != 0);
+            c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
                /* Recursively process subcomponent */
-               cal_process_object(c, recursion_level+1, msgnum, cal_partnum);
+               cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum);
        }
 
-       /** If this is a REQUEST, display conflicts and buttons */
+       /* If this is a REQUEST, display conflicts and buttons */
        if (the_method == ICAL_METHOD_REQUEST) {
 
                /* Check for conflicts */
@@ -241,99 +206,89 @@ void cal_process_object(icalcomponent *cal,
 
                                if (is_update) {
                                        snprintf(conflict_message, sizeof conflict_message,
-                                               _("This is an update of '%s' which is already in your calendar."), conflict_name);
+                                                _("This is an update of '%s' which is already in your calendar."), conflict_name);
                                }
                                else {
                                        snprintf(conflict_message, sizeof conflict_message,
-                                               _("This event would conflict with '%s' which is already in your calendar."), conflict_name);
+                                                _("This event would conflict with '%s' which is already in your calendar."), conflict_name);
                                }
 
-                               wprintf("<dt>%s",
+                               StrBufAppendPrintf(Target, "<dt>%s",
                                        (is_update ?
-                                               _("Update:") :
-                                               _("CONFLICT:")
-                                       )
-                               );
-                               wprintf("</dt><dd>");
-                               escputs(conflict_message);
-                               wprintf("</dd>\n");
+                                        _("Update:") :
+                                        _("CONFLICT:")
+                                               )
+                                       );
+                               StrBufAppendPrintf(Target, "</dt><dd>");
+                               StrEscAppend(Target, NULL, conflict_message, 0, 0);
+                               StrBufAppendPrintf(Target, "</dd>\n");
                        }
                }
                lprintf(9, "...done.\n");
 
-               wprintf("</dl>");
+               StrBufAppendPrintf(Target, "</dl>");
 
-               /** Display the Accept/Decline buttons */
-               wprintf("<p id=\"%s_question\" class=\"buttons\">"
+               /* Display the Accept/Decline buttons */
+               StrBufAppendPrintf(Target, "<p id=\"%s_question\">"
                        "%s "
+                       "&nbsp;&nbsp;&nbsp;<span class=\"button_link\"> "
                        "<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Accept');\">%s</a>"
-                       "<span> | </span>"
+                       "</span>&nbsp;&nbsp;&nbsp;<span class=\"button_link\">"
                        "<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Tentative');\">%s</a>"
-                       "<span> | </span>"
+                       "</span>&nbsp;&nbsp;&nbsp;<span class=\"button_link\">"
                        "<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Decline');\">%s</a>"
-                       "</p>\n",
+                       "</span></p>\n",
                        divname,
                        _("How would you like to respond to this invitation?"),
                        divname, divname, msgnum, cal_partnum, _("Accept"),
                        divname, divname, msgnum, cal_partnum, _("Tentative"),
                        divname, divname, msgnum, cal_partnum, _("Decline")
-               );
+                       );
 
        }
 
-       /** If this is a REPLY, display update button */
+       /* If this is a REPLY, display update button */
        if (the_method == ICAL_METHOD_REPLY) {
 
-               /** \todo  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_getln(buf, sizeof buf);
-               }
-                ***********/
-
-               /** Display the update buttons */
-               wprintf("<p id=\"%s_question\" class=\"buttons\">"
-                       "%s"
+               /* Display the update buttons */
+               StrBufAppendPrintf(Target, "<p id=\"%s_question\" >"
+                       "%s "
+                       "&nbsp;&nbsp;&nbsp;<span class=\"button_link\"> "
                        "<a href=\"javascript:HandleRSVP('%s_question','%s_title','%ld','%s','Update');\">%s</a>"
-                       "<span> | </span>"
+                       "</span>&nbsp;&nbsp;&nbsp;<span class=\"button_link\">"
                        "<a href=\"javascript:HandleRSVP('%s_question','%s_title','%ld','%s','Ignore');\">%s</a>"
-                       "</p>\n",
+                       "</span></p>\n",
                        divname,
                        _("Click <i>Update</i> to accept this reply and update your calendar."),
                        divname, divname, msgnum, cal_partnum, _("Update"),
                        divname, divname, msgnum, cal_partnum, _("Ignore")
-               );
-
+                       );
+       
        }
-
-       /** Trailing HTML for the display of this object */
+       
+       /* Trailing HTML for the display of this object */
        if (recursion_level == 0) {
-               wprintf("<p>&nbsp;</p></div>\n");
+               StrBufAppendPrintf(Target, "<p>&nbsp;</p></div>\n");
        }
 }
 
 
-/**
- * \brief process calendar mail atachment
- * Deserialize a calendar object in a message so it can be processed.
- * (This is the main entry point for these things)
- * \param part_source the part of the message we want to parse
- * \param msgnum number of the mesage in our db
- * \param cal_partnum the number of the calendar item
+/*
+ * Deserialize a calendar object in a message so it can be displayed.
  */
-void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
+void cal_process_attachment(wc_mime_attachment *Mime) 
+{
        icalcomponent *cal;
 
-       cal = icalcomponent_new_from_string(part_source);
-
+       cal = icalcomponent_new_from_string(ChrPtr(Mime->Data));
+       FlushStrBuf(Mime->Data);
        if (cal == NULL) {
-               wprintf(_("There was an error parsing this calendar item."));
-               wprintf("<br />\n");
+               StrBufAppendPrintf(Mime->Data, _("There was an error parsing this calendar item."));
+               StrBufAppendPrintf(Mime->Data, "<br />\n");
                return;
        }
 
-       ical_dezonify(cal);
-       cal_process_object(cal, 0, msgnum, cal_partnum);
+       cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum));
 
        /* Free the memory we obtained from libical's constructor */
        icalcomponent_free(cal);
@@ -342,11 +297,11 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 
 
 
-/**
- * \brief accept/decline meeting
- * Respond to a meeting request
+/*
+ * Respond to a meeting request - accept/decline meeting
  */
-void respond_to_request(void) {
+void respond_to_request(void) 
+{
        char buf[1024];
 
        begin_ajax_response();
@@ -370,8 +325,8 @@ void respond_to_request(void) {
                        );
                } else if (!strcasecmp(bstr("sc"), "decline")) {
                        wprintf(_("You have declined this meeting invitation.  "
-                               "It has <b>not</b> been entered into your calendar.")
-                       );
+                                 "It has <b>not</b> been entered into your calendar.")
+                               );
                }
                wprintf(" ");
                wprintf(_("A reply has been sent to the meeting organizer."));
@@ -387,10 +342,11 @@ void respond_to_request(void) {
 
 
 
-/**
- * \brief Handle an incoming RSVP
+/*
+ * Handle an incoming RSVP
  */
-void handle_rsvp(void) {
+void handle_rsvp(void) 
+{
        char buf[1024];
 
        begin_ajax_response();
@@ -408,8 +364,8 @@ void handle_rsvp(void) {
                        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.")
-                       );
+                                 "Your calendar has <b>not</b> been updated.")
+                               );
                }
                wprintf("</span>");
        } else {
@@ -418,124 +374,235 @@ void handle_rsvp(void) {
        }
 
        end_ajax_response();
-
 }
 
 
 
-/*@}*/
-/*-----------------------------------------------------------------------**/
 
-
-
-/**
- * \defgroup MsgDisplayHandlers Display handlers for message reading 
- * \ingroup Calendaring
+/*
+ * free memory allocated using libical
  */
+void delete_cal(void *vCal)
+{
+       disp_cal *Cal = (disp_cal*) vCal;
+       icalcomponent_free(Cal->cal);
+       free(Cal->from);
+       free(Cal);
+}
 
-/*@{*/
-
-
-
-/**
- * \brief get items, keep them.
- * If we're reading calendar items, just store them for now.  We have to
- * sort and re-output them later when we draw the calendar.
- * \param cal Our calendar to process
- * \param msgnum number of the mesage in our db
+/*
+ * This is the meat-and-bones of the first part of our two-phase calendar display.
+ * As we encounter calendar items in messages being read from the server, we break out
+ * any iCalendar objects and store them in a hash table.  Later on, the second phase will
+ * use this hash table to render the calendar for display.
  */
-void display_individual_cal(icalcomponent *cal, long msgnum
+void display_individual_cal(icalcomponent *cal, long msgnum, char *from, int unread, struct calview *calv)
 {
        icalproperty *ps = NULL;
-       struct icaltimetype t;
-       struct wcsession *WCC;
-       struct disp_cal *Cal;
-       struct tm event;
-       struct tm event_hr;
-       time_t event_ts;
-
-       WCC = WC;
-
-       WCC->num_cal += 1;
-
-       WCC->disp_cal = realloc(WCC->disp_cal,
-                       (sizeof(struct disp_cal) * WCC->num_cal) );
+       struct icaltimetype dtstart, dtend;
+       struct icaldurationtype dur;
+       wcsession *WCC = WC;
+       disp_cal *Cal;
+       size_t len;
+       time_t final_recurrence = 0;
+       icalcomponent *cptr = NULL;
+
+       /* recur variables */
+       icalproperty *rrule = NULL;
+       struct icalrecurrencetype recur;
+       icalrecur_iterator *ritr = NULL;
+       struct icaltimetype next;
+       int num_recur = 0;
+       int stop_rr = 0;
+
+       dtstart = icaltime_null_time();
+       dtend = icaltime_null_time();
+       
+       if (WCC->disp_cal_items == NULL)
+               WCC->disp_cal_items = NewHash(0, Flathash);
 
-       Cal = &WCC->disp_cal[WCC->num_cal - 1];
+       /* Note: anything we do here, we also have to do below for the recurrences. */
+       Cal = (disp_cal*) malloc(sizeof(disp_cal));
+       memset(Cal, 0, sizeof(disp_cal));
        Cal->cal = icalcomponent_new_clone(cal);
 
+       /* Dezonify and decapsulate at the very last moment */
+       /* lprintf(9, "INITIAL: %s\n", icaltime_as_ical_string(icalproperty_get_dtstart(
+               icalcomponent_get_first_property(icalcomponent_get_first_component(
+               Cal->cal, ICAL_VEVENT_COMPONENT), ICAL_DTSTART_PROPERTY)))
+       ); */
+       ical_dezonify(Cal->cal);
+       if (icalcomponent_isa(Cal->cal) != ICAL_VEVENT_COMPONENT) {
+               cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+               if (cptr) {
+                       cptr = icalcomponent_new_clone(cptr);
+                       icalcomponent_free(Cal->cal);
+                       Cal->cal = cptr;
+               }
+       }
+
+       Cal->unread = unread;
+       len = strlen(from);
+       Cal->from = (char*)malloc(len+ 1);
+       memcpy(Cal->from, from, len + 1);
        Cal->cal_msgnum = msgnum;
 
-       //! Precalculate some Values we can use for easy comparison later.
+       /* Precalculate the starting date and time of this event, and store it in our top-level
+        * structure.  Later, when we are rendering the calendar, we can just peek at these values
+        * without having to break apart every calendar item.
+        */
        ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
        if (ps != NULL) {
-               t = icalproperty_get_dtstart(ps);
-               event_ts = icaltime_as_timet(t);
-
-               if (t.is_date) { //! calculate whether we are a day event.
-                       Cal->start_hour = -1;
-                       Cal->end_hour = -1;
-                       Cal->end_day = -1;
-                       localtime_r(&event_ts, &event); 
-                       event.tm_sec = 0;
-                       event.tm_min = 0;
-                       event.tm_hour = 0; 
-                       Cal->start_day = mktime (&event);
-               }
-               else { //! Precalc start day and start day + hour
-                       localtime_r(&event_ts, &event);
-                       event.tm_sec = 0;
-                       event.tm_min = 0;
-                       memcpy (&event_hr, &event, sizeof(struct tm));
-                       Cal->start_hour = mktime (&event_hr);
-                       event.tm_hour = 0;                      
-                       Cal->start_day = mktime (&event);
+               dtstart = icalproperty_get_dtstart(ps);
+               Cal->event_start = icaltime_as_timet(dtstart);
+       }
+
+       /* Do the same for the ending date and time.  It makes the day view much easier to render. */
+       ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+       if (ps != NULL) {
+               dtend = icalproperty_get_dtend(ps);
+               Cal->event_end = icaltime_as_timet(dtend);
+       }
+
+       /* Store it in the hash list. */
+       Put(WCC->disp_cal_items, 
+           (char*) &Cal->event_start,
+           sizeof(Cal->event_start), 
+           Cal, 
+           delete_cal);
+
+       /****************************** handle recurring events ******************************/
+
+       if (icaltime_is_null_time(dtstart)) return;     /* Can't recur without a start time */
+
+       if (!icaltime_is_null_time(dtend)) {            /* Need duration for recurrences */
+               dur = icaltime_subtract(dtend, dtstart);
+       }
+
+       /*
+        * Just let libical iterate the recurrence, and keep looping back to the top of this function,
+        * adding new hash entries that all point back to the same msgnum, until either the iteration
+        * stops or some outer bound is reached.  The display code will automatically do the Right Thing.
+        */
+       cptr = cal;
+       if (icalcomponent_isa(cptr) != ICAL_VEVENT_COMPONENT) {
+               cptr = icalcomponent_get_first_component(cptr, ICAL_VEVENT_COMPONENT);
+       }
+       if (!cptr) return;
+       ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+       if (ps == NULL) return;
+       dtstart = icalproperty_get_dtstart(ps);
+       rrule = icalcomponent_get_first_property(cptr, ICAL_RRULE_PROPERTY);
+       if (!rrule) return;
+       recur = icalproperty_get_rrule(rrule);
+       ritr = icalrecur_iterator_new(recur, dtstart);
+       if (!ritr) return;
+
+       while (next = icalrecur_iterator_next(ritr), ((!icaltime_is_null_time(next))&&(!stop_rr)) ) {
+               ++num_recur;
+               if (num_recur > 1) {            /* Skip the first one.  We already did it at the root. */
+                       icalcomponent *cptr;
+                       /* lprintf(9, "REPEATS: %s\n", icaltime_as_ical_string(next)); */
+
+                       /* Note: anything we do here, we also have to do above for the root event. */
+                       Cal = (disp_cal*) malloc(sizeof(disp_cal));
+                       memset(Cal, 0, sizeof(disp_cal));
+                       Cal->cal = icalcomponent_new_clone(cal);
+                       Cal->unread = unread;
+                       len = strlen(from);
+                       Cal->from = (char*)malloc(len+ 1);
+                       memcpy(Cal->from, from, len + 1);
+                       Cal->cal_msgnum = msgnum;
+
+                       if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
+                               cptr = Cal->cal;
+                       }
+                       else {
+                               cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+                       }
+                       if (cptr) {
+                               ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+                               if (ps != NULL) {
+                                       icalcomponent_remove_property(cptr, ps);
+                                       ps = icalproperty_new_dtstart(next);
+                                       icalcomponent_add_property(cptr, ps);
        
-                       ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
-                       if (ps != NULL) { //!  Precalc the end day and end day + hour
-                               t = icalproperty_get_dtstart(ps);
-                               event_ts = icaltime_as_timet(t);
-                               localtime_r(&event_ts, &event);
-                               event.tm_sec = 0;
-                               event.tm_min = 0;
-                               memcpy (&event_hr, &event, sizeof(struct tm));
-                               Cal->end_hour = mktime (&event);
-                               event.tm_hour = 0;                      
-                               Cal->end_day = mktime (&event);
+                                       Cal->event_start = icaltime_as_timet(next);
+                                       final_recurrence = Cal->event_start;
+                               }
+
+                               ps = icalcomponent_get_first_property(cptr, ICAL_DTEND_PROPERTY);
+                               if (ps != NULL) {
+                                       icalcomponent_remove_property(cptr, ps);
+       
+                                       /* Make a new dtend */
+                                       ps = icalproperty_new_dtend(icaltime_add(next, dur));
+               
+                                       /* and stick it somewhere */
+                                       icalcomponent_add_property(cptr, ps);
+                               }
+
+                       }
+
+                       /* Dezonify and decapsulate at the very last moment */
+                       ical_dezonify(Cal->cal);
+                       if (icalcomponent_isa(Cal->cal) != ICAL_VEVENT_COMPONENT) {
+                               cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+                               if (cptr) {
+                                       cptr = icalcomponent_new_clone(cptr);
+                                       icalcomponent_free(Cal->cal);
+                                       Cal->cal = cptr;
+                               }
                        }
-                       else
-                       {
-                               Cal->end_hour = -1;
-                               Cal->end_day = -1;
-                       }       
-               }
 
+                       if ( (Cal->event_start > calv->lower_bound)
+                          && (Cal->event_start < calv->upper_bound) ) {
+                               Put(WCC->disp_cal_items, 
+                                       (char*) &Cal->event_start,
+                                       sizeof(Cal->event_start), 
+                                       Cal, 
+                                       delete_cal
+                               );
+                       }
+                       else {
+                               delete_cal(Cal);
+                       }
 
+                       /* If an upper bound is set, stop when we go out of scope */
+                       if (final_recurrence > calv->upper_bound) stop_rr = 1;
+               }
        }
-       Cal->multi_day_event = Cal->start_day != Cal->end_day;
+       icalrecur_iterator_free(ritr);
+       /* lprintf(9, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); */
+
 }
 
 
 
 /*
- * \brief edit a task
  * Display a task by itself (for editing)
- * \param supplied_vtodo the todo item we want to edit
- * \param msgnum number of the mesage in our db
  */
-void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
+void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, char *from,
+                       int unread, struct calview *calv)
+{
        icalcomponent *vtodo;
        icalproperty *p;
-       struct icaltimetype t;
+       struct icaltimetype IcalTime;
        time_t now;
        int created_new_vtodo = 0;
+       icalproperty_status todoStatus;
 
        now = time(NULL);
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
 
-               /**
+               /*
+                * It's safe to convert to UTC here because there are no recurrences to worry about.
+                */
+               ical_dezonify(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
@@ -547,8 +614,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                        display_edit_individual_task(
                                icalcomponent_get_first_component(
                                        vtodo, ICAL_VTODO_COMPONENT
-                               ), msgnum
-                       );
+                                       ), 
+                               msgnum, from, unread, calv
+                               );
                        return;
                }
        }
@@ -556,26 +624,31 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
                created_new_vtodo = 1;
        }
-
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<img src=\"static/taskmanag_48x.gif\">");
-       wprintf("<h1>");
+       
+       /* TODO: Can we take all this and move it into a template?       */
+       output_headers(1, 1, 1, 0, 0, 0);
+       wprintf("<!-- start task edit form -->");
+       p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
+       /* Get summary early for title */
+       wprintf("<div class=\"box\">\n");
+       wprintf("<div class=\"boxlabel\">");
        wprintf(_("Edit task"));
-       wprintf("</h1>");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"calendar_background\"><tr><td>");
+       wprintf("- ");
+       if (p != NULL) {
+               escputs((char *)icalproperty_get_comment(p));
+       }
+       wprintf("</div>");
        
+       wprintf("<div class=\"boxcontent\">\n");
        wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
-               msgnum);
-
-       wprintf("<TABLE border=0>\n");
+       wprintf("<div style=\"display: none;\">\n       ");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
+               ibstr("return_to_summary"));
+       wprintf("</div>");
+       wprintf("<table class=\"calendar_background\"><tr><td>");
+       wprintf("<TABLE STYLE=\"border: none;\">\n");
 
        wprintf("<TR><TD>");
        wprintf(_("Summary:"));
@@ -592,54 +665,109 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        wprintf(_("Start date:"));
        wprintf("</TD><TD>");
        p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY);
+       wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodtstart\" ID=\"nodtstart\" VALUE=\"NODTSTART\" ");
+       if (p == NULL) {
+               wprintf("CHECKED=\"CHECKED\"");
+       }
+       wprintf(">");
+       wprintf(_("No date"));
+       
+       wprintf(" ");
+       wprintf("<span ID=\"dtstart_date\">");
+       wprintf(_("or"));
+       wprintf(" ");
        if (p != NULL) {
-               t = icalproperty_get_dtstart(p);
+               IcalTime = icalproperty_get_dtstart(p);
        }
-       else {
-               t = icaltime_from_timet(now, 0);
+       else
+               IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
+       display_icaltimetype_as_webform(&IcalTime, "dtstart", 0);
+
+       wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"dtstart_time_assoc\" ID=\"dtstart_time_assoc\" VALUE=\"yes\"");
+       if (!IcalTime.is_date) {
+               wprintf("CHECKED=\"CHECKED\"");
        }
-       display_icaltimetype_as_webform(&t, "dtstart");
-       wprintf("</TD></TR>\n");
+       wprintf(">");
+       wprintf(_("Time associated"));
+       wprintf("</span></TD></TR>\n");
 
        wprintf("<TR><TD>");
        wprintf(_("Due date:"));
        wprintf("</TD><TD>");
        p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
+       wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodue\" ID=\"nodue\" VALUE=\"NODUE\"");
+       if (p == NULL) {
+               wprintf("CHECKED=\"CHECKED\"");
+       }
+       wprintf(">");
+       wprintf(_("No date"));
+       wprintf(" ");
+       wprintf("<span ID=\"due_date\">\n");
+       wprintf(_("or"));
+       wprintf(" ");
        if (p != NULL) {
-               t = icalproperty_get_due(p);
+               IcalTime = icalproperty_get_due(p);
        }
-       else {
-               t = icaltime_from_timet(now, 0);
+       else
+               IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone());
+       display_icaltimetype_as_webform(&IcalTime, "due", 0);
+
+       wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"due_time_assoc\" ID=\"due_time_assoc\" VALUE=\"yes\"");
+       if (!IcalTime.is_date) {
+               wprintf("CHECKED=\"CHECKED\"");
+       }
+       wprintf(">");
+       wprintf(_("Time associated"));
+       wprintf("</span></TD></TR>\n");
+       todoStatus = icalcomponent_get_status(vtodo);
+       wprintf("<TR><TD>\n");
+       wprintf(_("Completed:"));
+       wprintf("</TD><TD>");
+       wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"status\" VALUE=\"COMPLETED\"");
+       if (todoStatus == ICAL_STATUS_COMPLETED) {
+               wprintf(" CHECKED=\"CHECKED\"");
+       } 
+       wprintf(" >");
+       wprintf("</TD></TR>");
+       /* start category field */
+       p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY);
+       wprintf("<TR><TD>");
+       wprintf(_("Category:"));
+       wprintf("</TD><TD>");
+       wprintf("<INPUT TYPE=\"text\" NAME=\"category\" MAXLENGTH=\"32\" SIZE=\"32\" VALUE=\"");
+       if (p != NULL) {
+               escputs((char *)icalproperty_get_categories(p));
        }
-       display_icaltimetype_as_webform(&t, "due");
-       wprintf("</TD></TR>\n");
+       wprintf("\">");
+       wprintf("</TD></TR>\n   ");
+       /* end category field */
        wprintf("<TR><TD>");
        wprintf(_("Description:"));
        wprintf("</TD><TD>");
-       wprintf("<TEXTAREA NAME=\"description\" wrap=soft "
-               "ROWS=10 COLS=80 WIDTH=80>\n"
-       );
+       wprintf("<TEXTAREA NAME=\"description\" "
+               "ROWS=\"10\" COLS=\"80\">\n"
+               );
        p = icalcomponent_get_first_property(vtodo, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
        wprintf("</TEXTAREA></TD></TR></TABLE>\n");
 
-       wprintf("<CENTER>"
+       wprintf("<SPAN STYLE=\"text-align: center;\">"
                "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
-               "</CENTER>\n",
+               "</SPAN>\n",
                _("Save"),
                _("Delete"),
                _("Cancel")
-       );
-
+               );
+       wprintf("</td></tr></table>");
        wprintf("</FORM>\n");
-
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</div></div></div>\n");
+       wprintf("<!-- end task edit form -->");
        wDumpContent(1);
 
        if (created_new_vtodo) {
@@ -648,11 +776,14 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 }
 
 /*
- * \brief Save an edited task
- * \param supplied_vtodo the task to save
- * \param msgnum number of the mesage in our db
+ * Save an edited task
+ *
+ * supplied_vtodo      the task to save
+ * msgnum              number of the mesage in our db
  */
-void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
+void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from, int unread,
+                               struct calview *calv)
+{
        char buf[SIZ];
        int delete_existing = 0;
        icalproperty *prop;
@@ -675,9 +806,9 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
                        save_individual_task(
                                icalcomponent_get_first_component(
-                                       vtodo, ICAL_VTODO_COMPONENT
-                               ), msgnum
-                       );
+                                       vtodo, ICAL_VTODO_COMPONENT), 
+                               msgnum, from, unread, calv
+                               );
                        return;
                }
        }
@@ -686,66 +817,112 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                created_new_vtodo = 1;
        }
 
-       if (!IsEmptyStr(bstr("save_button"))) {
+       if (havebstr("save_button")) {
 
                /** Replace values in the component with ones from the form */
 
                while (prop = icalcomponent_get_first_property(vtodo,
-                     ICAL_SUMMARY_PROPERTY), prop != NULL) {
+                                                              ICAL_SUMMARY_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
-               if (!IsEmptyStr(bstr("summary"))) {
-       
-                       icalcomponent_add_property(vtodo,
-                                       icalproperty_new_summary(bstr("summary")));
-               } else {
-                       icalcomponent_add_property(vtodo,
-                                       icalproperty_new_summary("Untitled Task"));
-               }
+               if (havebstr("summary")) {
+
+                       icalcomponent_add_property(vtodo,
+                                                  icalproperty_new_summary(bstr("summary")));
+               } else {
+                       icalcomponent_add_property(vtodo,
+                                                  icalproperty_new_summary(_("Untitled Task")));
+               }
        
                while (prop = icalcomponent_get_first_property(vtodo,
-                     ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
+                                                              ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
-               icalcomponent_add_property(vtodo,
-                       icalproperty_new_description(bstr("description")));
+               if (havebstr("description")) {
+                       icalcomponent_add_property(vtodo,
+                                                  icalproperty_new_description(bstr("description")));
+               }
        
                while (prop = icalcomponent_get_first_property(vtodo,
-                     ICAL_DTSTART_PROPERTY), prop != NULL) {
+                                                              ICAL_DTSTART_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
-               icaltime_from_webform(&t, "dtstart");
-               icalcomponent_add_property(vtodo,
-                       icalproperty_new_dtstart(t)
-               );
-       
+               if (IsEmptyStr(bstr("nodtstart"))) {
+                       if (yesbstr("dtstart_time")) {
+                               icaltime_from_webform(&t, "dtstart");
+                       }
+                       else {
+                               icaltime_from_webform_dateonly(&t, "dtstart");
+                       }
+                       icalcomponent_add_property(vtodo,
+                                                  icalproperty_new_dtstart(t)
+                               );
+               }
+               while(prop = icalcomponent_get_first_property(vtodo,
+                                                             ICAL_STATUS_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vtodo,prop);
+                       icalproperty_free(prop);
+               }
+               while(prop = icalcomponent_get_first_property(vtodo,
+                                                             ICAL_PERCENTCOMPLETE_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vtodo,prop);
+                       icalproperty_free(prop);
+               }
+
+               if (havebstr("status")) {
+                       icalproperty_status taskStatus = icalproperty_string_to_status(bstr("status"));
+                       icalcomponent_set_status(vtodo, taskStatus);
+                       icalcomponent_add_property(vtodo,
+                               icalproperty_new_percentcomplete(
+                                       (strcasecmp(bstr("status"), "completed") ? 0 : 100)
+                               )
+                       );
+               }
+               else {
+                       icalcomponent_add_property(vtodo, icalproperty_new_percentcomplete(0));
+               }
+               while (prop = icalcomponent_get_first_property(vtodo,
+                                                              ICAL_CATEGORIES_PROPERTY), prop != NULL) {
+                       icalcomponent_remove_property(vtodo,prop);
+                       icalproperty_free(prop);
+               }
+               if (!IsEmptyStr(bstr("category"))) {
+                       prop = icalproperty_new_categories(bstr("category"));
+                       icalcomponent_add_property(vtodo,prop);
+               }
                while (prop = icalcomponent_get_first_property(vtodo,
-                     ICAL_DUE_PROPERTY), prop != NULL) {
+                                                              ICAL_DUE_PROPERTY), prop != NULL) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
-               icaltime_from_webform(&t, "due");
-               icalcomponent_add_property(vtodo,
-                       icalproperty_new_due(t)
-               );
-
+               if (IsEmptyStr(bstr("nodue"))) {
+                       if (yesbstr("due_time")) {
+                               icaltime_from_webform(&t, "due");
+                       }
+                       else {
+                               icaltime_from_webform_dateonly(&t, "due");
+                       }
+                       icalcomponent_add_property(vtodo,
+                                                  icalproperty_new_due(t)
+                               );
+               }
                /** Give this task a UID if it doesn't have one. */
                lprintf(9, "Give this task a UID if it doesn't have one.\n");
                if (icalcomponent_get_first_property(vtodo,
-                  ICAL_UID_PROPERTY) == NULL) {
+                                                    ICAL_UID_PROPERTY) == NULL) {
                        generate_uuid(buf);
                        icalcomponent_add_property(vtodo,
-                               icalproperty_new_uid(buf)
-                       );
+                                                  icalproperty_new_uid(buf)
+                               );
                }
 
-               /** Increment the sequence ID */
+               /* Increment the sequence ID */
                lprintf(9, "Increment the sequence ID\n");
                while (prop = icalcomponent_get_first_property(vtodo,
-                     ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+                                                              ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
                        i = icalproperty_get_sequence(prop);
                        lprintf(9, "Sequence was %d\n", i);
                        if (i > sequence) sequence = i;
@@ -755,10 +932,10 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                ++sequence;
                lprintf(9, "New sequence is %d.  Adding...\n", sequence);
                icalcomponent_add_property(vtodo,
-                       icalproperty_new_sequence(sequence)
-               );
+                                          icalproperty_new_sequence(sequence)
+                       );
 
-               /**
+               /*
                 * Encapsulate event into full VCALENDAR component.  Clone it first,
                 * for two reasons: one, it's easier to just free the whole thing
                 * when we're done instead of unbundling, but more importantly, we
@@ -777,7 +954,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                        serv_puts(icalcomponent_as_ical_string(encaps));
                        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...
@@ -790,12 +967,12 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        /**
         * If the user clicked 'Delete' then explicitly delete the message.
         */
-       if (!IsEmptyStr(bstr("delete_button"))) {
+       if (havebstr("delete_button")) {
                delete_existing = 1;
        }
 
        if ( (delete_existing) && (msgnum > 0L) ) {
-               serv_printf("DELE %ld", atol(bstr("msgnum")));
+               serv_printf("DELE %ld", lbstr("msgnum"));
                serv_getln(buf, sizeof buf);
        }
 
@@ -803,30 +980,74 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                icalcomponent_free(vtodo);
        }
 
-       /** Go back to the task list */
-       readloop("readfwd");
+       /* Go back to wherever we came from */
+       if (ibstr("return_to_summary") == 1) {
+               summary();
+       }
+       else {
+               readloop(readfwd);
+       }
 }
 
 
 
-/**
- * \brief generic item handler
- * Code common to all display handlers.  Given a message number and a MIME
+void process_ical_object(long msgnum, int unread,
+                        char *from, 
+                        char *FlatIcal, 
+                        icalcomponent_kind which_kind,
+                        IcalCallbackFunc CallBack,
+                        struct calview *calv
+       ) 
+{
+       icalcomponent *cal, *c;
+
+       cal = icalcomponent_new_from_string(FlatIcal);
+       if (cal != NULL) {
+
+               /* A which_kind of (-1) means just load the whole thing */
+               if (which_kind == (-1)) {
+                       CallBack(cal, msgnum, from, unread, calv);
+               }
+               
+               /* Otherwise recurse and hunt */
+               else {
+                       
+                       /* Simple components of desired type */
+                       if (icalcomponent_isa(cal) == which_kind) {
+                               CallBack(cal, msgnum, from, unread, calv);
+                       }
+                       
+                       /* Subcomponents of desired type */
+                       for (c = icalcomponent_get_first_component(cal, which_kind);
+                            (c != 0);
+                            c = icalcomponent_get_next_component(cal, which_kind)) {
+                               CallBack(c, msgnum, from, unread, calv);
+                       }
+                       
+               }
+               
+               icalcomponent_free(cal);
+       }
+}
+
+/*
+ * Code common to all icalendar display handlers.  Given a message number and a MIME
  * 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.
- * \param mimetype mimetyp of our object
- * \param which_kind sort of ical type
- * \param msgnum number of the mesage in our db
- * \param callback a funcion \todo
- *
  */
-void display_using_handler(long msgnum,
-                       char *mimetype,
-                       icalcomponent_kind which_kind,
-                       void (*callback)(icalcomponent *, long)
-       ) {
-       char buf[1024];
+void load_ical_object(long msgnum, int unread,
+                     icalcomponent_kind which_kind,
+                     IcalCallbackFunc CallBack,
+                     struct calview *calv,
+                     int RenderAsync
+       ) 
+{
+       StrBuf *Buf;
+       StrBuf *Data;
+       const char *bptr;
+       int Done = 0;
+       char from[128] = "";
        char mime_partnum[256];
        char mime_filename[256];
        char mime_content_type[256];
@@ -834,157 +1055,198 @@ void display_using_handler(long msgnum,
        int mime_length;
        char relevant_partnum[256];
        char *relevant_source = NULL;
-       icalcomponent *cal, *c;
+       int phase = 0;                          /* 0 = citadel headers, 1 = mime headers, 2 = body */
+       char msg4_content_type[256] = "";
+       char msg4_content_encoding[256] = "";
+       int msg4_content_length = 0;
 
        relevant_partnum[0] = '\0';
-       sprintf(buf, "MSG0 %ld|0", msgnum);     /* unfortunately we need the mime headers */
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') return;
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "part=", 5)) {
-                       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(&buf[5], 5);
-
-                       if (!strcasecmp(mime_content_type, "text/calendar")) {
-                               strcpy(relevant_partnum, mime_partnum);
+       serv_printf("MSG4 %ld", msgnum);        /* we need the mime headers */
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 1) {
+               FreeStrBuf (&Buf);
+               return;
+       }
+       while (!Done && (StrBuf_ServGetln(Buf)>=0)) {
+               if ( (StrLength(Buf)==3) && 
+                    !strcmp(ChrPtr(Buf), "000")) {
+                       Done = 1;
+                       break;
+               }
+               bptr = ChrPtr(Buf);
+               switch (phase) {
+               case 0:
+                       if (!strncasecmp(bptr, "part=", 5)) {
+                               extract_token(mime_filename, &bptr[5], 1, '|', sizeof mime_filename);
+                               extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum);
+                               extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition);
+                               extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type);
+                               mime_length = extract_int(&bptr[5], 5);
+
+                               if (  (!strcasecmp(mime_content_type, "text/calendar"))
+                                     || (!strcasecmp(mime_content_type, "application/ics"))
+                                     || (!strcasecmp(mime_content_type, "text/vtodo"))
+                                       ) {
+                                       strcpy(relevant_partnum, mime_partnum);
+                               }
                        }
-                       else if (!strcasecmp(mime_content_type, "text/vtodo")) {
-                               strcpy(relevant_partnum, mime_partnum);
+                       else if (!strncasecmp(bptr, "from=", 4)) {
+                               extract_token(from, bptr, 1, '=', sizeof(from));
                        }
-
-               }
-       }
-
-       if (!IsEmptyStr(relevant_partnum)) {
-               relevant_source = load_mimepart(msgnum, relevant_partnum);
-               if (relevant_source != NULL) {
-
-                       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);
+                       else if ((phase == 0) && (!strncasecmp(bptr, "text", 4))) {
+                               phase = 1;
+                       }
+               break;
+               case 1:
+                       if (!IsEmptyStr(bptr)) {
+                               if (!strncasecmp(bptr, "Content-type: ", 14)) {
+                                       safestrncpy(msg4_content_type, &bptr[14], sizeof msg4_content_type);
+                                       striplt(msg4_content_type);
                                }
-
-                               /** Subcomponents of desired type */
-                               for (c = icalcomponent_get_first_component(cal,
-                                   which_kind);
-                                   (c != 0);
-                                   c = icalcomponent_get_next_component(cal,
-                                   which_kind)) {
-                                       callback(c, msgnum);
+                               else if (!strncasecmp(bptr, "Content-transfer-encoding: ", 27)) {
+                                       safestrncpy(msg4_content_encoding, &bptr[27], sizeof msg4_content_encoding);
+                                       striplt(msg4_content_type);
+                               }
+                               else if ((!strncasecmp(bptr, "Content-length: ", 16))) {
+                                       msg4_content_length = atoi(&bptr[16]);
                                }
-                               icalcomponent_free(cal);
+                               break;
                        }
-                       free(relevant_source);
+                       else {
+                               phase++;
+                               
+                               if ((msg4_content_length > 0)
+                                   && ( !strcasecmp(msg4_content_encoding, "7bit"))
+                                   && ((!strcasecmp(mime_content_type, "text/calendar"))
+                                       || (!strcasecmp(mime_content_type, "application/ics"))
+                                       || (!strcasecmp(mime_content_type, "text/vtodo"))
+                                           )
+                                       ) 
+                               {
+                               }
+                       }
+               case 2:
+                       Data = NewStrBufPlain(NULL, msg4_content_length * 2);
+                       if (msg4_content_length > 0) {
+                               StrBuf_ServGetBLOBBuffered(Data, msg4_content_length);
+                               phase ++;
+                       }
+                       else {
+                               StrBufAppendBuf(Data, Buf, 0);
+                               StrBufAppendBufPlain(Data, "\r\n", 1, 0);
+                       }
+               case 3:
+                       StrBufAppendBuf(Data, Buf, 0);
                }
        }
+       FreeStrBuf(&Buf);
 
+       /* If MSG4 didn't give us the part we wanted, but we know that we can find it
+        * as one of the other MIME parts, attempt to load it now.
+        */
+       if ((Data == NULL) && (!IsEmptyStr(relevant_partnum))) {
+               Data = load_mimepart(msgnum, relevant_partnum);
+       }
+
+       if (Data != NULL) {
+               relevant_source = (char*) ChrPtr(Data);
+               process_ical_object(msgnum, unread,
+                                   from, 
+                                   relevant_source, 
+                                   which_kind,
+                                   CallBack,
+                                   calv);
+               FreeStrBuf (&Data);
+       }
+
+       icalmemory_free_ring();
 }
 
-/**
- * \brief display whole calendar
- * \param msgnum number of the mesage in our db
+/*
+ * Display a calendar item
  */
-void display_calendar(long msgnum) {
-       display_using_handler(msgnum, "text/calendar",
-                               ICAL_VEVENT_COMPONENT,
-                               display_individual_cal);
+void load_calendar_item(message_summary *Msg, int unread, struct calview *c) {
+       load_ical_object(Msg->msgnum, unread, (-1), display_individual_cal, c, 1);
 }
 
-/**
- * \brief display whole taksview
- * \param msgnum number of the mesage in our db
+/*
+ * Display task view
  */
-void display_task(long msgnum) {
-       display_using_handler(msgnum, "text/calendar",
-                               ICAL_VTODO_COMPONENT,
-                               display_individual_cal);
+void display_task(message_summary *Msg, int unread) {
+       load_ical_object(Msg->msgnum, unread, ICAL_VTODO_COMPONENT, display_individual_cal, NULL, 0);
 }
 
-/**
- * \brief display the editor component for a task
+/*
+ * Display the editor component for a task
  */
 void display_edit_task(void) {
        long msgnum = 0L;
-
-       /** Force change the room if we have to */
-       if (!IsEmptyStr(bstr("taskrm"))) {
-               gotoroom(bstr("taskrm"));
+                       
+       /* Force change the room if we have to */
+       if (havebstr("taskrm")) {
+               gotoroom(sbstr("taskrm"));
        }
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = lbstr("msgnum");
        if (msgnum > 0L) {
-               /** existing task */
-               display_using_handler(msgnum, "text/calendar",
-                               ICAL_VTODO_COMPONENT,
-                               display_edit_individual_task);
+               /* existing task */
+               load_ical_object(msgnum, 0,
+                                ICAL_VTODO_COMPONENT,
+                                display_edit_individual_task,
+                                NULL, 0
+               );
        }
        else {
-               /** new task */
-               display_edit_individual_task(NULL, 0L);
+               /* new task */
+               display_edit_individual_task(NULL, 0L, "", 0, NULL);
        }
 }
 
-/**
- *\brief save an edited task
+/*
+ * save an edited task
  */
 void save_task(void) {
        long msgnum = 0L;
-
-       msgnum = atol(bstr("msgnum"));
+       msgnum = lbstr("msgnum");
        if (msgnum > 0L) {
-               display_using_handler(msgnum, "text/calendar",
-                               ICAL_VTODO_COMPONENT,
-                               save_individual_task);
+               load_ical_object(msgnum, 0, ICAL_VTODO_COMPONENT, save_individual_task, NULL, 0);
        }
        else {
-               save_individual_task(NULL, 0L);
+               save_individual_task(NULL, 0L, "", 0, NULL);
        }
 }
 
-/**
- * \brief display the editor component for an event
+/*
+ * display the editor component for an event
  */
 void display_edit_event(void) {
        long msgnum = 0L;
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = lbstr("msgnum");
        if (msgnum > 0L) {
                /* existing event */
-               display_using_handler(msgnum, "text/calendar",
-                               ICAL_VEVENT_COMPONENT,
-                               display_edit_individual_event);
+               load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, display_edit_individual_event, NULL, 0);
        }
        else {
                /* new event */
-               display_edit_individual_event(NULL, 0L);
+               display_edit_individual_event(NULL, 0L, "", 0, NULL);
        }
 }
 
-/**
- * \brief save an edited event
+/*
+ * save an edited event
  */
 void save_event(void) {
        long msgnum = 0L;
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = lbstr("msgnum");
 
        if (msgnum > 0L) {
-               display_using_handler(msgnum, "text/calendar",
-                               ICAL_VEVENT_COMPONENT,
-                               save_individual_event);
+               load_ical_object(msgnum, 0, (-1), save_individual_event, NULL, 0);
        }
        else {
-               save_individual_event(NULL, 0L);
+               save_individual_event(NULL, 0L, "", 0, NULL);
        }
 }
 
@@ -992,15 +1254,14 @@ void save_event(void) {
 
 
 
-/**
- * \brief freebusy display (for client software)
- * \param req dunno. ?????
+/*
+ * Anonymous request of freebusy data for a user
  */
-void do_freebusy(char *req) {
+void do_freebusy(const char *req) {
        char who[SIZ];
        char buf[SIZ];
-       char *fb;
        int len;
+       long lines;
 
        extract_token(who, req, 1, ' ', sizeof who);
        if (!strncasecmp(who, "/freebusy/", 10)) {
@@ -1010,8 +1271,8 @@ void do_freebusy(char *req) {
 
        len = strlen(who);
        if ( (!strcasecmp(&who[len-4], ".vcf"))
-          || (!strcasecmp(&who[len-4], ".ifb"))
-          || (!strcasecmp(&who[len-4], ".vfb")) ) {
+            || (!strcasecmp(&who[len-4], ".ifb"))
+            || (!strcasecmp(&who[len-4], ".vfb")) ) {
                who[len-4] = 0;
        }
 
@@ -1020,22 +1281,34 @@ void do_freebusy(char *req) {
        serv_getln(buf, sizeof buf);
 
        if (buf[0] != '1') {
-               wprintf("HTTP/1.1 404 %s\n", &buf[4]);
+               hprintf("HTTP/1.1 404 %s\n", &buf[4]);
                output_headers(0, 0, 0, 0, 0, 0);
-               wprintf("Content-Type: text/plain\r\n");
-               wprintf("\r\n");
+               hprintf("Content-Type: text/plain\r\n");
                wprintf("%s\n", &buf[4]);
+               end_burst();
                return;
        }
 
-       fb = read_server_text();
-       http_transmit_thing(fb, strlen(fb), "text/calendar", 0);
-       free(fb);
+       read_server_text(WC->WBuf, &lines);
+       http_transmit_thing("text/calendar", 0);
 }
 
 
 
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
 
-/*@}*/
+void 
+InitModule_CALENDAR
+(void)
+{
+       RegisterPreference("daystart", _("Calendar day view begins at:"), PRF_INT, NULL);
+       RegisterPreference("dayend", _("Calendar day view ends at:"), PRF_INT, NULL);
+       RegisterPreference("weekstart", _("Week starts on:"), PRF_INT, NULL);
+
+       WebcitAddUrlHandler(HKEY("display_edit_task"), display_edit_task, 0);
+       WebcitAddUrlHandler(HKEY("save_task"), save_task, 0);
+       WebcitAddUrlHandler(HKEY("display_edit_event"), display_edit_event, 0);
+       WebcitAddUrlHandler(HKEY("save_event"), save_event, 0);
+       WebcitAddUrlHandler(HKEY("respond_to_request"), respond_to_request, 0);
+       WebcitAddUrlHandler(HKEY("handle_rsvp"), handle_rsvp, 0);
+}