Server-side changes to allow users to submit messages
[citadel.git] / citadel / serv_calendar.c
index aaccccab5a53c16c20f365a3214a0dbbd4287388..a36926c3072215f47e8fbe780352c0abcd8ebf55 100644 (file)
@@ -33,6 +33,7 @@
 #include "mime_parser.h"
 #include "internet_addressing.h"
 #include "serv_calendar.h"
+#include "euidindex.h"
 
 #ifdef CITADEL_WITH_CALENDAR_SERVICE
 
@@ -103,8 +104,6 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
 
 /*
  * Write a calendar object into the specified user's calendar room.
- * 
- * ok
  */
 void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
        char temp[PATH_MAX];
@@ -126,7 +125,7 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
                return;
        }
 
-       strcpy(temp, tmpnam(NULL));
+       CtdlMakeTempFileName(temp, sizeof temp);
        ser = icalcomponent_as_ical_string(cal);
        if (ser == NULL) return;
 
@@ -183,12 +182,8 @@ void ical_add(icalcomponent *cal, int recursion_level) {
  * Send a reply to a meeting invitation.
  *
  * 'request' is the invitation to reply to.
- * 'action' is the string "accept" or "decline".
+ * 'action' is the string "accept" or "decline" or "tentative".
  *
- * (Sorry about this being more than 80 columns ... there was just
- * no easy way to break it down sensibly.)
- * 
- * ok
  */
 void ical_send_a_reply(icalcomponent *request, char *action) {
        icalcomponent *the_reply = NULL;
@@ -300,7 +295,6 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
                                        icalproperty_get_summary(summary) );
                        }
                }
-
        }
 
        /* Now generate the reply message and send it out. */
@@ -311,14 +305,18 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
        reply_message_text = malloc(strlen(serialized_reply) + SIZ);
        if (reply_message_text != NULL) {
                sprintf(reply_message_text,
-                       "Content-type: text/calendar\r\n\r\n%s\r\n",
+                       "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
                        serialized_reply
                );
 
-               msg = CtdlMakeMessage(&CC->user, organizer_string,
+               msg = CtdlMakeMessage(&CC->user,
+                       organizer_string,       /* to */
+                       "",                     /* cc */
                        CC->room.QRname, 0, FMT_RFC822,
                        "",
+                       "",
                        summary_string,         /* Use summary for subject */
+                       NULL,
                        reply_message_text);
        
                if (msg != NULL) {
@@ -337,7 +335,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
  * and turns them into calendar objects
  */
 void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
-               void *content, char *cbtype, size_t length, char *encoding,
+               void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                void *cbuserdata) {
 
        struct ical_respond_data *ird = NULL;
@@ -374,7 +372,7 @@ void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
  * Respond to a meeting request.
  */
 void ical_respond(long msgnum, char *partnum, char *action) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        if (
@@ -428,7 +426,7 @@ void ical_respond(long msgnum, char *partnum, char *action) {
                /* Now that we've processed this message, we don't need it
                 * anymore.  So delete it.
                 */
-               CtdlDeleteMessages(CC->room.QRname, msgnum, "");
+               CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 
                /* Free the memory we allocated and return a response. */
                icalcomponent_free(ird.cal);
@@ -495,7 +493,7 @@ struct original_event_container {
  * to fetch the object being updated)
  */
 void ical_locate_original_event(char *name, char *filename, char *partnum, char *disp,
-               void *content, char *cbtype, size_t length, char *encoding,
+               void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                void *cbuserdata) {
 
        struct original_event_container *oec = NULL;
@@ -604,8 +602,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
        char uid[SIZ];
        char hold_rm[ROOMNAMELEN];
        long msgnum_being_replaced = 0;
-       struct CtdlMessage *template = NULL;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct original_event_container oec;
        icalcomponent *original_event;
        char *serialized_event = NULL;
@@ -626,18 +623,13 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
        }
 
        /*
-        * Pound through the user's calendar looking for a message with
+        * Look in the EUID index for a message with
         * the Citadel EUID set to the value we're looking for.  Since
         * Citadel always sets the message EUID to the vCalendar UID of
         * the event, this will work.
         */
-       template = (struct CtdlMessage *)
-               malloc(sizeof(struct CtdlMessage));
-       memset(template, 0, sizeof(struct CtdlMessage));
-       template->cm_fields['E'] = strdup(uid);
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
-               template, ical_hunt_for_event_to_update, &msgnum_being_replaced);
-       CtdlFreeMessage(template);
+       msgnum_being_replaced = locate_message_by_euid(uid, &CC->room);
+
        getroom(&CC->room, hold_rm);    /* return to saved room */
 
        lprintf(CTDL_DEBUG, "msgnum_being_replaced == %ld\n", msgnum_being_replaced);
@@ -684,16 +676,19 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
        message_text = malloc(strlen(serialized_event) + SIZ);
        if (message_text != NULL) {
                sprintf(message_text,
-                       "Content-type: text/calendar\r\n\r\n%s\r\n",
+                       "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
                        serialized_event
                );
 
                msg = CtdlMakeMessage(&CC->user,
+                       "",                     /* No recipient */
                        "",                     /* No recipient */
                        roomname,
                        0, FMT_RFC822,
                        "",
+                       "",
                        "",             /* no subject */
+                       NULL,
                        message_text);
        
                if (msg != NULL) {
@@ -714,7 +709,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
  * passes it up to ical_update_my_calendar_with_reply() for processing.
  */
 void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
        int ret;
 
@@ -779,7 +774,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
                /* Now that we've processed this message, we don't need it
                 * anymore.  So delete it.  (Maybe make this optional?)
                 */
-               CtdlDeleteMessages(CC->room.QRname, msgnum, "");
+               CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 
                /* Free the memory we allocated and return a response. */
                icalcomponent_free(ird.cal);
@@ -878,7 +873,7 @@ int ical_ctdl_is_overlap(
  */
 void ical_hunt_for_conflicts_backend(long msgnum, void *data) {
        icalcomponent *cal;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
        struct icaltimetype t1start, t1end, t2start, t2end;
        icalproperty *p;
@@ -978,7 +973,8 @@ void ical_hunt_for_conflicts(icalcomponent *cal) {
 
        cprintf("%d Conflicting events:\n", LISTING_FOLLOWS);
 
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+       CtdlForEachMessage(MSGS_ALL, 0, NULL,
+               NULL,
                NULL,
                ical_hunt_for_conflicts_backend,
                (void *) cal
@@ -995,7 +991,7 @@ void ical_hunt_for_conflicts(icalcomponent *cal) {
  * Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2)
  */
 void ical_conflicts(long msgnum, char *partnum) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        msg = CtdlFetchMessage(msgnum, 1);
@@ -1135,7 +1131,7 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) {
  */
 void ical_freebusy_backend(long msgnum, void *data) {
        icalcomponent *cal;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        cal = (icalcomponent *)data;
@@ -1283,9 +1279,7 @@ void ical_freebusy(char *who) {
 
        /* Add busy time from events */
        lprintf(CTDL_DEBUG, "Adding busy time from events\n");
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
-               NULL, ical_freebusy_backend, (void *)fb
-       );
+       CtdlForEachMessage(MSGS_ALL, 0, NULL, NULL, NULL, ical_freebusy_backend, (void *)fb );
 
        /* If values for DTSTART and DTEND are still not present, set them
         * to yesterday and tomorrow as default values.
@@ -1330,6 +1324,175 @@ void ical_freebusy(char *who) {
 
 
 
+/*
+ * Backend for ical_getics()
+ * 
+ * This is a ForEachMessage() callback function that searches the current room
+ * for calendar events and adds them each into one big calendar component.
+ */
+void ical_getics_backend(long msgnum, void *data) {
+       icalcomponent *encaps, *c;
+       struct CtdlMessage *msg = NULL;
+       struct ical_respond_data ird;
+
+       encaps = (icalcomponent *)data;
+       if (encaps == NULL) return;
+
+       /* Look for the calendar event... */
+
+       msg = CtdlFetchMessage(msgnum, 1);
+       if (msg == NULL) return;
+       memset(&ird, 0, sizeof ird);
+       strcpy(ird.desired_partnum, "_HUNT_");
+       mime_parser(msg->cm_fields['M'],
+               NULL,
+               *ical_locate_part,              /* callback function */
+               NULL, NULL,
+               (void *) &ird,                  /* user data */
+               0
+       );
+       CtdlFreeMessage(msg);
+
+       if (ird.cal == NULL) return;
+
+       /* Here we go: put the VEVENT into the VCALENDAR.  We now no longer
+        * are responsible for "the_request"'s memory -- it will be freed
+        * when we free "encaps".
+        */
+
+       /* If the top-level component is *not* a VCALENDAR, we can drop it right
+        * in.  This will almost never happen.
+        */
+       if (icalcomponent_isa(ird.cal) != ICAL_VCALENDAR_COMPONENT) {
+               icalcomponent_add_component(encaps, ird.cal);
+       }
+       /*
+        * In the more likely event that we're looking at a VCALENDAR with the VEVENT
+        * and other components encapsulated inside, we have to extract them.
+        */
+       else {
+               for (c = icalcomponent_get_first_component(ird.cal, ICAL_ANY_COMPONENT);
+                   (c != NULL);
+                   c = icalcomponent_get_next_component(ird.cal, ICAL_ANY_COMPONENT)) {
+                       icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
+               }
+               icalcomponent_free(ird.cal);
+       }
+}
+
+
+
+/*
+ * Retrieve all of the calendar items in the current room, and output them
+ * as a single icalendar object.
+ */
+void ical_getics(void)
+{
+       icalcomponent *encaps = NULL;
+       char *ser = NULL;
+
+       if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
+          &&(CC->room.QRdefaultview != VIEW_TASKS) ) {
+               cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
+               return;         /* Not a vCalendar-centric room */
+       }
+
+       encaps = icalcomponent_new_vcalendar();
+       if (encaps == NULL) {
+               lprintf(CTDL_DEBUG, "Error at %s:%d - could not allocate component!\n",
+                       __FILE__, __LINE__);
+               cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR);
+               return;
+       }
+
+       cprintf("%d one big calendar\n", LISTING_FOLLOWS);
+
+       /* Set the Product ID */
+       icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID));
+
+       /* Set the Version Number */
+       icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
+
+       /* Set the method to REQUEST */
+       icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
+
+       /* Now go through the room encapsulating all calendar items. */
+       CtdlForEachMessage(MSGS_ALL, 0, NULL,
+               NULL,
+               NULL,
+               ical_getics_backend,
+               (void *) encaps
+       );
+
+       ser = strdup(icalcomponent_as_ical_string(encaps));
+       client_write(ser, strlen(ser));
+       free(ser);
+       cprintf("\n000\n");
+       icalcomponent_free(encaps);     /* Don't need this anymore. */
+
+}
+
+
+/*
+ * Delete all of the calendar items in the current room, and replace them
+ * with calendar items from a client-supplied data stream.
+ */
+void ical_putics(void)
+{
+       char *calstream = NULL;
+       icalcomponent *cal;
+       icalcomponent *c;
+
+       if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
+          &&(CC->room.QRdefaultview != VIEW_TASKS) ) {
+               cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
+               return;         /* Not a vCalendar-centric room */
+       }
+
+       if (!CtdlDoIHavePermissionToDeleteMessagesFromThisRoom()) {
+               cprintf("%d Permission denied.\n", ERROR+HIGHER_ACCESS_REQUIRED);
+               return;
+       }
+
+       cprintf("%d Transmit data now\n", SEND_LISTING);
+        calstream = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0);
+       if (calstream == NULL) {
+               return;
+       }
+
+       cal = icalcomponent_new_from_string(calstream);
+       free(calstream);
+       ical_dezonify(cal);
+
+       /* We got our data stream -- now do something with it. */
+
+       /* Delete the existing messages in the room, because we are replacing
+        * the entire calendar with an entire new (or updated) calendar.
+        * (Careful: this opens an S_ROOMS critical section!)
+        */
+       CtdlDeleteMessages(CC->room.QRname, NULL, 0, "");
+
+       /* If the top-level component is *not* a VCALENDAR, we can drop it right
+        * in.  This will almost never happen.
+        */
+       if (icalcomponent_isa(cal) != ICAL_VCALENDAR_COMPONENT) {
+               ical_write_to_cal(&CC->user, cal);
+       }
+       /*
+        * In the more likely event that we're looking at a VCALENDAR with the VEVENT
+        * and other components encapsulated inside, we have to extract them.
+        */
+       else {
+               for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
+                   (c != NULL);
+                   c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
+                       ical_write_to_cal(&CC->user, c);
+               }
+       }
+
+       icalcomponent_free(cal);
+}
+
 
 /*
  * All Citadel calendar commands from the client come through here.
@@ -1390,6 +1553,16 @@ void cmd_ical(char *argbuf)
                return;
        }
 
+       if (!strcasecmp(subcmd, "getics")) {
+               ical_getics();
+               return;
+       }
+
+       if (!strcasecmp(subcmd, "putics")) {
+               ical_putics();
+               return;
+       }
+
        cprintf("%d Invalid subcommand\n", ERROR + CMD_NOT_SUPPORTED);
 }
 
@@ -1581,16 +1754,20 @@ void ical_send_out_invitations(icalcomponent *cal) {
                );
 
                msg = CtdlMakeMessage(&CC->user,
+                       "",                     /* No single recipient here */
                        "",                     /* No single recipient here */
                        CC->room.QRname, 0, FMT_RFC822,
                        "",
+                       "",
                        summary_string,         /* Use summary for subject */
+                       NULL,
                        request_message_text);
        
                if (msg != NULL) {
                        valid = validate_recipients(attendees_string);
                        CtdlSubmitMsg(msg, valid, "");
                        CtdlFreeMessage(msg);
+                       free (valid);
                }
        }
        free(serialized_request);
@@ -1608,6 +1785,8 @@ void ical_saving_vevent(icalcomponent *cal) {
        icalproperty *organizer = NULL;
        char organizer_string[SIZ];
 
+       lprintf(CTDL_DEBUG, "ical_saving_vevent() has been called!\n");
+
        /* Don't send out invitations unless the client wants us to. */
        if (CIT_ICAL->server_generated_invitations == 0) {
                return;
@@ -1664,39 +1843,44 @@ void ical_saving_vevent(icalcomponent *cal) {
  * and the start time (becomes message date/time).
  */
 void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
-               char *disp, void *content, char *cbtype, size_t length,
+               char *disp, void *content, char *cbtype, char *cbcharset, size_t length,
                char *encoding, void *cbuserdata)
 {
-       icalcomponent *cal, *nested_event, *nested_todo;
+       icalcomponent *cal, *nested_event, *nested_todo, *whole_cal;
        icalproperty *p;
        struct icalmessagemod *imm;
        char new_uid[SIZ];
 
        imm = (struct icalmessagemod *)cbuserdata;
 
-       /* If this is a text/calendar object, hunt for the UID and drop it in
+       /* We're only interested in calendar data. */
+       if (strcasecmp(cbtype, "text/calendar")) {
+               return;
+       }
+
+       /* Hunt for the UID and drop it in
         * the "user data" pointer for the MIME parser.  When
         * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
         * to that string.
         */
-       if (!strcasecmp(cbtype, "text/calendar")) {
-               cal = icalcomponent_new_from_string(content);
-               if (cal != NULL) {
-                       if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) {
-                               nested_event = icalcomponent_get_first_component(
-                                       cal, ICAL_VEVENT_COMPONENT
-                               );
+       whole_cal = icalcomponent_new_from_string(content);
+       cal = whole_cal;
+       if (cal != NULL) {
+               if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) {
+                       nested_event = icalcomponent_get_first_component(
+                               cal, ICAL_VEVENT_COMPONENT);
+                       if (nested_event != NULL) {
+                               cal = nested_event;
+                       }
+                       else {
                                nested_todo = icalcomponent_get_first_component(
-                                       cal, ICAL_VTODO_COMPONENT
-                               );
-                               if (nested_event != NULL) {
-                                       cal = nested_event;
-                               }
-                               else if (nested_todo != NULL) {
+                                       cal, ICAL_VTODO_COMPONENT);
+                               if (nested_todo != NULL) {
                                        cal = nested_todo;
                                }
                        }
                }
+               
                if (cal != NULL) {
                        p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
                        if (p == NULL) {
@@ -1707,7 +1891,6 @@ void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
                        }
                        if (p != NULL) {
                                strcpy(imm->uid, icalproperty_get_comment(p));
-                               /* strcpy(imm->subject, icalproperty_get_comment(p)); old aethera hack */
                        }
                        p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY);
                        if (p != NULL) {
@@ -1717,7 +1900,10 @@ void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
                        if (p != NULL) {
                                imm->dtstart = icaltime_as_timet(icalproperty_get_dtstart(p));
                        }
-                       icalcomponent_free(cal);
+               }
+               icalcomponent_free(cal);
+               if (whole_cal != cal) {
+                       icalcomponent_free(whole_cal);
                }
        }
 }
@@ -1725,7 +1911,6 @@ void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
 
 
 
-
 /*
  * See if we need to prevent the object from being saved (we don't allow
  * MIME types other than text/calendar in "calendar" or "tasks"  rooms).  Also,
@@ -1739,66 +1924,58 @@ void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
  */
 int ical_obj_beforesave(struct CtdlMessage *msg)
 {
-       char *p;
-       int a;
        struct icalmessagemod imm;
 
        /* First determine if this is a calendar or tasks room */
-       if ( (CC->curr_view != VIEW_CALENDAR)
-          &&(CC->curr_view != VIEW_TASKS) ) {
+       if (  (CC->room.QRdefaultview != VIEW_CALENDAR)
+          && (CC->room.QRdefaultview != VIEW_TASKS)
+       ) {
                return(0);              /* Not a vCalendar-centric room */
        }
 
        /* It must be an RFC822 message! */
        if (msg->cm_format_type != 4) {
-               return 1;       /* You tried to save a non-RFC822 message! */
+               lprintf(CTDL_DEBUG, "Rejecting non-RFC822 message\n");
+               return(1);              /* You tried to save a non-RFC822 message! */
+       }
+
+       if (msg->cm_fields['M'] == NULL) {
+               return(1);              /* You tried to save a null message! */
        }
+
+       memset(&imm, 0, sizeof(struct icalmessagemod));
        
-       /* Find the Content-Type: header */
-       p = msg->cm_fields['M'];
-       a = strlen(p);
-       while (--a > 0) {
-               if (!strncasecmp(p, "Content-Type: ", 14)) {    /* Found it */
-                       if (!strncasecmp(p + 14, "text/calendar", 13)) {
-                               memset(&imm, 0, sizeof(struct icalmessagemod));
-                               mime_parser(msg->cm_fields['M'],
-                                       NULL,
-                                       *ical_ctdl_set_exclusive_msgid,
-                                       NULL, NULL,
-                                       (void *)&imm,
-                                       0
-                               );
-                               if (strlen(imm.uid) > 0) {
-                                       if (msg->cm_fields['E'] != NULL) {
-                                               free(msg->cm_fields['E']);
-                                       }
-                                       msg->cm_fields['E'] = strdup(imm.uid);
-                               }
-                               if (strlen(imm.subject) > 0) {
-                                       if (msg->cm_fields['U'] != NULL) {
-                                               free(msg->cm_fields['U']);
-                                       }
-                                       msg->cm_fields['U'] = strdup(imm.subject);
-                               }
-                               if (imm.dtstart > 0) {
-                                       if (msg->cm_fields['T'] != NULL) {
-                                               free(msg->cm_fields['T']);
-                                       }
-                                       msg->cm_fields['T'] = strdup("000000000000000000");
-                                       sprintf(msg->cm_fields['T'], "%ld", imm.dtstart);
-                               }
-                               return 0;
-                       }
-                       else {
-                               return 1;
-                       }
+       /* Do all of our lovely back-end parsing */
+       mime_parser(msg->cm_fields['M'],
+               NULL,
+               *ical_ctdl_set_exclusive_msgid,
+               NULL, NULL,
+               (void *)&imm,
+               0
+       );
+
+       if (strlen(imm.uid) > 0) {
+               if (msg->cm_fields['E'] != NULL) {
+                       free(msg->cm_fields['E']);
                }
-               p++;
+               msg->cm_fields['E'] = strdup(imm.uid);
+               lprintf(CTDL_DEBUG, "Saving calendar UID <%s>\n", msg->cm_fields['E']);
        }
-       
-       /* Oops!  No Content-Type in this message!  How'd that happen? */
-       lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
-       return 1;
+       if (strlen(imm.subject) > 0) {
+               if (msg->cm_fields['U'] != NULL) {
+                       free(msg->cm_fields['U']);
+               }
+               msg->cm_fields['U'] = strdup(imm.subject);
+       }
+       if (imm.dtstart > 0) {
+               if (msg->cm_fields['T'] != NULL) {
+                       free(msg->cm_fields['T']);
+               }
+               msg->cm_fields['T'] = strdup("000000000000000000");
+               sprintf(msg->cm_fields['T'], "%ld", imm.dtstart);
+       }
+
+       return(0);
 }
 
 
@@ -1806,12 +1983,17 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
  * Things we need to do after saving a calendar event.
  */
 void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
-               char *disp, void *content, char *cbtype, size_t length,
+               char *disp, void *content, char *cbtype, char *cbcharset, size_t length,
                char *encoding, void *cbuserdata)
 {
        icalcomponent *cal;
 
-       /* If this is a text/calendar object, hunt for the UID and drop it in
+       /* We're only interested in calendar items here. */
+       if (strcasecmp(cbtype, "text/calendar")) {
+               return;
+       }
+
+       /* Hunt for the UID and drop it in
         * the "user data" pointer for the MIME parser.  When
         * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
         * to that string.
@@ -1828,12 +2010,12 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
 
 /* 
  * Things we need to do after saving a calendar event.
+ * (This will start back end tasks such as automatic generation of invitations,
+ * if such actions are appropriate.)
  */
 int ical_obj_aftersave(struct CtdlMessage *msg)
 {
        char roomname[ROOMNAMELEN];
-       char *p;
-       int a;
 
        /*
         * If this isn't the Calendar> room, no further action is necessary.
@@ -1842,40 +2024,25 @@ int ical_obj_aftersave(struct CtdlMessage *msg)
        /* First determine if this is our room */
        MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
        if (strcasecmp(roomname, CC->room.QRname)) {
-               return 0;       /* It's not the Calendar room. */
+               return(0);      /* Not the Calendar room -- don't do anything. */
        }
 
-       /* Then determine content-type of the message */
-       
        /* It must be an RFC822 message! */
-       /* FIXME: Not handling MIME multipart messages; implement with IMIP */
        if (msg->cm_format_type != 4) return(1);
+
+       /* Reject null messages */
+       if (msg->cm_fields['M'] == NULL) return(1);
        
-       /* Find the Content-Type: header */
-       p = msg->cm_fields['M'];
-       a = strlen(p);
-       while (--a > 0) {
-               if (!strncasecmp(p, "Content-Type: ", 14)) {    /* Found it */
-                       if (!strncasecmp(p + 14, "text/calendar", 13)) {
-                               mime_parser(msg->cm_fields['M'],
-                                       NULL,
-                                       *ical_obj_aftersave_backend,
-                                       NULL, NULL,
-                                       NULL,
-                                       0
-                               );
-                               return 0;
-                       }
-                       else {
-                               return 1;
-                       }
-               }
-               p++;
-       }
-       
-       /* Oops!  No Content-Type in this message!  How'd that happen? */
-       lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
-       return 1;
+       /* Now recurse through it looking for our icalendar data */
+       mime_parser(msg->cm_fields['M'],
+               NULL,
+               *ical_obj_aftersave_backend,
+               NULL, NULL,
+               NULL,
+               0
+       );
+
+       return(0);
 }
 
 
@@ -1889,6 +2056,81 @@ void ical_session_shutdown(void) {
 }
 
 
+/*
+ * Back end for ical_fixed_output()
+ */
+void ical_fixed_output_backend(icalcomponent *cal,
+                       int recursion_level
+) {
+       icalcomponent *c;
+       icalproperty *p;
+       char buf[256];
+
+       p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY);
+       if (p != NULL) {
+               cprintf("%s\n", (const char *)icalproperty_get_comment(p));
+       }
+
+       p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY);
+       if (p != NULL) {
+               cprintf("%s\n", (const char *)icalproperty_get_comment(p));
+       }
+
+       p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY);
+       if (p != NULL) {
+               cprintf("%s\n", (const char *)icalproperty_get_comment(p));
+       }
+
+       /* 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)) {
+               safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
+               if (!strncasecmp(buf, "MAILTO:", 7)) {
+
+                       /* screen name or email address */
+                       strcpy(buf, &buf[7]);
+                       striplt(buf);
+                       cprintf("%s ", buf);
+               }
+               cprintf("\n");
+       }
+
+       /* 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)) {
+               /* Recursively process subcomponent */
+               ical_fixed_output_backend(c, recursion_level+1);
+       }
+}
+
+
+
+/*
+ * Function to output vcalendar data as plain text.  Nobody uses MSG0
+ * anymore, so really this is just so we expose the vCard data to the full
+ * text indexer.
+ */
+void ical_fixed_output(char *ptr, int len) {
+       icalcomponent *cal;
+       char *stringy_cal;
+
+       stringy_cal = malloc(len + 1);
+       safestrncpy(stringy_cal, ptr, len + 1);
+       cal = icalcomponent_new_from_string(stringy_cal);
+       free(stringy_cal);
+
+       if (cal == NULL) {
+               return;
+       }
+
+       ical_dezonify(cal);
+       ical_fixed_output_backend(cal, 0);
+
+       /* Free the memory we obtained from libical's constructor */
+       icalcomponent_free(cal);
+}
+
+
 #endif /* CITADEL_WITH_CALENDAR_SERVICE */
 
 /*
@@ -1903,6 +2145,16 @@ char *serv_calendar_init(void)
        CtdlRegisterProtoHook(cmd_ical, "ICAL", "Citadel iCal commands");
        CtdlRegisterSessionHook(ical_session_startup, EVT_START);
        CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP);
+       CtdlRegisterFixedOutputHook("text/calendar", ical_fixed_output);
 #endif
        return "$Id$";
 }
+
+
+
+void serv_calendar_destroy(void)
+{
+#ifdef CITADEL_WITH_CALENDAR_SERVICE
+       icaltimezone_free_builtin_timezones();
+#endif
+}