X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_calendar.c;h=a36926c3072215f47e8fbe780352c0abcd8ebf55;hb=d27e5ce95bd12d9c25a4e596655212253d50c5c9;hp=b27fc824cf3f839b4b32d09a20bd3ae1fa60b797;hpb=baeaba80baacf3d95581d0342cd21a3a526dcef2;p=citadel.git diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c index b27fc824c..a36926c30 100644 --- a/citadel/serv_calendar.c +++ b/citadel/serv_calendar.c @@ -2,7 +2,7 @@ * $Id$ * * This module implements iCalendar object processing and the Calendar> - * room on a Citadel/UX server. It handles iCalendar objects using the + * room on a Citadel server. It handles iCalendar objects using the * iTIP protocol. See RFCs 2445 and 2446. * */ @@ -10,6 +10,7 @@ #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" #include "sysdep.h" +#include #include #include #include @@ -30,7 +31,9 @@ #include "tools.h" #include "msgbase.h" #include "mime_parser.h" +#include "internet_addressing.h" #include "serv_calendar.h" +#include "euidindex.h" #ifdef CITADEL_WITH_CALENDAR_SERVICE @@ -42,9 +45,6 @@ struct ical_respond_data { icalcomponent *cal; }; -/* Session-local data for calendaring. */ -long SYM_CIT_ICAL; - /* * Utility function to create a new VCALENDAR component with some of the @@ -53,9 +53,9 @@ long SYM_CIT_ICAL; icalcomponent *icalcomponent_new_citadel_vcalendar(void) { icalcomponent *encaps; - encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT); + encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { - lprintf(3, "Error at %s:%d - could not allocate component!\n", + lprintf(CTDL_CRIT, "Error at %s:%d - could not allocate component!\n", __FILE__, __LINE__); return NULL; } @@ -65,6 +65,8 @@ icalcomponent *icalcomponent_new_citadel_vcalendar(void) { /* Set the Version Number */ icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); + + return(encaps); } @@ -102,10 +104,8 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { /* * Write a calendar object into the specified user's calendar room. - * - * ok */ -void ical_write_to_cal(struct usersupp *u, icalcomponent *cal) { +void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { char temp[PATH_MAX]; FILE *fp; char *ser; @@ -125,7 +125,7 @@ void ical_write_to_cal(struct usersupp *u, icalcomponent *cal) { return; } - strcpy(temp, tmpnam(NULL)); + CtdlMakeTempFileName(temp, sizeof temp); ser = icalcomponent_as_ical_string(cal); if (ser == NULL) return; @@ -162,7 +162,7 @@ void ical_add(icalcomponent *cal, int recursion_level) { */ if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) { - ical_write_to_cal(&CC->usersupp, cal); + ical_write_to_cal(&CC->user, cal); } @@ -182,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; @@ -210,13 +206,13 @@ void ical_send_a_reply(icalcomponent *request, char *action) { strcpy(summary_string, "Calendar item"); if (request == NULL) { - lprintf(3, "ERROR: trying to reply to NULL event?\n"); + lprintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n"); return; } the_reply = icalcomponent_new_clone(request); if (the_reply == NULL) { - lprintf(3, "ERROR: cannot clone request\n"); + lprintf(CTDL_ERR, "ERROR: cannot clone request\n"); return; } @@ -240,11 +236,11 @@ void ical_send_a_reply(icalcomponent *request, char *action) { striplt(attendee_string); recp = validate_recipients(attendee_string); if (recp != NULL) { - if (!strcasecmp(recp->recp_local, CC->usersupp.fullname)) { + if (!strcasecmp(recp->recp_local, CC->user.fullname)) { if (me_attend) icalproperty_free(me_attend); me_attend = icalproperty_new_clone(attendee); } - phree(recp); + free(recp); } } } @@ -299,25 +295,28 @@ void ical_send_a_reply(icalcomponent *request, char *action) { icalproperty_get_summary(summary) ); } } - } /* Now generate the reply message and send it out. */ - serialized_reply = strdoop(icalcomponent_as_ical_string(the_reply)); + serialized_reply = strdup(icalcomponent_as_ical_string(the_reply)); icalcomponent_free(the_reply); /* don't need this anymore */ if (serialized_reply == NULL) return; - reply_message_text = mallok(strlen(serialized_reply) + SIZ); + 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->usersupp, organizer_string, - CC->quickroom.QRname, 0, FMT_RFC822, + 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) { @@ -326,7 +325,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) { CtdlFreeMessage(msg); } } - phree(serialized_reply); + free(serialized_reply); } @@ -336,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; @@ -373,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 ( @@ -386,10 +385,10 @@ void ical_respond(long msgnum, char *partnum, char *action) { return; } - msg = CtdlFetchMessage(msgnum); + msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { cprintf("%d Message %ld not found.\n", - ERROR+ILLEGAL_VALUE, + ERROR + ILLEGAL_VALUE, (long)msgnum ); return; @@ -427,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->quickroom.QRname, msgnum, ""); + CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, ""); /* Free the memory we allocated and return a response. */ icalcomponent_free(ird.cal); @@ -436,7 +435,7 @@ void ical_respond(long msgnum, char *partnum, char *action) { return; } else { - cprintf("%d No calendar object found\n", ERROR); + cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); return; } @@ -494,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; @@ -566,15 +565,10 @@ STARTOVER: * reply's copy will have the same address, but an updated * status.) */ - TRACE; icalcomponent_remove_property(event, e_attendee); - TRACE; icalproperty_free(e_attendee); - TRACE; icalcomponent_remove_property(reply, r_attendee); - TRACE; icalcomponent_add_property(event, r_attendee); - TRACE; /* Since we diddled both sets of attendees, we have to start * the iteration over again. This will not create an infinite @@ -608,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; @@ -619,32 +612,27 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { /* Figure out just what event it is we're dealing with */ strcpy(uid, "--==<< InVaLiD uId >>==--"); ical_learn_uid_of_reply(uid, cal); - lprintf(9, "UID of event being replied to is <%s>\n", uid); + lprintf(CTDL_DEBUG, "UID of event being replied to is <%s>\n", uid); - strcpy(hold_rm, CC->quickroom.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) { - getroom(&CC->quickroom, hold_rm); - lprintf(3, "cannot get user calendar room\n"); + if (getroom(&CC->room, USERCALENDARROOM) != 0) { + getroom(&CC->room, hold_rm); + lprintf(CTDL_CRIT, "cannot get user calendar room\n"); return(2); } /* - * 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 *) - mallok(sizeof(struct CtdlMessage)); - memset(template, 0, sizeof(struct CtdlMessage)); - template->cm_fields['E'] = strdoop(uid); - CtdlForEachMessage(MSGS_ALL, 0, "text/calendar", - template, ical_hunt_for_event_to_update, &msgnum_being_replaced); - CtdlFreeMessage(template); - getroom(&CC->quickroom, hold_rm); /* return to saved room */ - - lprintf(9, "msgnum_being_replaced == %ld\n", msgnum_being_replaced); + 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); if (msgnum_being_replaced == 0) { return(1); /* no calendar event found */ } @@ -655,7 +643,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { * us the ability to load the event into memory so we can diddle the * attendees. */ - msg = CtdlFetchMessage(msgnum_being_replaced); + msg = CtdlFetchMessage(msgnum_being_replaced, 1); if (msg == NULL) { return(2); /* internal error */ } @@ -671,7 +659,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { original_event = oec.c; if (original_event == NULL) { - lprintf(3, "ERROR: Original_component is NULL.\n"); + lprintf(CTDL_ERR, "ERROR: Original_component is NULL.\n"); return(2); } @@ -679,25 +667,28 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { ical_merge_attendee_reply(original_event, cal); /* Serialize it */ - serialized_event = strdoop(icalcomponent_as_ical_string(original_event)); + serialized_event = strdup(icalcomponent_as_ical_string(original_event)); icalcomponent_free(original_event); /* Don't need this anymore. */ if (serialized_event == NULL) return(2); - MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM); + MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); - message_text = mallok(strlen(serialized_event) + SIZ); + 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->usersupp, + msg = CtdlMakeMessage(&CC->user, + "", /* No recipient */ "", /* No recipient */ roomname, 0, FMT_RFC822, "", + "", "", /* no subject */ + NULL, message_text); if (msg != NULL) { @@ -707,7 +698,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { CIT_ICAL->avoid_sending_invitations = 0; } } - phree(serialized_event); + free(serialized_event); return(0); } @@ -718,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; @@ -732,10 +723,10 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) { return; } - msg = CtdlFetchMessage(msgnum); + msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { cprintf("%d Message %ld not found.\n", - ERROR+ILLEGAL_VALUE, + ERROR + ILLEGAL_VALUE, (long)msgnum ); return; @@ -781,9 +772,9 @@ 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. FIXME uncomment this when ready! + * anymore. So delete it. (Maybe make this optional?) */ - CtdlDeleteMessages(CC->quickroom.QRname, msgnum, ""); + CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, ""); /* Free the memory we allocated and return a response. */ icalcomponent_free(ird.cal); @@ -791,7 +782,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) { return; } else { - cprintf("%d No calendar object found\n", ERROR); + cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); return; } @@ -823,6 +814,8 @@ icalproperty *ical_ctdl_get_subprop( /* * Check to see if two events overlap. Returns nonzero if they do. + * (This function is used in both Citadel and WebCit. If you change it in + * one place, change it in the other. Better yet, put it in a library.) */ int ical_ctdl_is_overlap( struct icaltimetype t1start, @@ -880,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; @@ -893,7 +886,7 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *data) { strcpy(conflict_event_uid, ""); strcpy(conflict_event_summary, ""); - msg = CtdlFetchMessage(msgnum); + msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) return; memset(&ird, 0, sizeof ird); strcpy(ird.desired_partnum, "_HUNT_"); @@ -970,24 +963,25 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *data) { void ical_hunt_for_conflicts(icalcomponent *cal) { char hold_rm[ROOMNAMELEN]; - strcpy(hold_rm, CC->quickroom.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) { - getroom(&CC->quickroom, hold_rm); - cprintf("%d You do not have a calendar.\n", ERROR); + if (getroom(&CC->room, USERCALENDARROOM) != 0) { + getroom(&CC->room, hold_rm); + cprintf("%d You do not have a calendar.\n", ERROR + ROOM_NOT_FOUND); return; } 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 ); cprintf("000\n"); - getroom(&CC->quickroom, hold_rm); /* return to saved room */ + getroom(&CC->room, hold_rm); /* return to saved room */ } @@ -997,13 +991,13 @@ 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); + msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { cprintf("%d Message %ld not found.\n", - ERROR+ILLEGAL_VALUE, + ERROR + ILLEGAL_VALUE, (long)msgnum ); return; @@ -1027,7 +1021,7 @@ void ical_conflicts(long msgnum, char *partnum) { return; } else { - cprintf("%d No calendar object found\n", ERROR); + cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); return; } @@ -1037,18 +1031,18 @@ void ical_conflicts(long msgnum, char *partnum) { /* - * Remove all properties from a VEVENT that are not supplying the - * bare minimum for free/busy data. + * Look for busy time in a VEVENT and add it to the supplied VFREEBUSY. */ -void ical_freebusy_strip(icalcomponent *cal) { - +void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) { icalproperty *p; - int did_something = 1; + icalvalue *v; + struct icalperiodtype my_period; if (cal == NULL) return; + my_period = icalperiodtype_null_period(); if (icalcomponent_isa(cal) != ICAL_VEVENT_COMPONENT) { - ical_freebusy_strip( + ical_add_to_freebusy(fb, icalcomponent_get_first_component( cal, ICAL_VEVENT_COMPONENT ) @@ -1058,31 +1052,68 @@ void ical_freebusy_strip(icalcomponent *cal) { ical_dezonify(cal); - while (did_something) { - did_something = 0; - for ( p=icalcomponent_get_first_property - (cal, ICAL_ANY_PROPERTY); - p != NULL; - p = icalcomponent_get_next_property - (cal, ICAL_ANY_PROPERTY) - ) { - - if ( - (icalproperty_isa(p)==ICAL_DTSTART_PROPERTY) - || (icalproperty_isa(p)==ICAL_DTEND_PROPERTY) - || (icalproperty_isa(p)==ICAL_DURATION_PROPERTY) - || (icalproperty_isa(p)==ICAL_FREEBUSY_PROPERTY) - || (icalproperty_isa(p)==ICAL_TRANSP_PROPERTY) - ) { - /* keep it */ - } - else { - /* delete it */ - icalcomponent_remove_property(cal, p); - icalproperty_free(p); - did_something = 1; + /* If this event is not opaque, the user isn't publishing it as + * busy time, so don't bother doing anything else. + */ + p = icalcomponent_get_first_property(cal, ICAL_TRANSP_PROPERTY); + if (p != NULL) { + v = icalproperty_get_value(p); + if (v != NULL) { + if (icalvalue_get_transp(v) != ICAL_TRANSP_OPAQUE) { + return; } + } + } + /* Convert the DTSTART and DTEND properties to an icalperiod. */ + p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY); + if (p != NULL) { + my_period.start = icalproperty_get_dtstart(p); + } + + p = icalcomponent_get_first_property(cal, ICAL_DTEND_PROPERTY); + if (p != NULL) { + my_period.end = icalproperty_get_dtstart(p); + } + + /* Now add it. */ + icalcomponent_add_property(fb, + icalproperty_new_freebusy(my_period) + ); + + /* Make sure the DTSTART property of the freebusy *list* is set to + * the DTSTART property of the *earliest event*. + */ + p = icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY); + if (p == NULL) { + icalcomponent_set_dtstart(fb, + icalcomponent_get_dtstart(cal) ); + } + else { + if (icaltime_compare( + icalcomponent_get_dtstart(cal), + icalcomponent_get_dtstart(fb) + ) < 0) { + icalcomponent_set_dtstart(fb, + icalcomponent_get_dtstart(cal) ); + } + } + + /* Make sure the DTEND property of the freebusy *list* is set to + * the DTEND property of the *latest event*. + */ + p = icalcomponent_get_first_property(fb, ICAL_DTEND_PROPERTY); + if (p == NULL) { + icalcomponent_set_dtend(fb, + icalcomponent_get_dtend(cal) ); + } + else { + if (icaltime_compare( + icalcomponent_get_dtend(cal), + icalcomponent_get_dtend(fb) + ) > 0) { + icalcomponent_set_dtend(fb, + icalcomponent_get_dtend(cal) ); } } @@ -1100,12 +1131,12 @@ void ical_freebusy_strip(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; - msg = CtdlFetchMessage(msgnum); + msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) return; memset(&ird, 0, sizeof ird); strcpy(ird.desired_partnum, "_HUNT_"); @@ -1120,7 +1151,7 @@ void ical_freebusy_backend(long msgnum, void *data) { if (ird.cal == NULL) return; - /* FIXME ... now extract ird.cal's FREEBUSY info, and add to cal. */ + ical_add_to_freebusy(cal, ird.cal); /* Now free the memory. */ icalcomponent_free(ird.cal); @@ -1132,14 +1163,77 @@ void ical_freebusy_backend(long msgnum, void *data) { * Grab another user's free/busy times */ void ical_freebusy(char *who) { - struct usersupp usbuf; + struct ctdluser usbuf; char calendar_room_name[ROOMNAMELEN]; char hold_rm[ROOMNAMELEN]; char *serialized_request = NULL; icalcomponent *encaps = NULL; icalcomponent *fb = NULL; + int found_user = (-1); + struct recptypes *recp = NULL; + char buf[256]; + char host[256]; + char type[256]; + int i = 0; + int config_lines = 0; + + /* First try an exact match. */ + found_user = getuser(&usbuf, who); + + /* If not found, try it as an unqualified email address. */ + if (found_user != 0) { + strcpy(buf, who); + recp = validate_recipients(buf); + lprintf(CTDL_DEBUG, "Trying <%s>\n", buf); + if (recp != NULL) { + if (recp->num_local == 1) { + found_user = getuser(&usbuf, recp->recp_local); + } + free(recp); + } + } + + /* If still not found, try it as an address qualified with the + * primary FQDN of this Citadel node. + */ + if (found_user != 0) { + snprintf(buf, sizeof buf, "%s@%s", who, config.c_fqdn); + lprintf(CTDL_DEBUG, "Trying <%s>\n", buf); + recp = validate_recipients(buf); + if (recp != NULL) { + if (recp->num_local == 1) { + found_user = getuser(&usbuf, recp->recp_local); + } + free(recp); + } + } + + /* Still not found? Try qualifying it with every domain we + * might have addresses in. + */ + if (found_user != 0) { + config_lines = num_tokens(inetcfg, '\n'); + for (i=0; ((i < config_lines) && (found_user != 0)); ++i) { + extract_token(buf, inetcfg, i, '\n', sizeof buf); + extract_token(host, buf, 0, '|', sizeof host); + extract_token(type, buf, 1, '|', sizeof type); + + if ( (!strcasecmp(type, "localhost")) + || (!strcasecmp(type, "directory")) ) { + snprintf(buf, sizeof buf, "%s@%s", who, host); + lprintf(CTDL_DEBUG, "Trying <%s>\n", buf); + recp = validate_recipients(buf); + if (recp != NULL) { + if (recp->num_local == 1) { + found_user = getuser(&usbuf, recp->recp_local); + } + free(recp); + } + } + } + } - if (getuser(&usbuf, who) != 0) { + if (found_user != 0) { cprintf("%d No such user.\n", ERROR + NO_SUCH_USER); return; } @@ -1147,58 +1241,257 @@ void ical_freebusy(char *who) { MailboxName(calendar_room_name, sizeof calendar_room_name, &usbuf, USERCALENDARROOM); - strcpy(hold_rm, CC->quickroom.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) { - cprintf("%d Cannot open calendar\n", ERROR+ROOM_NOT_FOUND); - getroom(&CC->quickroom, hold_rm); - return; - } - - - /* Create a VCALENDAR in which we will encapsulate all the VFREEBUSYs */ - encaps = icalcomponent_new_citadel_vcalendar(); - if (encaps == NULL) { - cprintf("%d Internal error: cannot allocate memory.\n", - ERROR+INTERNAL_ERROR); - getroom(&CC->quickroom, hold_rm); + if (getroom(&CC->room, calendar_room_name) != 0) { + cprintf("%d Cannot open calendar\n", ERROR + ROOM_NOT_FOUND); + getroom(&CC->room, hold_rm); return; } /* Create a VFREEBUSY subcomponent */ - fb = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT); + lprintf(CTDL_DEBUG, "Creating VFREEBUSY component\n"); + fb = icalcomponent_new_vfreebusy(); if (fb == NULL) { cprintf("%d Internal error: cannot allocate memory.\n", - ERROR+INTERNAL_ERROR); + ERROR + INTERNAL_ERROR); icalcomponent_free(encaps); - getroom(&CC->quickroom, hold_rm); + getroom(&CC->room, hold_rm); return; } + /* Set the method to PUBLISH */ + icalcomponent_set_method(fb, ICAL_METHOD_PUBLISH); + + /* Set the DTSTAMP to right now. */ + icalcomponent_set_dtstamp(fb, icaltime_from_timet(time(NULL), 0)); + + /* Add the user's email address as ORGANIZER */ + sprintf(buf, "MAILTO:%s", who); + if (strchr(buf, '@') == NULL) { + strcat(buf, "@"); + strcat(buf, config.c_fqdn); + } + for (i=0; iroom, hold_rm); + return; + } - CtdlForEachMessage(MSGS_ALL, 0, "text/calendar", - NULL, ical_freebusy_backend, (void *)fb - ); + /* Set the method to PUBLISH */ + lprintf(CTDL_DEBUG, "Setting method\n"); + icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH); /* Serialize it */ - serialized_request = strdoop(icalcomponent_as_ical_string(encaps)); + lprintf(CTDL_DEBUG, "Serializing\n"); + serialized_request = strdup(icalcomponent_as_ical_string(encaps)); icalcomponent_free(encaps); /* Don't need this anymore. */ cprintf("%d Here is the free/busy data:\n", LISTING_FOLLOWS); if (serialized_request != NULL) { client_write(serialized_request, strlen(serialized_request)); + free(serialized_request); } cprintf("\n000\n"); /* Go back to the room from which we came... */ - getroom(&CC->quickroom, hold_rm); + getroom(&CC->room, hold_rm); +} + + + +/* + * 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. */ - cprintf("%d not implemented yet\n", ERROR); } +/* + * 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); +} /* @@ -1206,52 +1499,71 @@ void ical_freebusy(char *who) { */ void cmd_ical(char *argbuf) { - char subcmd[SIZ]; + char subcmd[64]; long msgnum; - char partnum[SIZ]; - char action[SIZ]; - char who[SIZ]; + char partnum[256]; + char action[256]; + char who[256]; - if (CtdlAccessCheck(ac_logged_in)) return; + extract_token(subcmd, argbuf, 0, '|', sizeof subcmd); - extract(subcmd, argbuf, 0); + /* Allow "test" and "freebusy" subcommands without logging in. */ - if (!strcmp(subcmd, "test")) { + if (!strcasecmp(subcmd, "test")) { cprintf("%d This server supports calendaring\n", CIT_OK); return; } - else if (!strcmp(subcmd, "respond")) { + if (!strcasecmp(subcmd, "freebusy")) { + extract_token(who, argbuf, 1, '|', sizeof who); + ical_freebusy(who); + return; + } + + if (!strcasecmp(subcmd, "sgi")) { + CIT_ICAL->server_generated_invitations = + (extract_int(argbuf, 1) ? 1 : 0) ; + cprintf("%d %d\n", + CIT_OK, CIT_ICAL->server_generated_invitations); + return; + } + + if (CtdlAccessCheck(ac_logged_in)) return; + + if (!strcasecmp(subcmd, "respond")) { msgnum = extract_long(argbuf, 1); - extract(partnum, argbuf, 2); - extract(action, argbuf, 3); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); + extract_token(action, argbuf, 3, '|', sizeof action); ical_respond(msgnum, partnum, action); + return; } - else if (!strcmp(subcmd, "handle_rsvp")) { + if (!strcasecmp(subcmd, "handle_rsvp")) { msgnum = extract_long(argbuf, 1); - extract(partnum, argbuf, 2); - extract(action, argbuf, 3); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); + extract_token(action, argbuf, 3, '|', sizeof action); ical_handle_rsvp(msgnum, partnum, action); + return; } - else if (!strcmp(subcmd, "conflicts")) { + if (!strcasecmp(subcmd, "conflicts")) { msgnum = extract_long(argbuf, 1); - extract(partnum, argbuf, 2); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); ical_conflicts(msgnum, partnum); + return; } - else if (!strcmp(subcmd, "freebusy")) { - extract(who, argbuf, 1); - ical_freebusy(who); + if (!strcasecmp(subcmd, "getics")) { + ical_getics(); + return; } - else { - cprintf("%d Invalid subcommand\n", ERROR+CMD_NOT_SUPPORTED); + if (!strcasecmp(subcmd, "putics")) { + ical_putics(); return; } - /* should never get here */ + cprintf("%d Invalid subcommand\n", ERROR + CMD_NOT_SUPPORTED); } @@ -1261,42 +1573,59 @@ void cmd_ical(char *argbuf) */ void ical_create_room(void) { - struct quickroom qr; + struct ctdlroom qr; struct visit vbuf; /* Create the calendar room if it doesn't already exist */ - create_room(USERCALENDARROOM, 4, "", 0, 1, 0); + create_room(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR); /* Set expiration policy to manual; otherwise objects will be lost! */ if (lgetroom(&qr, USERCALENDARROOM)) { - lprintf(3, "Couldn't get the user calendar room!\n"); + lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; - qr.QRdefaultview = 3; /* 3 = calendar view */ + qr.QRdefaultview = VIEW_CALENDAR; /* 3 = calendar view */ lputroom(&qr); /* Set the view to a calendar view */ - CtdlGetRelationship(&vbuf, &CC->usersupp, &qr); - vbuf.v_view = 3; /* 3 = calendar */ - CtdlSetRelationship(&vbuf, &CC->usersupp, &qr); + CtdlGetRelationship(&vbuf, &CC->user, &qr); + vbuf.v_view = VIEW_CALENDAR; + CtdlSetRelationship(&vbuf, &CC->user, &qr); /* Create the tasks list room if it doesn't already exist */ - create_room(USERTASKSROOM, 4, "", 0, 1, 0); + create_room(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS); /* Set expiration policy to manual; otherwise objects will be lost! */ if (lgetroom(&qr, USERTASKSROOM)) { - lprintf(3, "Couldn't get the user calendar room!\n"); + lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; - qr.QRdefaultview = 4; /* 4 = tasks view */ + qr.QRdefaultview = VIEW_TASKS; lputroom(&qr); /* Set the view to a task list view */ - CtdlGetRelationship(&vbuf, &CC->usersupp, &qr); - vbuf.v_view = 4; /* 4 = tasks */ - CtdlSetRelationship(&vbuf, &CC->usersupp, &qr); + CtdlGetRelationship(&vbuf, &CC->user, &qr); + vbuf.v_view = VIEW_TASKS; + CtdlSetRelationship(&vbuf, &CC->user, &qr); + + /* Create the notes room if it doesn't already exist */ + create_room(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES); + + /* Set expiration policy to manual; otherwise objects will be lost! */ + if (lgetroom(&qr, USERNOTESROOM)) { + lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); + return; + } + qr.QRep.expire_mode = EXPIRE_MANUAL; + qr.QRdefaultview = VIEW_NOTES; + lputroom(&qr); + + /* Set the view to a notes view */ + CtdlGetRelationship(&vbuf, &CC->user, &qr); + vbuf.v_view = VIEW_NOTES; + CtdlSetRelationship(&vbuf, &CC->user, &qr); return; } @@ -1315,13 +1644,13 @@ void ical_send_out_invitations(icalcomponent *cal) { struct recptypes *valid = NULL; char attendees_string[SIZ]; int num_attendees = 0; - char this_attendee[SIZ]; + char this_attendee[256]; icalproperty *attendee = NULL; char summary_string[SIZ]; icalproperty *summary = NULL; if (cal == NULL) { - lprintf(3, "ERROR: trying to reply to NULL event?\n"); + lprintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n"); return; } @@ -1339,7 +1668,7 @@ void ical_send_out_invitations(icalcomponent *cal) { /* Clone the event */ the_request = icalcomponent_new_clone(cal); if (the_request == NULL) { - lprintf(3, "ERROR: cannot clone calendar object\n"); + lprintf(CTDL_ERR, "ERROR: cannot clone calendar object\n"); return; } @@ -1359,20 +1688,23 @@ void ical_send_out_invitations(icalcomponent *cal) { strcpy(attendees_string, ""); for (attendee = icalcomponent_get_first_property(the_request, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(the_request, ICAL_ATTENDEE_PROPERTY)) { if (icalproperty_get_attendee(attendee)) { - strcpy(this_attendee, icalproperty_get_attendee(attendee) ); + safestrncpy(this_attendee, icalproperty_get_attendee(attendee), sizeof this_attendee); if (!strncasecmp(this_attendee, "MAILTO:", 7)) { strcpy(this_attendee, &this_attendee[7]); - snprintf(&attendees_string[strlen(attendees_string)], - sizeof(attendees_string) - strlen(attendees_string), - "%s, ", - this_attendee - ); - ++num_attendees; + + if (!CtdlIsMe(this_attendee, sizeof this_attendee)) { /* don't send an invitation to myself! */ + snprintf(&attendees_string[strlen(attendees_string)], + sizeof(attendees_string) - strlen(attendees_string), + "%s, ", + this_attendee + ); + ++num_attendees; + } } } } - lprintf(9, "<%d> attendees: <%s>\n", num_attendees, attendees_string); + lprintf(CTDL_DEBUG, "<%d> attendees: <%s>\n", num_attendees, attendees_string); /* If there are no attendees, there are no invitations to send, so... * don't bother putting one together! Punch out, Maverick! @@ -1383,9 +1715,9 @@ void ical_send_out_invitations(icalcomponent *cal) { } /* Encapsulate the VEVENT component into a complete VCALENDAR */ - encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT); + encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { - lprintf(3, "Error at %s:%d - could not allocate component!\n", + lprintf(CTDL_DEBUG, "Error at %s:%d - could not allocate component!\n", __FILE__, __LINE__); icalcomponent_free(the_request); return; @@ -1410,31 +1742,35 @@ void ical_send_out_invitations(icalcomponent *cal) { icalcomponent_add_component(encaps, the_request); /* Serialize it */ - serialized_request = strdoop(icalcomponent_as_ical_string(encaps)); + serialized_request = strdup(icalcomponent_as_ical_string(encaps)); icalcomponent_free(encaps); /* Don't need this anymore. */ if (serialized_request == NULL) return; - request_message_text = mallok(strlen(serialized_request) + SIZ); + request_message_text = malloc(strlen(serialized_request) + SIZ); if (request_message_text != NULL) { sprintf(request_message_text, "Content-type: text/calendar\r\n\r\n%s\r\n", serialized_request ); - msg = CtdlMakeMessage(&CC->usersupp, + msg = CtdlMakeMessage(&CC->user, "", /* No single recipient here */ - CC->quickroom.QRname, 0, FMT_RFC822, + "", /* 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); } } - phree(serialized_request); + free(serialized_request); } @@ -1449,9 +1785,14 @@ 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; + } + /* Don't send out invitations if we've been asked not to. */ - lprintf(9, "CIT_ICAL->avoid_sending_invitations = %d\n", - CIT_ICAL->avoid_sending_invitations); if (CIT_ICAL->avoid_sending_invitations > 0) { return; } @@ -1477,7 +1818,7 @@ void ical_saving_vevent(icalcomponent *cal) { * If the user saving the event is listed as the * organizer, then send out invitations. */ - if (CtdlIsMe(organizer_string)) { + if (CtdlIsMe(organizer_string, sizeof organizer_string)) { ical_send_out_invitations(cal); } } @@ -1501,45 +1842,68 @@ void ical_saving_vevent(icalcomponent *cal) { * the summary of the event (becomes message subject), * and the start time (becomes message date/time). */ -void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum, - char *disp, void *content, char *cbtype, size_t length, +void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum, + char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, void *cbuserdata) { - icalcomponent *cal; + 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 Extended msgid + * 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) { - cal = 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_todo != NULL) { + cal = nested_todo; + } } } + if (cal != NULL) { p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY); + if (p == NULL) { + /* If there's no uid we must generate one */ + generate_uuid(new_uid); + icalcomponent_add_property(cal, icalproperty_new_uid(new_uid)); + p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY); + } if (p != NULL) { strcpy(imm->uid, icalproperty_get_comment(p)); } p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY); if (p != NULL) { - strcpy(imm->subject, - icalproperty_get_comment(p)); + strcpy(imm->subject, icalproperty_get_comment(p)); } p = ical_ctdl_get_subprop(cal, ICAL_DTSTART_PROPERTY); 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); } } } @@ -1547,12 +1911,11 @@ void ical_ctdl_set_extended_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 the Calendar> room). Also, when - * saving an event to the calendar, set the message's Citadel extended message - * ID to the UID of the object. This causes our replication checker to + * MIME types other than text/calendar in "calendar" or "tasks" rooms). Also, + * when saving an event to the calendar, set the message's Citadel exclusive + * message ID to the UID of the object. This causes our replication checker to * automatically delete any existing instances of the same object. (Isn't * that cool?) * @@ -1561,76 +1924,58 @@ void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum, */ int ical_obj_beforesave(struct CtdlMessage *msg) { - char roomname[ROOMNAMELEN]; - char *p; - int a; struct icalmessagemod imm; - /* - * Only messages with content-type text/calendar - * may be saved to Calendar>. If the message is bound for - * Calendar> but doesn't have this content-type, throw an error - * so that the message may not be posted. - */ - - /* First determine if this is our room */ - MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM); - if (strcasecmp(roomname, CC->quickroom.QRname)) { - return 0; /* It's not the Calendar room. */ + /* First determine if this is a calendar or tasks room */ + if ( (CC->room.QRdefaultview != VIEW_CALENDAR) + && (CC->room.QRdefaultview != VIEW_TASKS) + ) { + return(0); /* Not a vCalendar-centric room */ } - /* 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; /* You tried to save a non-RFC822 message! */ + if (msg->cm_format_type != 4) { + 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_extended_msgid, - NULL, NULL, - (void *)&imm, - 0 - ); - if (strlen(imm.uid) > 0) { - if (msg->cm_fields['E'] != NULL) { - phree(msg->cm_fields['E']); - } - msg->cm_fields['E'] = strdoop(imm.uid); - } - if (strlen(imm.subject) > 0) { - if (msg->cm_fields['U'] != NULL) { - phree(msg->cm_fields['U']); - } - msg->cm_fields['U'] = strdoop(imm.subject); - } - if (imm.dtstart > 0) { - if (msg->cm_fields['T'] != NULL) { - phree(msg->cm_fields['T']); - } - msg->cm_fields['T'] = strdoop("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(7, "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); } @@ -1638,14 +1983,19 @@ 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 Extended msgid + * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid * to that string. */ if (!strcasecmp(cbtype, "text/calendar")) { @@ -1660,62 +2010,126 @@ 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. */ /* First determine if this is our room */ - MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM); - if (strcasecmp(roomname, CC->quickroom.QRname)) { - return 0; /* It's not the Calendar room. */ + MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); + if (strcasecmp(roomname, CC->room.QRname)) { + 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(7, "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); } void ical_session_startup(void) { - CtdlAllocUserData(SYM_CIT_ICAL, sizeof(struct cit_ical)); + CIT_ICAL = malloc(sizeof(struct cit_ical)); memset(CIT_ICAL, 0, sizeof(struct cit_ical)); } +void ical_session_shutdown(void) { + free(CIT_ICAL); +} + + +/* + * 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 */ @@ -1725,12 +2139,22 @@ void ical_session_startup(void) { char *serv_calendar_init(void) { #ifdef CITADEL_WITH_CALENDAR_SERVICE - SYM_CIT_ICAL = CtdlGetDynamicSymbol(); CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE); CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE); CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN); 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 +}