X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=23b4ce93432b1ae08d71b6bc916a444c10d35ffb;hb=05abe4c6adfe1d12af53eba1e57046da8a038a88;hp=a02426cbaaf42206643738d93bc3576d4d8f9c3a;hpb=531c6449f1d765f5c871ba9d20a13e104d1f5529;p=citadel.git diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c index a02426cba..23b4ce934 100644 --- a/citadel/server/modules/calendar/serv_calendar.c +++ b/citadel/server/modules/calendar/serv_calendar.c @@ -7,23 +7,15 @@ // This program is open source software. Use, duplication, or disclosure // are subject to the terms of the GNU General Public License version 3. -#define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" - -#include "../../ctdl_module.h" #include +#include "../../ctdl_module.h" #include "../../msgbase.h" #include "../../internet_addressing.h" -#include "serv_calendar.h" #include "../../room_ops.h" #include "../../euidindex.h" #include "../../default_timezone.h" #include "../../config.h" - -struct ical_respond_data { - char desired_partnum[SIZ]; - icalcomponent *cal; -}; - +#include "serv_calendar.h" // Utility function to create a new VCALENDAR component with some of the // required fields already set the way we like them. @@ -110,7 +102,6 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { // If the caller did not supply a user, write to the currently selected room if (!u) { - struct CitContext *CCC = CC; StrBuf *MsgBody; msg = malloc(sizeof(struct CtdlMessage)); @@ -118,8 +109,8 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { msg->cm_magic = CTDLMESSAGE_MAGIC; msg->cm_anon_type = MES_NORMAL; msg->cm_format_type = 4; - CM_SetField(msg, eAuthor, CCC->user.fullname); - CM_SetField(msg, eOriginalRoom, CCC->room.QRname); + CM_SetField(msg, eAuthor, CC->user.fullname); + CM_SetField(msg, eOriginalRoom, CC->room.QRname); MsgBody = NewStrBufPlain(NULL, serlen + 100); StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0); @@ -480,12 +471,14 @@ void ical_merge_attendee_reply(icalcomponent *event, icalcomponent *reply) { // Iterate through the attendees looking for a match. STARTOVER: for (e_attendee = icalcomponent_get_first_property(event, ICAL_ATTENDEE_PROPERTY); - e_attendee != NULL; - e_attendee = icalcomponent_get_next_property(event, ICAL_ATTENDEE_PROPERTY)) { + e_attendee != NULL; + e_attendee = icalcomponent_get_next_property(event, ICAL_ATTENDEE_PROPERTY) + ) { for (r_attendee = icalcomponent_get_first_property(reply, ICAL_ATTENDEE_PROPERTY); - r_attendee != NULL; - r_attendee = icalcomponent_get_next_property(reply, ICAL_ATTENDEE_PROPERTY)) { + r_attendee != NULL; + r_attendee = icalcomponent_get_next_property(reply, ICAL_ATTENDEE_PROPERTY) + ) { // Check to see if these two attendees match... const char *e, *r; @@ -763,46 +756,43 @@ int ical_ctdl_is_overlap( } } - /* First, check for all-day events */ + // First, check for all-day events if (t1start.is_date || t2start.is_date) { - /* If event 1 ends before event 2 starts, we're in the clear. */ + // If event 1 ends before event 2 starts, we're in the clear. if (icaltime_compare_date_only(t1end, t2start) < 0) return(0); - /* If event 2 ends before event 1 starts, we're also ok. */ + // If event 2 ends before event 1 starts, we're also ok. if (icaltime_compare_date_only(t2end, t1start) < 0) return(0); return(1); } - /* syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d", - t1start.hour, t1start.minute, t1end.hour, t1end.minute, - t2start.hour, t2start.minute, t2end.hour, t2end.minute); - */ + // syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d", + // t1start.hour, t1start.minute, t1end.hour, t1end.minute, + // t2start.hour, t2start.minute, t2end.hour, t2end.minute); - /* Now check for overlaps using date *and* time. */ + // Now check for overlaps using date *and* time. - /* If event 1 ends before event 2 starts, we're in the clear. */ + // If event 1 ends before event 2 starts, we're in the clear. if (icaltime_compare(t1end, t2start) <= 0) return(0); - /* syslog(LOG_DEBUG, "calendar: first passed"); */ + // syslog(LOG_DEBUG, "calendar: first passed"); - /* If event 2 ends before event 1 starts, we're also ok. */ + // If event 2 ends before event 1 starts, we're also ok. if (icaltime_compare(t2end, t1start) <= 0) return(0); - /* syslog(LOG_DEBUG, "calendar: second passed"); */ + // syslog(LOG_DEBUG, "calendar: second passed"); - /* Otherwise, they overlap. */ + // Otherwise, they overlap. return(1); } -/* - * Phase 6 of "hunt for conflicts" - * called by ical_conflicts_phase5() - * - * Now both the proposed and existing events have been boiled down to start and end times. - * Check for overlap and output any conflicts. - * - * Returns nonzero if a conflict was reported. This allows the caller to stop iterating. - */ +// Phase 6 of "hunt for conflicts" +// called by ical_conflicts_phase5() +// +// Now both the proposed and existing events have been boiled down to start and end times. +// Check for overlap and output any conflicts. +// +// Returns nonzero if a conflict was reported. This allows the caller to stop iterating. int ical_conflicts_phase6(struct icaltimetype t1start, struct icaltimetype t1end, struct icaltimetype t2start, @@ -826,7 +816,7 @@ int ical_conflicts_phase6(struct icaltimetype t1start, // syslog(LOG_DEBUG, " EXISTING END: %s", ctime(&tt)); // debugging cruft - /* compare and output */ + // compare and output if (ical_ctdl_is_overlap(t1start, t1end, t2start, t2end)) { cprintf("%ld||%s|%s|%d|\n", @@ -861,20 +851,20 @@ void ical_conflicts_phase5(struct icaltimetype t1start, struct icaltimetype t2start, t2end; icalproperty *p; - /* recur variables */ + // recur variables icalproperty *rrule = NULL; struct icalrecurrencetype recur; icalrecur_iterator *ritr = NULL; struct icaldurationtype dur; int num_recur = 0; - /* initialization */ + // initialization strcpy(conflict_event_uid, ""); strcpy(conflict_event_summary, ""); t2start = icaltime_null_time(); t2end = icaltime_null_time(); - /* existing event stuff */ + // existing event stuff p = ical_ctdl_get_subprop(existing_event, ICAL_DTSTART_PROPERTY); if (p == NULL) return; if (p != NULL) t2start = icalproperty_get_dtstart(p); @@ -931,9 +921,8 @@ void ical_conflicts_phase5(struct icaltimetype t1start, } if (ical_conflicts_phase6(t1start, t1end, t2start, t2end, - existing_msgnum, conflict_event_uid, conflict_event_summary, compare_uid)) - { - num_recur = MAX_RECUR + 1; /* force it out of scope, no need to continue */ + existing_msgnum, conflict_event_uid, conflict_event_summary, compare_uid)) { + num_recur = MAX_RECUR + 1; // force it out of scope, no need to continue } if (rrule) { @@ -947,7 +936,7 @@ void ical_conflicts_phase5(struct icaltimetype t1start, } if (icaltime_compare(t2start, t1end) < 0) { - num_recur = MAX_RECUR + 1; /* force it out of scope */ + num_recur = MAX_RECUR + 1; // force it out of scope } } while ( (rrule) && (!icaltime_is_null_time(t2start)) && (num_recur < MAX_RECUR) ); @@ -955,13 +944,11 @@ void ical_conflicts_phase5(struct icaltimetype t1start, } -/* - * Phase 4 of "hunt for conflicts" - * Called by ical_hunt_for_conflicts_backend() - * - * At this point we've got it boiled down to two icalcomponent events in memory. - * If they conflict, output something to the client. - */ +// Phase 4 of "hunt for conflicts" +// Called by ical_hunt_for_conflicts_backend() +// +// At this point we've got it boiled down to two icalcomponent events in memory. +// If they conflict, output something to the client. void ical_conflicts_phase4(icalcomponent *proposed_event, icalcomponent *existing_event, long existing_msgnum) @@ -970,18 +957,18 @@ void ical_conflicts_phase4(icalcomponent *proposed_event, icalproperty *p; char compare_uid[SIZ]; - /* recur variables */ + // recur variables icalproperty *rrule = NULL; struct icalrecurrencetype recur; icalrecur_iterator *ritr = NULL; struct icaldurationtype dur; int num_recur = 0; - /* initialization */ + // initialization t1end = icaltime_null_time(); *compare_uid = '\0'; - /* proposed event stuff */ + // proposed event stuff p = ical_ctdl_get_subprop(proposed_event, ICAL_DTSTART_PROPERTY); if (p == NULL) @@ -1056,10 +1043,8 @@ void ical_conflicts_phase4(icalcomponent *proposed_event, } -/* - * Phase 3 of "hunt for conflicts" - * Called by ical_hunt_for_conflicts() - */ +// Phase 3 of "hunt for conflicts" +// Called by ical_hunt_for_conflicts() void ical_hunt_for_conflicts_backend(long msgnum, void *data) { icalcomponent *proposed_event; struct CtdlMessage *msg = NULL; @@ -1087,17 +1072,15 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *data) { } -/* - * Phase 2 of "hunt for conflicts" operation. - * At this point we have a calendar object which represents the VEVENT that - * is proposed for addition to the calendar. Now hunt through the user's - * calendar room, and output zero or more existing VEVENTs which conflict - * with this one. - */ +// Phase 2 of "hunt for conflicts" operation. +// At this point we have a calendar object which represents the VEVENT that +// is proposed for addition to the calendar. Now hunt through the user's +// calendar room, and output zero or more existing VEVENTs which conflict +// with this one. void ical_hunt_for_conflicts(icalcomponent *cal) { char hold_rm[ROOMNAMELEN]; - strcpy(hold_rm, CC->room.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); // save current room if (CtdlGetRoom(&CC->room, USERCALENDARROOM) != 0) { CtdlGetRoom(&CC->room, hold_rm); @@ -1115,14 +1098,12 @@ void ical_hunt_for_conflicts(icalcomponent *cal) { ); cprintf("000\n"); - CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ + CtdlGetRoom(&CC->room, hold_rm); // return to saved room } -/* - * Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2) - */ +// Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2) void ical_conflicts(long msgnum, char *partnum) { struct CtdlMessage *msg = NULL; struct ical_respond_data ird; @@ -1138,12 +1119,14 @@ void ical_conflicts(long msgnum, char *partnum) { memset(&ird, 0, sizeof ird); strcpy(ird.desired_partnum, partnum); - mime_parser(CM_RANGE(msg, eMessageText), - *ical_locate_part, /* callback function */ - NULL, NULL, - (void *) &ird, /* user data */ - 0 - ); + mime_parser( + CM_RANGE(msg, eMessageText), + *ical_locate_part, // callback function + NULL, + NULL, + (void *) &ird, // user data + 0 + ); CM_Free(msg); @@ -1157,12 +1140,10 @@ void ical_conflicts(long msgnum, char *partnum) { } -/* - * Look for busy time in a VEVENT and add it to the supplied VFREEBUSY. - * - * fb The VFREEBUSY component to which we are appending - * top_level_cal The top-level VCALENDAR component which contains a VEVENT to be added - */ +// Look for busy time in a VEVENT and add it to the supplied VFREEBUSY. +// +// fb The VFREEBUSY component to which we are appending +// top_level_cal The top-level VCALENDAR component which contains a VEVENT to be added void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { icalcomponent *cal; icalproperty *p; @@ -1171,7 +1152,7 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { icaltimetype dtstart; icaltimetype dtend; - /* recur variables */ + // recur variables icalproperty *rrule = NULL; struct icalrecurrencetype recur; icalrecur_iterator *ritr = NULL; @@ -1180,13 +1161,12 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { if (!top_level_cal) return; - /* Find the VEVENT component containing an event */ + // Find the VEVENT component containing an event cal = icalcomponent_get_first_component(top_level_cal, ICAL_VEVENT_COMPONENT); if (!cal) return; - /* If this event is not opaque, the user isn't publishing it as - * busy time, so don't bother doing anything else. - */ + // 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); @@ -1197,9 +1177,7 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { } } - /* - * Now begin calculating the event start and end times. - */ + // Now begin calculating the event start and end times. p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY); if (!p) return; dtstart = icalproperty_get_dtstart(p); @@ -1226,7 +1204,7 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { memset (&dur, 0, sizeof(struct icaldurationtype)); } - /* Is a recurrence specified? If so, get ready to process it... */ + // Is a recurrence specified? If so, get ready to process it... rrule = ical_ctdl_get_subprop(cal, ICAL_RRULE_PROPERTY); if (rrule) { recur = icalproperty_get_rrule(rrule); @@ -1234,16 +1212,15 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { } do { - /* Convert the DTSTART and DTEND properties to an icalperiod. */ + // Convert the DTSTART and DTEND properties to an icalperiod. this_event_period.start = dtstart; if (!icaltime_is_null_time(dtend)) { this_event_period.end = dtend; } - /* Convert the timestamps to UTC. It's ok to do this because we've already expanded - * recurrences and this data is never going to get used again. - */ + // Convert the timestamps to UTC. It's ok to do this because we've already expanded + // recurrences and this data is never going to get used again. this_event_period.start = icaltime_convert_to_zone( this_event_period.start, icaltimezone_get_utc_timezone() @@ -1253,12 +1230,11 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { icaltimezone_get_utc_timezone() ); - /* Now add it. */ + // Now add it. icalcomponent_add_property(fb, icalproperty_new_freebusy(this_event_period)); - /* Make sure the DTSTART property of the freebusy *list* is set to - * the DTSTART property of the *earliest event*. - */ + // 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, this_event_period.start); @@ -1269,9 +1245,8 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { } } - /* Make sure the DTEND property of the freebusy *list* is set to - * the DTEND property of the *latest event*. - */ + // 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, this_event_period.end); @@ -1296,43 +1271,40 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { } -/* - * Backend for ical_freebusy() - * - * This function simply loads the messages in the user's calendar room, - * which contain VEVENTs, then strips them of all non-freebusy data, and - * adds them to the supplied VCALENDAR. - * - */ +// Backend for ical_freebusy() +// +// This function simply loads the messages in the user's calendar room, +// which contain VEVENTs, then strips them of all non-freebusy data, and +// adds them to the supplied VCALENDAR. void ical_freebusy_backend(long msgnum, void *data) { icalcomponent *fb; struct CtdlMessage *msg = NULL; struct ical_respond_data ird; - fb = (icalcomponent *)data; /* User-supplied data will be the VFREEBUSY component */ + fb = (icalcomponent *)data; // User-supplied data will be the VFREEBUSY component msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) return; memset(&ird, 0, sizeof ird); strcpy(ird.desired_partnum, "_HUNT_"); - mime_parser(CM_RANGE(msg, eMessageText), - *ical_locate_part, /* callback function */ - NULL, NULL, - (void *) &ird, /* user data */ - 0 - ); + mime_parser( + CM_RANGE(msg, eMessageText), + *ical_locate_part, // callback function + NULL, + NULL, + (void *) &ird, // user data + 0 + ); CM_Free(msg); if (ird.cal) { - ical_add_to_freebusy(fb, ird.cal); /* Add VEVENT times to VFREEBUSY */ + ical_add_to_freebusy(fb, ird.cal); // Add VEVENT times to VFREEBUSY icalcomponent_free(ird.cal); } } -/* - * Grab another user's free/busy times - */ +// Grab another user's free/busy times void ical_freebusy(char *who) { struct ctdluser usbuf; char calendar_room_name[ROOMNAMELEN]; @@ -1348,10 +1320,10 @@ void ical_freebusy(char *who) { int i = 0; int config_lines = 0; - /* First try an exact match. */ + // First try an exact match. found_user = CtdlGetUser(&usbuf, who); - /* If not found, try it as an unqualified email address. */ + // If not found, try it as an unqualified email address. if (found_user != 0) { strcpy(buf, who); recp = validate_recipients(buf, NULL, 0); @@ -1364,9 +1336,7 @@ void ical_freebusy(char *who) { } } - /* If still not found, try it as an address qualified with the - * primary FQDN of this Citadel node. - */ + // 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, CtdlGetConfigStr("c_fqdn")); syslog(LOG_DEBUG, "calendar: trying <%s>", buf); @@ -1379,9 +1349,7 @@ void ical_freebusy(char *who) { } } - /* Still not found? Try qualifying it with every domain we - * might have addresses in. - */ + // 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) { @@ -1389,8 +1357,9 @@ void ical_freebusy(char *who) { extract_token(host, buf, 0, '|', sizeof host); extract_token(type, buf, 1, '|', sizeof type); - if ( (!strcasecmp(type, "localhost")) - || (!strcasecmp(type, "directory")) ) { + if ( (!strcasecmp(type, "localhost")) + || (!strcasecmp(type, "directory")) + ) { snprintf(buf, sizeof buf, "%s@%s", who, host); syslog(LOG_DEBUG, "calendar: trying <%s>", buf); recp = validate_recipients(buf, NULL, 0); @@ -1409,10 +1378,9 @@ void ical_freebusy(char *who) { return; } - CtdlMailboxName(calendar_room_name, sizeof calendar_room_name, - &usbuf, USERCALENDARROOM); + CtdlMailboxName(calendar_room_name, sizeof calendar_room_name, &usbuf, USERCALENDARROOM); - strcpy(hold_rm, CC->room.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); // save current room if (CtdlGetRoom(&CC->room, calendar_room_name) != 0) { cprintf("%d Cannot open calendar\n", ERROR + ROOM_NOT_FOUND); @@ -1420,7 +1388,7 @@ void ical_freebusy(char *who) { return; } - /* Create a VFREEBUSY subcomponent */ + // Create a VFREEBUSY subcomponent syslog(LOG_DEBUG, "calendar: creating VFREEBUSY component"); fb = icalcomponent_new_vfreebusy(); if (fb == NULL) { @@ -1429,13 +1397,13 @@ void ical_freebusy(char *who) { return; } - /* Set the method to PUBLISH */ + // Set the method to PUBLISH icalcomponent_set_method(fb, ICAL_METHOD_PUBLISH); - /* Set the DTSTAMP to right now. */ + // Set the DTSTAMP to right now. icalcomponent_set_dtstamp(fb, icaltime_from_timet_with_zone(time(NULL), 0, icaltimezone_get_utc_timezone())); - /* Add the user's email address as ORGANIZER */ + // Add the user's email address as ORGANIZER sprintf(buf, "MAILTO:%s", who); if (strchr(buf, '@') == NULL) { strcat(buf, "@"); @@ -1446,13 +1414,12 @@ void ical_freebusy(char *who) { } icalcomponent_add_property(fb, icalproperty_new_organizer(buf)); - /* Add busy time from events */ + // Add busy time from events syslog(LOG_DEBUG, "calendar: adding busy time from events"); 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. - */ + // If values for DTSTART and DTEND are still not present, set them + // to yesterday and tomorrow as default values. if (icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY) == NULL) { icalcomponent_set_dtstart(fb, icaltime_from_timet_with_zone(time(NULL)-86400L, 0, icaltimezone_get_utc_timezone())); } @@ -1460,7 +1427,7 @@ void ical_freebusy(char *who) { icalcomponent_set_dtend(fb, icaltime_from_timet_with_zone(time(NULL)+86400L, 0, icaltimezone_get_utc_timezone())); } - /* Put the freebusy component into the calendar component */ + // Put the freebusy component into the calendar component syslog(LOG_DEBUG, "calendar: encapsulating"); encaps = ical_encapsulate_subcomponent(fb); if (encaps == NULL) { @@ -1471,14 +1438,14 @@ void ical_freebusy(char *who) { return; } - /* Set the method to PUBLISH */ + // Set the method to PUBLISH syslog(LOG_DEBUG, "calendar: setting method"); icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH); - /* Serialize it */ + // Serialize it syslog(LOG_DEBUG, "calendar: serializing"); serialized_request = icalcomponent_as_ical_string_r(encaps); - icalcomponent_free(encaps); /* Don't need this anymore. */ + icalcomponent_free(encaps); // Don't need this anymore. cprintf("%d Free/busy for %s\n", LISTING_FOLLOWS, usbuf.fullname); if (serialized_request != NULL) { @@ -1487,17 +1454,15 @@ void ical_freebusy(char *who) { } cprintf("\n000\n"); - /* Go back to the room from which we came... */ + // Go back to the room from which we came... CtdlGetRoom(&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. - */ +// 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; @@ -1506,61 +1471,57 @@ void ical_getics_backend(long msgnum, void *data) { encaps = (icalcomponent *)data; if (encaps == NULL) return; - /* Look for the calendar event... */ + // 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(CM_RANGE(msg, eMessageText), - *ical_locate_part, /* callback function */ - NULL, NULL, - (void *) &ird, /* user data */ - 0 + mime_parser( + CM_RANGE(msg, eMessageText), + *ical_locate_part, // callback function + NULL, + NULL, + (void *) &ird, // user data + 0 ); CM_Free(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". - */ + // Here we go: put the VEVENT componment into the VCALENDAR container. - /* If the top-level component is *not* a VCALENDAR, we can drop it right - * in. This will almost never happen. - */ + // If the top-level component is *not* a VCALENDAR container, we can drop it right in. + // This is rare but we have to be able to handle it. if (icalcomponent_isa(ird.cal) != ICAL_VCALENDAR_COMPONENT) { icalcomponent_add_component(encaps, ird.cal); + // And now, the parent VCALENDAR container owns the child component's memory. } - /* - * 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)) { - - /* For VTIMEZONE components, suppress duplicates of the same tzid */ + // In the more likely event that we're looking at a VCALENDAR container with the VEVENT + // and other components encapsulated inside, we have to extract them first. + else { + for (c = icalcomponent_get_first_component(ird.cal, ICAL_ANY_COMPONENT); + (c != NULL); + c = icalcomponent_get_next_component(ird.cal, ICAL_ANY_COMPONENT) + ) { + // For VTIMEZONE components, suppress duplicates of the same tzid if (icalcomponent_isa(c) == ICAL_VTIMEZONE_COMPONENT) { icalproperty *p = icalcomponent_get_first_property(c, ICAL_TZID_PROPERTY); if (p) { const char *tzid = icalproperty_get_tzid(p); if (!icalcomponent_get_timezone(encaps, tzid)) { - icalcomponent_add_component(encaps, - icalcomponent_new_clone(c)); + icalcomponent_add_component(encaps, icalcomponent_new_clone(c)); } } } - /* All other types of components can go in verbatim */ + // All other types of components can go in verbatim else { icalcomponent_add_component(encaps, icalcomponent_new_clone(c)); } } - icalcomponent_free(ird.cal); + icalcomponent_free(ird.cal); // we cloned this component so free the original. } } @@ -1571,11 +1532,12 @@ void ical_getics(void) { icalcomponent *encaps = NULL; char *ser = NULL; + // Only allow this operation if we're in a room containing a calendar or tasks view if ( (CC->room.QRdefaultview != VIEW_CALENDAR) - &&(CC->room.QRdefaultview != VIEW_TASKS) + && (CC->room.QRdefaultview != VIEW_TASKS) ) { cprintf("%d Not a calendar room\n", ERROR+NOT_HERE); - return; /* This room does not contain a calendar. */ + return; // This room does not contain a calendar. } encaps = icalcomponent_new_vcalendar(); @@ -1587,16 +1549,16 @@ void ical_getics(void) { cprintf("%d one big calendar\n", LISTING_FOLLOWS); - /* Set the Product ID */ + // Set the Product ID icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID)); - /* Set the Version Number */ + // Set the Version Number icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); - /* Set the method to PUBLISH */ + // Set the method to PUBLISH icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH); - /* Now go through the room encapsulating all calendar items. */ + // Now go through the room encapsulating all calendar items. CtdlForEachMessage(MSGS_ALL, 0, NULL, NULL, NULL, @@ -1605,7 +1567,7 @@ void ical_getics(void) { ); ser = icalcomponent_as_ical_string_r(encaps); - icalcomponent_free(encaps); /* Don't need this anymore. */ + icalcomponent_free(encaps); // Don't need this anymore. client_write(ser, strlen(ser)); free(ser); cprintf("\n000\n"); @@ -1643,7 +1605,7 @@ void ical_putics(void) { && (CC->room.QRdefaultview != VIEW_TASKS) ) { cprintf("%d Not a calendar room\n", ERROR+NOT_HERE); - return; + return; // This room does not contain a calendar. } // Only allow this operation if we have permission to overwrite the existing calendar @@ -1661,40 +1623,37 @@ void ical_putics(void) { cal = icalcomponent_new_from_string(calstream); free(calstream); - /* We got our data stream -- now do something with it. */ + // We got our data stream -- now do something with it. - /* Delete the existing messages in the room, because we are overwriting - * the entire calendar with an entire new (or updated) calendar. - * (Careful: this opens an S_ROOMS critical section!) - */ + // Delete the existing messages in the room, because we are overwriting + // 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 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(NULL, 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. - */ + + // 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); + for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); (c != NULL); c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT) ) { - /* Non-VTIMEZONE components each get written as individual messages. - * But we also need to attach the relevant VTIMEZONE components to them. - */ - if ( (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT) - && (encaps = icalcomponent_new_vcalendar()) ) { + // Non-VTIMEZONE components each get written as individual messages. + // But we also need to attach the relevant VTIMEZONE components to them. + if ( (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT) + && (encaps = icalcomponent_new_vcalendar()) + ) { icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID)); icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH); - /* Attach any needed timezones here */ + // Attach any needed timezones here tzidlist = NewHash(1, NULL); if (tzidlist) { icalcomponent_foreach_tzid(c, ical_putics_grabtzids, tzidlist); @@ -1705,15 +1664,15 @@ void ical_putics(void) { syslog(LOG_DEBUG, "calendar: attaching timezone '%s'", (char*) Value); icaltimezone *t = NULL; - /* First look for a timezone attached to the original calendar */ + // First look for a timezone attached to the original calendar t = icalcomponent_get_timezone(cal, Value); - /* Try built-in tzdata if the right one wasn't attached */ + // Try built-in tzdata if the right one wasn't attached if (!t) { t = icaltimezone_get_builtin_timezone(Value); } - /* I've got a valid timezone to attach. */ + // I've got a valid timezone to attach. if (t) { icalcomponent_add_component(encaps, icalcomponent_new_clone( @@ -1726,10 +1685,10 @@ void ical_putics(void) { DeleteHashPos(&HashPos); DeleteHash(&tzidlist); - /* Now attach the component itself (usually a VEVENT or VTODO) */ + // Now attach the component itself (usually a VEVENT or VTODO) icalcomponent_add_component(encaps, icalcomponent_new_clone(c)); - /* Write it to the message store */ + // Write it to the message store ical_write_to_cal(NULL, encaps); icalcomponent_free(encaps); } @@ -1740,104 +1699,32 @@ void ical_putics(void) { } -/* - * All Citadel calendar commands from the client come through here. - */ -void cmd_ical(char *argbuf) { - char subcmd[64]; - long msgnum; - char partnum[256]; - char action[256]; - char who[256]; - - extract_token(subcmd, argbuf, 0, '|', sizeof subcmd); - - /* Allow "test" and "freebusy" subcommands without logging in. */ - - if (!strcasecmp(subcmd, "test")) { - cprintf("%d This server supports calendaring\n", CIT_OK); - return; - } - - 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_token(partnum, argbuf, 2, '|', sizeof partnum); - extract_token(action, argbuf, 3, '|', sizeof action); - ical_respond(msgnum, partnum, action); - return; - } - - if (!strcasecmp(subcmd, "handle_rsvp")) { - msgnum = extract_long(argbuf, 1); - extract_token(partnum, argbuf, 2, '|', sizeof partnum); - extract_token(action, argbuf, 3, '|', sizeof action); - ical_handle_rsvp(msgnum, partnum, action); - return; - } - - if (!strcasecmp(subcmd, "conflicts")) { - msgnum = extract_long(argbuf, 1); - extract_token(partnum, argbuf, 2, '|', sizeof partnum); - ical_conflicts(msgnum, partnum); - return; - } - - if (!strcasecmp(subcmd, "getics")) { - ical_getics(); - return; - } - - if (!strcasecmp(subcmd, "putics")) { - ical_putics(); - return; - } - - cprintf("%d Invalid subcommand\n", ERROR + CMD_NOT_SUPPORTED); -} - - -/* - * We don't know if the calendar room exists so we just create it at login - */ +// We don't know if the calendar room exists so we just create it at login void ical_CtdlCreateRoom(void) { struct ctdlroom qr; struct visit vbuf; - /* Create the calendar room if it doesn't already exist */ + // Create the calendar room if it doesn't already exist CtdlCreateRoom(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR); - /* Set expiration policy to manual; otherwise objects will be lost! */ + // Set expiration policy to manual; otherwise objects will be lost! if (CtdlGetRoomLock(&qr, USERCALENDARROOM)) { syslog(LOG_ERR, "calendar: couldn't get the user calendar room"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; - qr.QRdefaultview = VIEW_CALENDAR; /* 3 = calendar view */ + qr.QRdefaultview = VIEW_CALENDAR; // 3 = calendar view CtdlPutRoomLock(&qr); - /* Set the view to a calendar view */ + // Set the view to a calendar view 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 the tasks list room if it doesn't already exist CtdlCreateRoom(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS); - /* Set expiration policy to manual; otherwise objects will be lost! */ + // Set expiration policy to manual; otherwise objects will be lost! if (CtdlGetRoomLock(&qr, USERTASKSROOM)) { syslog(LOG_ERR, "calendar: couldn't get the user calendar room!"); return; @@ -1846,15 +1733,15 @@ void ical_CtdlCreateRoom(void) { qr.QRdefaultview = VIEW_TASKS; CtdlPutRoomLock(&qr); - /* Set the view to a task list view */ + // Set the view to a task list view 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 the notes room if it doesn't already exist CtdlCreateRoom(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES); - /* Set expiration policy to manual; otherwise objects will be lost! */ + // Set expiration policy to manual; otherwise objects will be lost! if (CtdlGetRoomLock(&qr, USERNOTESROOM)) { syslog(LOG_ERR, "calendar: couldn't get the user calendar room!"); return; @@ -1863,7 +1750,7 @@ void ical_CtdlCreateRoom(void) { qr.QRdefaultview = VIEW_NOTES; CtdlPutRoomLock(&qr); - /* Set the view to a notes view */ + // Set the view to a notes view CtdlGetRelationship(&vbuf, &CC->user, &qr); vbuf.v_view = VIEW_NOTES; CtdlSetRelationship(&vbuf, &CC->user, &qr); @@ -1872,14 +1759,12 @@ void ical_CtdlCreateRoom(void) { } -/* - * ical_send_out_invitations() is called by ical_saving_vevent() when it finds a VEVENT. - * - * top_level_cal is the highest available level calendar object. - * cal is the subcomponent containing the VEVENT. - * - * Note: if you change the encapsulation code here, change it in WebCit's ical_encapsulate_subcomponent() - */ +// ical_send_out_invitations() is called by ical_saving_vevent() when it finds a VEVENT. +// +// top_level_cal is the highest available level calendar object. +// cal is the subcomponent containing the VEVENT. +// +// Note: if you change the encapsulation code here, change it in WebCit's ical_encapsulate_subcomponent() void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) { icalcomponent *the_request = NULL; char *serialized_request = NULL; @@ -1909,26 +1794,20 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) return; } - /* If this is a VCALENDAR component, look for a VEVENT subcomponent. */ + // If this is a VCALENDAR component, look for a VEVENT subcomponent. if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) { - ical_send_out_invitations(top_level_cal, - icalcomponent_get_first_component( - cal, ICAL_VEVENT_COMPONENT - ) - ); + ical_send_out_invitations(top_level_cal, icalcomponent_get_first_component(cal, ICAL_VEVENT_COMPONENT)); return; } - /* Clone the event */ + // Clone the event the_request = icalcomponent_new_clone(cal); if (the_request == NULL) { syslog(LOG_ERR, "calendar: cannot clone calendar object"); return; } - /* Extract the summary string -- we'll use it as the - * message subject for the request - */ + // Extract the summary string -- we'll use it as the message subject for the request strcpy(summary_string, "Meeting request"); summary = icalcomponent_get_first_property(the_request, ICAL_SUMMARY_PROPERTY); if (summary != NULL) { @@ -1938,14 +1817,14 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) } } - /* Determine who the recipients of this message are (the attendees) */ + // Determine who the recipients of this message are (the attendees) 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)) { const char *ch = icalproperty_get_attendee(attendee); if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) { safestrncpy(this_attendee, ch + 7, sizeof(this_attendee)); - if (!CtdlIsMe(this_attendee, sizeof this_attendee)) { /* don't send an invitation to myself! */ + 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, ", @@ -1958,15 +1837,14 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) syslog(LOG_DEBUG, "calendar: <%d> attendees: <%s>", 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! - */ + // If there are no attendees, there are no invitations to send, so... + // don't bother putting one together! Punch out, Maverick! if (num_attendees == 0) { icalcomponent_free(the_request); return; } - /* Encapsulate the VEVENT component into a complete VCALENDAR */ + // Encapsulate the VEVENT component into a complete VCALENDAR encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { syslog(LOG_ERR, "calendar: could not allocate component!"); @@ -1974,37 +1852,37 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) return; } - /* Set the Product ID */ + // Set the Product ID icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID)); - /* Set the Version Number */ + // Set the Version Number icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); - /* Set the method to REQUEST */ + // Set the method to REQUEST icalcomponent_set_method(encaps, ICAL_METHOD_REQUEST); - /* Look for properties containing timezone parameters, to see if we need to attach VTIMEZONEs */ + // Look for properties containing timezone parameters, to see if we need to attach VTIMEZONEs for (p = icalcomponent_get_first_property(the_request, ICAL_ANY_PROPERTY); - p != NULL; - p = icalcomponent_get_next_property(the_request, ICAL_ANY_PROPERTY)) - { - if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY) - || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY) - || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY) - || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY) - || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY) - || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY) - || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY) - || (icalproperty_isa(p) == ICAL_DUE_PROPERTY) - || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY) - || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY) - || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY) - || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY) - || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY) + p != NULL; + p = icalcomponent_get_next_property(the_request, ICAL_ANY_PROPERTY) + ) { + if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY) + || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY) + || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY) + || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY) + || (icalproperty_isa(p) == ICAL_DUE_PROPERTY) + || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY) + || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY) ) { t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them - /* Determine the tzid in order for some of the conditions below to work */ + // Determine the tzid in order for some of the conditions below to work tzidp = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER); if (tzidp) { tzidc = icalparameter_get_tzid(tzidp); @@ -2013,7 +1891,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) tzidc = NULL; } - /* First see if there's a timezone attached to the data structure itself */ + // First see if there's a timezone attached to the data structure itself if (icaltime_is_utc(t)) { z = icaltimezone_get_utc_timezone(); } @@ -2021,28 +1899,28 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) z = icaltime_get_timezone(t); } - /* If not, try to determine the tzid from the parameter using attached zones */ + // If not, try to determine the tzid from the parameter using attached zones if ((!z) && (tzidc)) { z = icalcomponent_get_timezone(top_level_cal, tzidc); } - /* Still no good? Try our internal database */ + // Still no good? Try our internal database if ((!z) && (tzidc)) { z = icaltimezone_get_builtin_timezone_from_tzid(tzidc); } if (z) { - /* We have a valid timezone. Good. Now we need to attach it. */ + // We have a valid timezone. Good. Now we need to attach it. zone_already_attached = 0; for (i=0; i<5; ++i) { if (z == attached_zones[i]) { - /* We've already got this one, no need to attach another. */ + // We've already got this one, no need to attach another. ++zone_already_attached; } } if ((!zone_already_attached) && (num_zones_attached < 5)) { - /* This is a new one, so attach it. */ + // This is a new one, so attach it. attached_zones[num_zones_attached++] = z; } @@ -2052,22 +1930,21 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) } } - /* Encapsulate any timezones we need */ + // Encapsulate any timezones we need if (num_zones_attached > 0) for (i=0; iuser, - NULL, /* No single recipient here */ - NULL, /* No single recipient here */ + NULL, // No single recipient here + NULL, // No single recipient here CC->room.QRname, 0, FMT_RFC822, NULL, NULL, - summary_string, /* Use summary for subject */ + summary_string, // Use summary for subject NULL, request_message_text, NULL @@ -2104,17 +1981,14 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) } -/* - * When a calendar object is being saved, determine whether it's a VEVENT - * and the user saving it is the organizer. If so, send out invitations - * to any listed attendees. - * - * This function is recursive. The caller can simply supply the same object - * as both arguments. When it recurses it will alter the second argument - * while holding on to the top level object. This allows us to go back and - * grab things like time zones which might be attached. - * - */ +// When a calendar object is being saved, determine whether it's a VEVENT +// and the user saving it is the organizer. If so, send out invitations +// to any listed attendees. +// +// This function is recursive. The caller can simply supply the same object +// as both arguments. When it recurses it will alter the second argument +// while holding on to the top level object. This allows us to go back and +// grab things like time zones which might be attached. void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) { icalcomponent *c; icalproperty *organizer = NULL; @@ -2122,21 +1996,19 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) { syslog(LOG_DEBUG, "calendar: ical_saving_vevent() has been called"); - /* Don't send out invitations unless the client wants us to. */ + // 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. */ + // Don't send out invitations if we've been asked not to. if (CIT_ICAL->avoid_sending_invitations > 0) { return; } strcpy(organizer_string, ""); - /* - * The VEVENT subcomponent is the one we're interested in. - * Send out invitations if, and only if, this user is the Organizer. - */ + // The VEVENT subcomponent is the one we're interested in. + // Send out invitations if, and only if, this user is the Organizer. if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) { organizer = icalcomponent_get_first_property(cal, ICAL_ORGANIZER_PROPERTY); if (organizer != NULL) { @@ -2148,33 +2020,30 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) { if (!strncasecmp(organizer_string, "MAILTO:", 7)) { strcpy(organizer_string, &organizer_string[7]); string_trim(organizer_string); - /* - * If the user saving the event is listed as the - * organizer, then send out invitations. - */ + // If the user saving the event is listed as the + // organizer, then send out invitations. if (CtdlIsMe(organizer_string, sizeof organizer_string)) { ical_send_out_invitations(top_level_cal, cal); } } } - /* If the component has subcomponents, recurse through them. */ - for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); - (c != NULL); - c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) { - /* Recursively process subcomponent */ + // If the component has subcomponents, recurse through them. + for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); + (c != NULL); + c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT) + ) { + // Recursively process subcomponent ical_saving_vevent(top_level_cal, c); } } -/* - * Back end for ical_obj_beforesave() - * This hunts for the UID of the calendar event (becomes Citadel msg EUID), - * the summary of the event (becomes message subject), - * and the start time (becomes message date/time). - */ +// Back end for ical_obj_beforesave() +// This hunts for the UID of the calendar event (becomes Citadel msg EUID), +// the summary of the event (becomes message subject), +// and the start time (becomes message date/time). void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata) @@ -2187,42 +2056,38 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, if (!msg) return; - /* We're only interested in calendar data. */ - if ( (strcasecmp(cbtype, "text/calendar")) - && (strcasecmp(cbtype, "application/ics")) ) { + // We're only interested in calendar data. + if ( (strcasecmp(cbtype, "text/calendar")) + && (strcasecmp(cbtype, "application/ics")) + ) { 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. - */ + // 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. 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); + 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); + nested_todo = icalcomponent_get_first_component( cal, ICAL_VTODO_COMPONENT); if (nested_todo != NULL) { cal = nested_todo; } } } - + if (cal != NULL) { - /* Set the message EUID to the iCalendar UID */ + // Set the message EUID to the iCalendar UID p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY); if (p == NULL) { - /* If there's no uid we must generate one */ + // 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); @@ -2235,7 +2100,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, } } - /* Set the message subject to the iCalendar summary */ + // Set the message subject to the iCalendar summary p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY); if (p != NULL) { @@ -2248,7 +2113,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, } } - /* Set the message date/time to the iCalendar start time */ + // Set the message date/time to the iCalendar start time p = ical_ctdl_get_subprop(cal, ICAL_DTSTART_PROPERTY); if (p != NULL) { @@ -2268,65 +2133,64 @@ void ical_obj_beforesave_backend(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). - * - * If the message is being saved, we also set various message header fields - * using data found in the iCalendar object. - */ +// 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). +// +// If the message is being saved, we also set various message header fields +// using data found in the iCalendar object. int ical_obj_beforesave(struct CtdlMessage *msg, struct recptypes *recp) { - /* First determine if this is a calendar or tasks room */ - if ( (CC->room.QRdefaultview != VIEW_CALENDAR) - && (CC->room.QRdefaultview != VIEW_TASKS) + // First determine if this is a calendar or tasks room + if ( (CC->room.QRdefaultview != VIEW_CALENDAR) + && (CC->room.QRdefaultview != VIEW_TASKS) ) { - return(0); /* Not an iCalendar-centric room */ + return(0); // Not an iCalendar-centric room } - /* It must be an RFC822 message! */ + // It must be an RFC822 message! if (msg->cm_format_type != 4) { syslog(LOG_DEBUG, "calendar: rejecting non-RFC822 message"); - return(1); /* You tried to save a non-RFC822 message! */ + return(1); // You tried to save a non-RFC822 message! } if (CM_IsEmpty(msg, eMessageText)) { - return(1); /* You tried to save a null message! */ + return(1); // You tried to save a null message! } - /* Do all of our lovely back-end parsing */ - mime_parser(CM_RANGE(msg, eMessageText), - *ical_obj_beforesave_backend, - NULL, NULL, - (void *)msg, - 0 - ); + // Do all of our lovely back-end parsing + mime_parser( + CM_RANGE(msg, eMessageText), + *ical_obj_beforesave_backend, + NULL, + NULL, + (void *)msg, + 0 + ); return(0); } -/* - * Things we need to do after saving a calendar event. - */ +// 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, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata) { icalcomponent *cal; - /* We're only interested in calendar items here. */ - if ( (strcasecmp(cbtype, "text/calendar")) - && (strcasecmp(cbtype, "application/ics")) ) { + // We're only interested in calendar items here. + if ( (strcasecmp(cbtype, "text/calendar")) + && (strcasecmp(cbtype, "application/ics")) + ) { 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")) - || (!strcasecmp(cbtype, "application/ics")) ) { + // 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")) + || (!strcasecmp(cbtype, "application/ics")) + ) { cal = icalcomponent_new_from_string(content); if (cal != NULL) { ical_saving_vevent(cal, cal); @@ -2336,22 +2200,18 @@ 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.) - */ +// 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, struct recptypes *recp) { char roomname[ROOMNAMELEN]; - /* - * If this isn't the Calendar> room, no further action is necessary. - */ + // If this isn't the Calendar> room, no further action is necessary. - /* First determine if this is our room */ + // First determine if this is our room CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); if (strcasecmp(roomname, CC->room.QRname)) { - return(0); /* Not the Calendar room -- don't do anything. */ + return(0); // Not the Calendar room -- don't do anything. } // It must be an RFC822 message! @@ -2361,12 +2221,14 @@ int ical_obj_aftersave(struct CtdlMessage *msg, struct recptypes *recp) { if (CM_IsEmpty(msg, eMessageText)) return(1); // Now recurse through it looking for our icalendar data - mime_parser(CM_RANGE(msg, eMessageText), - *ical_obj_aftersave_backend, - NULL, NULL, - NULL, - 0 - ); + mime_parser( + CM_RANGE(msg, eMessageText), + *ical_obj_aftersave_backend, + NULL, + NULL, + NULL, + 0 + ); return(0); } @@ -2390,17 +2252,17 @@ void ical_fixed_output_backend(icalcomponent *cal, int recursion_level) { char buf[256]; const char *ch; - p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY); + 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); + 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); + p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY); if (p != NULL) { cprintf("%s\n", (const char *)icalproperty_get_comment(p)); } @@ -2408,8 +2270,7 @@ void ical_fixed_output_backend(icalcomponent *cal, int recursion_level) { // 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)) { ch = icalproperty_get_attendee(p); - if ((ch != NULL) && - !strncasecmp(ch, "MAILTO:", 7)) { + if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) { // screen name or email address safestrncpy(buf, ch + 7, sizeof(buf)); @@ -2421,8 +2282,9 @@ void ical_fixed_output_backend(icalcomponent *cal, int recursion_level) { // 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 ical_fixed_output_backend(c, recursion_level+1); } @@ -2452,6 +2314,80 @@ void ical_fixed_output(char *ptr, int len) { } +// All Citadel calendar commands from the client come through here. +void cmd_ical(char *argbuf) { + char subcmd[64]; + long msgnum; + char partnum[256]; + char action[256]; + char who[256]; + + extract_token(subcmd, argbuf, 0, '|', sizeof subcmd); + + // Allow "test" and "freebusy" and "sgi" subcommands without logging in. + + if (!strcasecmp(subcmd, "test")) { + cprintf("%d This server supports calendaring\n", CIT_OK); + return; + } + + 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; + } + + // All other commands require a user to be logged in. + if (CtdlAccessCheck(ac_logged_in)) return; + + if (!strcasecmp(subcmd, "query")) { + calendar_query(); + return; + } + + if (!strcasecmp(subcmd, "respond")) { + msgnum = extract_long(argbuf, 1); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); + extract_token(action, argbuf, 3, '|', sizeof action); + ical_respond(msgnum, partnum, action); + return; + } + + if (!strcasecmp(subcmd, "handle_rsvp")) { + msgnum = extract_long(argbuf, 1); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); + extract_token(action, argbuf, 3, '|', sizeof action); + ical_handle_rsvp(msgnum, partnum, action); + return; + } + + if (!strcasecmp(subcmd, "conflicts")) { + msgnum = extract_long(argbuf, 1); + extract_token(partnum, argbuf, 2, '|', sizeof partnum); + ical_conflicts(msgnum, partnum); + return; + } + + if (!strcasecmp(subcmd, "getics")) { + ical_getics(); + return; + } + + if (!strcasecmp(subcmd, "putics")) { + ical_putics(); + return; + } + + cprintf("%d Invalid subcommand\n", ERROR + CMD_NOT_SUPPORTED); +} + + // Initialization function, called from modules_init.c char *ctdl_module_init_calendar(void) { if (!threading) {