X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=2c9419692e3e0154b625bb9290e01a17f57b74a8;hb=7273f3d88e0e7be7cc06313835c5f50827fc4f91;hp=cfafb7f2828a67c47be14db2161fbcca6f203936;hpb=325bec5faa05ddcb8163d823df01426731fd9a3e;p=citadel.git diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index cfafb7f28..2c9419692 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -1,38 +1,36 @@ /* - * $Id$ - * * This module implements iCalendar object processing and the Calendar> * room on a Citadel server. It handles iCalendar objects using the * iTIP protocol. See RFCs 2445 and 2446. * + * + * Copyright (c) 1987-2011 by the citadel.org team + * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" -#include "sysdep.h" -#include -#include -#include -#include -#include -#include -#ifdef HAVE_STRINGS_H -#include -#endif +#include "ctdl_module.h" + #include -#include -#include "citadel.h" -#include "server.h" -#include "citserver.h" -#include "support.h" -#include "config.h" -#include "user_ops.h" -#include "room_ops.h" + #include "msgbase.h" #include "internet_addressing.h" #include "serv_calendar.h" #include "euidindex.h" -#include "ctdl_module.h" #include "ical_dezonify.h" @@ -52,7 +50,7 @@ icalcomponent *icalcomponent_new_citadel_vcalendar(void) { encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { - CtdlLogPrintf(CTDL_CRIT, "ERROR: could not allocate component!\n"); + syslog(LOG_CRIT, "ERROR: could not allocate component!\n"); return NULL; } @@ -181,6 +179,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) { icalparameter *partstat = NULL; char *serialized_reply = NULL; char *reply_message_text = NULL; + const char *ch; struct CtdlMessage *msg = NULL; struct recptypes *valid = NULL; @@ -188,13 +187,13 @@ void ical_send_a_reply(icalcomponent *request, char *action) { strcpy(summary_string, "Calendar item"); if (request == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n"); + syslog(LOG_ERR, "ERROR: trying to reply to NULL event?\n"); return; } the_reply = icalcomponent_new_clone(request); if (the_reply == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: cannot clone request\n"); + syslog(LOG_ERR, "ERROR: cannot clone request\n"); return; } @@ -210,22 +209,20 @@ void ical_send_a_reply(icalcomponent *request, char *action) { while (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY), (attendee != NULL) ) { - if (icalproperty_get_attendee(attendee)) { - strcpy(attendee_string, - icalproperty_get_attendee(attendee) ); - if (!strncasecmp(attendee_string, "MAILTO:", 7)) { - strcpy(attendee_string, &attendee_string[7]); - striplt(attendee_string); - recp = validate_recipients(attendee_string, NULL, 0); - if (recp != NULL) { - if (!strcasecmp(recp->recp_local, CC->user.fullname)) { - if (me_attend) icalproperty_free(me_attend); - me_attend = icalproperty_new_clone(attendee); - } - free_recipients(recp); + ch = icalproperty_get_attendee(attendee); + if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) { + safestrncpy(attendee_string, ch + 7, sizeof (attendee_string)); + striplt(attendee_string); + recp = validate_recipients(attendee_string, NULL, 0); + if (recp != NULL) { + if (!strcasecmp(recp->recp_local, CC->user.fullname)) { + if (me_attend) icalproperty_free(me_attend); + me_attend = icalproperty_new_clone(attendee); } + free_recipients(recp); } } + /* Remove it... */ icalcomponent_remove_property(vevent, attendee); icalproperty_free(attendee); @@ -316,7 +313,8 @@ void ical_send_a_reply(icalcomponent *request, char *action) { /* * Callback function for mime parser that hunts for calendar content types - * and turns them into calendar objects + * and turns them into calendar objects. If something is found, it is placed + * in ird->cal, and the caller now owns that memory and is responsible for freeing it. */ void ical_locate_part(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, @@ -539,10 +537,13 @@ STARTOVER: /* Check to see if these two attendees match... */ - if (!strcasecmp( - icalproperty_get_attendee(e_attendee), - icalproperty_get_attendee(r_attendee) - )) { + const char *e, *r; + e = icalproperty_get_attendee(e_attendee); + r = icalproperty_get_attendee(r_attendee); + + if ((e != NULL) && + (r != NULL) && + !strcasecmp(e, r)) { /* ...and if they do, remove the attendee from the event * and replace it with the attendee from the reply. (The * reply's copy will have the same address, but an updated @@ -595,13 +596,13 @@ 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); - CtdlLogPrintf(CTDL_DEBUG, "UID of event being replied to is <%s>\n", uid); + syslog(LOG_DEBUG, "UID of event being replied to is <%s>\n", uid); strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->room, USERCALENDARROOM) != 0) { - getroom(&CC->room, hold_rm); - CtdlLogPrintf(CTDL_CRIT, "cannot get user calendar room\n"); + if (CtdlGetRoom(&CC->room, USERCALENDARROOM) != 0) { + CtdlGetRoom(&CC->room, hold_rm); + syslog(LOG_CRIT, "cannot get user calendar room\n"); return(2); } @@ -611,11 +612,11 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { * Citadel always sets the message EUID to the iCalendar UID of * the event, this will work. */ - msgnum_being_replaced = locate_message_by_euid(uid, &CC->room); + msgnum_being_replaced = CtdlLocateMessageByEuid(uid, &CC->room); - getroom(&CC->room, hold_rm); /* return to saved room */ + CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ - CtdlLogPrintf(CTDL_DEBUG, "msgnum_being_replaced == %ld\n", msgnum_being_replaced); + syslog(LOG_DEBUG, "msgnum_being_replaced == %ld\n", msgnum_being_replaced); if (msgnum_being_replaced == 0) { return(1); /* no calendar event found */ } @@ -642,7 +643,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { original_event = oec.c; if (original_event == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: Original_component is NULL.\n"); + syslog(LOG_ERR, "ERROR: Original_component is NULL.\n"); return(2); } @@ -654,7 +655,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) { icalcomponent_free(original_event); /* Don't need this anymore. */ if (serialized_event == NULL) return(2); - MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); + CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); message_text = malloc(strlen(serialized_event) + SIZ); if (message_text != NULL) { @@ -807,51 +808,64 @@ int ical_ctdl_is_overlap( struct icaltimetype t2start, struct icaltimetype t2end ) { - if (icaltime_is_null_time(t1start)) return(0); if (icaltime_is_null_time(t2start)) return(0); - /* First, check for all-day events */ - if (t1start.is_date) { - if (!icaltime_compare_date_only(t1start, t2start)) { - return(1); - } - if (!icaltime_is_null_time(t2end)) { - if (!icaltime_compare_date_only(t1start, t2end)) { - return(1); - } + /* if either event lacks end time, assume end = start */ + if (icaltime_is_null_time(t1end)) + memcpy(&t1end, &t1start, sizeof(struct icaltimetype)); + else { + if (t1end.is_date && icaltime_compare(t1start, t1end)) { + /* + * the end date is non-inclusive so adjust it by one + * day because our test is inclusive, note that a day is + * not too much because we are talking about all day + * events + * if start = end we assume that nevertheless the whole + * day is meant + */ + icaltime_adjust(&t1end, -1, 0, 0, 0); } } - if (t2start.is_date) { - if (!icaltime_compare_date_only(t2start, t1start)) { - return(1); - } - if (!icaltime_is_null_time(t1end)) { - if (!icaltime_compare_date_only(t2start, t1end)) { - return(1); - } + if (icaltime_is_null_time(t2end)) + memcpy(&t2end, &t2start, sizeof(struct icaltimetype)); + else { + if (t2end.is_date && icaltime_compare(t2start, t2end)) { + icaltime_adjust(&t2end, -1, 0, 0, 0); } } - /* Now check for overlaps using date *and* time. */ + /* 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 (icaltime_compare_date_only(t1end, t2start) < 0) return(0); + + /* 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 \n", + t1start.hour, t1start.minute, t1end.hour, t1end.minute, + t2start.hour, t2start.minute, t2end.hour, t2end.minute); + */ - /* First, bail out if either event 1 or event 2 is missing end time. */ - if (icaltime_is_null_time(t1end)) return(0); - if (icaltime_is_null_time(t2end)) return(0); + /* Now check for overlaps using date *and* time. */ /* If event 1 ends before event 2 starts, we're in the clear. */ if (icaltime_compare(t1end, t2start) <= 0) return(0); + /* syslog(LOG_DEBUG, "first passed\n"); */ /* If event 2 ends before event 1 starts, we're also ok. */ if (icaltime_compare(t2end, t1start) <= 0) return(0); + /* syslog(LOG_DEBUG, "second passed\n"); */ /* Otherwise, they overlap. */ return(1); } - - /* * Phase 6 of "hunt for conflicts" * called by ical_conflicts_phase5() @@ -874,14 +888,14 @@ int ical_conflicts_phase6(struct icaltimetype t1start, /* debugging cruft * time_t tt; - tt = icaltime_as_timet(t1start); - CtdlLogPrintf(CTDL_DEBUG, "PROPOSED START: %s", ctime(&tt)); - tt = icaltime_as_timet(t1end); - CtdlLogPrintf(CTDL_DEBUG, " PROPOSED END: %s", ctime(&tt)); - tt = icaltime_as_timet(t2start); - CtdlLogPrintf(CTDL_DEBUG, "EXISTING START: %s", ctime(&tt)); - tt = icaltime_as_timet(t2end); - CtdlLogPrintf(CTDL_DEBUG, " EXISTING END: %s", ctime(&tt)); + tt = icaltime_as_timet_with_zone(t1start, t1start.zone); + syslog(LOG_DEBUG, "PROPOSED START: %s", ctime(&tt)); + tt = icaltime_as_timet_with_zone(t1end, t1end.zone); + syslog(LOG_DEBUG, " PROPOSED END: %s", ctime(&tt)); + tt = icaltime_as_timet_with_zone(t2start, t2start.zone); + syslog(LOG_DEBUG, "EXISTING START: %s", ctime(&tt)); + tt = icaltime_as_timet_with_zone(t2end, t2end.zone); + syslog(LOG_DEBUG, " EXISTING END: %s", ctime(&tt)); * debugging cruft */ /* compare and output */ @@ -939,18 +953,47 @@ void ical_conflicts_phase5(struct icaltimetype t1start, p = ical_ctdl_get_subprop(existing_event, ICAL_DTSTART_PROPERTY); if (p == NULL) return; if (p != NULL) t2start = icalproperty_get_dtstart(p); + if (icaltime_is_utc(t2start)) { + t2start.zone = icaltimezone_get_utc_timezone(); + } + else { + t2start.zone = icalcomponent_get_timezone(existing_event, + icalparameter_get_tzid( + icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) + ) + ); + if (!t2start.zone) { + t2start.zone = get_default_icaltimezone(); + } + } p = ical_ctdl_get_subprop(existing_event, ICAL_DTEND_PROPERTY); if (p != NULL) { t2end = icalproperty_get_dtend(p); + + if (icaltime_is_utc(t2end)) { + t2end.zone = icaltimezone_get_utc_timezone(); + } + else { + t2end.zone = icalcomponent_get_timezone(existing_event, + icalparameter_get_tzid( + icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) + ) + ); + if (!t2end.zone) { + t2end.zone = get_default_icaltimezone(); + } + } dur = icaltime_subtract(t2end, t2start); } + else { + memset (&dur, 0, sizeof(struct icaldurationtype)); + } rrule = ical_ctdl_get_subprop(existing_event, ICAL_RRULE_PROPERTY); if (rrule) { recur = icalproperty_get_rrule(rrule); ritr = icalrecur_iterator_new(recur, t2start); - CtdlLogPrintf(CTDL_DEBUG, "Recurrence found: %s\n", icalrecurrencetype_as_string(&recur)); } do { @@ -967,26 +1010,25 @@ 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)) { - CtdlLogPrintf(CTDL_DEBUG, "Hit a conflict after %d iterations\n", num_recur); - num_recur = MAX_RECUR + 1; /* force it out of scope */ + num_recur = MAX_RECUR + 1; /* force it out of scope, no need to continue */ } if (rrule) { t2start = icalrecur_iterator_next(ritr); if (!icaltime_is_null_time(t2end)) { + const icaltimezone *hold_zone = t2end.zone; t2end = icaltime_add(t2start, dur); + t2end.zone = hold_zone; } ++num_recur; } if (icaltime_compare(t2start, t1end) < 0) { - CtdlLogPrintf(CTDL_DEBUG, "Went out of scope after %d iterations\n", num_recur); num_recur = MAX_RECUR + 1; /* force it out of scope */ } } while ( (rrule) && (!icaltime_is_null_time(t2start)) && (num_recur < MAX_RECUR) ); icalrecur_iterator_free(ritr); - if (num_recur > 0) CtdlLogPrintf(CTDL_DEBUG, "Iterated over existing event %d times.\n", num_recur); } @@ -1017,25 +1059,58 @@ void ical_conflicts_phase4(icalcomponent *proposed_event, int num_recur = 0; /* initialization */ - strcpy(compare_uid, ""); + *compare_uid = '\0'; /* proposed event stuff */ p = ical_ctdl_get_subprop(proposed_event, ICAL_DTSTART_PROPERTY); - if (p == NULL) return; - if (p != NULL) t1start = icalproperty_get_dtstart(p); + if (p == NULL) + return; + else + t1start = icalproperty_get_dtstart(p); + + if (icaltime_is_utc(t1start)) { + t1start.zone = icaltimezone_get_utc_timezone(); + } + else { + t1start.zone = icalcomponent_get_timezone(proposed_event, + icalparameter_get_tzid( + icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) + ) + ); + if (!t1start.zone) { + t1start.zone = get_default_icaltimezone(); + } + } p = ical_ctdl_get_subprop(proposed_event, ICAL_DTEND_PROPERTY); if (p != NULL) { t1end = icalproperty_get_dtend(p); + + if (icaltime_is_utc(t1end)) { + t1end.zone = icaltimezone_get_utc_timezone(); + } + else { + t1end.zone = icalcomponent_get_timezone(proposed_event, + icalparameter_get_tzid( + icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) + ) + ); + if (!t1end.zone) { + t1end.zone = get_default_icaltimezone(); + } + } + dur = icaltime_subtract(t1end, t1start); } + else { + memset (&dur, 0, sizeof(struct icaldurationtype)); + } rrule = ical_ctdl_get_subprop(proposed_event, ICAL_RRULE_PROPERTY); if (rrule) { recur = icalproperty_get_rrule(rrule); ritr = icalrecur_iterator_new(recur, t1start); - CtdlLogPrintf(CTDL_DEBUG, "Recurrence found: %s\n", icalrecurrencetype_as_string(&recur)); } p = ical_ctdl_get_subprop(proposed_event, ICAL_UID_PROPERTY); @@ -1049,14 +1124,15 @@ void ical_conflicts_phase4(icalcomponent *proposed_event, if (rrule) { t1start = icalrecur_iterator_next(ritr); if (!icaltime_is_null_time(t1end)) { + const icaltimezone *hold_zone = t1end.zone; t1end = icaltime_add(t1start, dur); + t1end.zone = hold_zone; } ++num_recur; } } while ( (rrule) && (!icaltime_is_null_time(t1start)) && (num_recur < MAX_RECUR) ); icalrecur_iterator_free(ritr); - if (num_recur > 0) CtdlLogPrintf(CTDL_DEBUG, "Iterated over proposed event %d times.\n", num_recur); } @@ -1105,8 +1181,8 @@ void ical_hunt_for_conflicts(icalcomponent *cal) { strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->room, USERCALENDARROOM) != 0) { - getroom(&CC->room, hold_rm); + if (CtdlGetRoom(&CC->room, USERCALENDARROOM) != 0) { + CtdlGetRoom(&CC->room, hold_rm); cprintf("%d You do not have a calendar.\n", ERROR + ROOM_NOT_FOUND); return; } @@ -1121,7 +1197,7 @@ void ical_hunt_for_conflicts(icalcomponent *cal) { ); cprintf("000\n"); - getroom(&CC->room, hold_rm); /* return to saved room */ + CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ } @@ -1136,7 +1212,7 @@ void ical_conflicts(long msgnum, char *partnum) { msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { - cprintf("%d Message %ld not found.\n", + cprintf("%d Message %ld not found\n", ERROR + ILLEGAL_VALUE, (long)msgnum ); @@ -1160,35 +1236,38 @@ void ical_conflicts(long msgnum, char *partnum) { icalcomponent_free(ird.cal); return; } - else { - cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); - return; - } - /* should never get here */ + cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); } /* * 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 *cal) { +void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) { + icalcomponent *cal; icalproperty *p; icalvalue *v; - struct icalperiodtype my_period; + struct icalperiodtype this_event_period = icalperiodtype_null_period(); + icaltimetype dtstart; + icaltimetype dtend; - if (cal == NULL) return; - my_period = icalperiodtype_null_period(); + /* recur variables */ + icalproperty *rrule = NULL; + struct icalrecurrencetype recur; + icalrecur_iterator *ritr = NULL; + struct icaldurationtype dur; + int num_recur = 0; - if (icalcomponent_isa(cal) != ICAL_VEVENT_COMPONENT) { - ical_add_to_freebusy(fb, - icalcomponent_get_first_component( - cal, ICAL_VEVENT_COMPONENT - ) - ); - return; - } + if (!top_level_cal) return; + + /* 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. @@ -1203,58 +1282,103 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) { } } - /* Convert the DTSTART and DTEND properties to an icalperiod. */ + /* + * Now begin calculating the event start and end times. + */ 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) - ); + if (!p) return; + dtstart = icalproperty_get_dtstart(p); - /* 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) ); + if (icaltime_is_utc(dtstart)) { + dtstart.zone = icaltimezone_get_utc_timezone(); } else { - if (icaltime_compare( - icalcomponent_get_dtstart(cal), - icalcomponent_get_dtstart(fb) - ) < 0) { - icalcomponent_set_dtstart(fb, - icalcomponent_get_dtstart(cal) ); + dtstart.zone = icalcomponent_get_timezone(top_level_cal, + icalparameter_get_tzid( + icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) + ) + ); + if (!dtstart.zone) { + dtstart.zone = get_default_icaltimezone(); } } - /* 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) ); + dtend = icalcomponent_get_dtend(cal); + if (!icaltime_is_null_time(dtend)) { + dur = icaltime_subtract(dtend, dtstart); } else { - if (icaltime_compare( - icalcomponent_get_dtend(cal), - icalcomponent_get_dtend(fb) - ) > 0) { - icalcomponent_set_dtend(fb, - icalcomponent_get_dtend(cal) ); - } + memset (&dur, 0, sizeof(struct icaldurationtype)); + } + + /* 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); + ritr = icalrecur_iterator_new(recur, dtstart); } + do { + /* 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. + */ + this_event_period.start = icaltime_convert_to_zone( + this_event_period.start, + icaltimezone_get_utc_timezone() + ); + this_event_period.end = icaltime_convert_to_zone( + this_event_period.end, + icaltimezone_get_utc_timezone() + ); + + /* 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*. + */ + p = icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY); + if (p == NULL) { + icalcomponent_set_dtstart(fb, this_event_period.start); + } + else { + if (icaltime_compare(this_event_period.start, icalcomponent_get_dtstart(fb)) < 0) { + icalcomponent_set_dtstart(fb, this_event_period.start); + } + } + + /* 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); + } + else { + if (icaltime_compare(this_event_period.end, icalcomponent_get_dtend(fb)) > 0) { + icalcomponent_set_dtend(fb, this_event_period.end); + } + } + + if (rrule) { + dtstart = icalrecur_iterator_next(ritr); + if (!icaltime_is_null_time(dtend)) { + dtend = icaltime_add(dtstart, dur); + dtend.zone = dtstart.zone; + dtend.is_utc = dtstart.is_utc; + } + ++num_recur; + } + + } while ( (rrule) && (!icaltime_is_null_time(dtstart)) && (num_recur < MAX_RECUR) ) ; + icalrecur_iterator_free(ritr); } @@ -1268,11 +1392,11 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) { * */ void ical_freebusy_backend(long msgnum, void *data) { - icalcomponent *cal; + icalcomponent *fb; struct CtdlMessage *msg = NULL; struct ical_respond_data ird; - cal = (icalcomponent *)data; + fb = (icalcomponent *)data; /* User-supplied data will be the VFREEBUSY component */ msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) return; @@ -1287,12 +1411,10 @@ void ical_freebusy_backend(long msgnum, void *data) { ); CtdlFreeMessage(msg); - if (ird.cal == NULL) return; - - ical_add_to_freebusy(cal, ird.cal); - - /* Now free the memory. */ - icalcomponent_free(ird.cal); + if (ird.cal) { + ical_add_to_freebusy(fb, ird.cal); /* Add VEVENT times to VFREEBUSY */ + icalcomponent_free(ird.cal); + } } @@ -1316,16 +1438,16 @@ void ical_freebusy(char *who) { int config_lines = 0; /* First try an exact match. */ - found_user = getuser(&usbuf, who); + found_user = CtdlGetUser(&usbuf, who); /* If not found, try it as an unqualified email address. */ if (found_user != 0) { strcpy(buf, who); recp = validate_recipients(buf, NULL, 0); - CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", buf); + syslog(LOG_DEBUG, "Trying <%s>\n", buf); if (recp != NULL) { if (recp->num_local == 1) { - found_user = getuser(&usbuf, recp->recp_local); + found_user = CtdlGetUser(&usbuf, recp->recp_local); } free_recipients(recp); } @@ -1336,11 +1458,11 @@ void ical_freebusy(char *who) { */ if (found_user != 0) { snprintf(buf, sizeof buf, "%s@%s", who, config.c_fqdn); - CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", buf); + syslog(LOG_DEBUG, "Trying <%s>\n", buf); recp = validate_recipients(buf, NULL, 0); if (recp != NULL) { if (recp->num_local == 1) { - found_user = getuser(&usbuf, recp->recp_local); + found_user = CtdlGetUser(&usbuf, recp->recp_local); } free_recipients(recp); } @@ -1359,11 +1481,11 @@ void ical_freebusy(char *who) { if ( (!strcasecmp(type, "localhost")) || (!strcasecmp(type, "directory")) ) { snprintf(buf, sizeof buf, "%s@%s", who, host); - CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", buf); + syslog(LOG_DEBUG, "Trying <%s>\n", buf); recp = validate_recipients(buf, NULL, 0); if (recp != NULL) { if (recp->num_local == 1) { - found_user = getuser(&usbuf, recp->recp_local); + found_user = CtdlGetUser(&usbuf, recp->recp_local); } free_recipients(recp); } @@ -1376,24 +1498,24 @@ void ical_freebusy(char *who) { return; } - MailboxName(calendar_room_name, sizeof calendar_room_name, + CtdlMailboxName(calendar_room_name, sizeof calendar_room_name, &usbuf, USERCALENDARROOM); strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->room, calendar_room_name) != 0) { + if (CtdlGetRoom(&CC->room, calendar_room_name) != 0) { cprintf("%d Cannot open calendar\n", ERROR + ROOM_NOT_FOUND); - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); return; } /* Create a VFREEBUSY subcomponent */ - CtdlLogPrintf(CTDL_DEBUG, "Creating VFREEBUSY component\n"); + syslog(LOG_DEBUG, "Creating VFREEBUSY component\n"); fb = icalcomponent_new_vfreebusy(); if (fb == NULL) { cprintf("%d Internal error: cannot allocate memory.\n", ERROR + INTERNAL_ERROR); - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); return; } @@ -1415,7 +1537,7 @@ void ical_freebusy(char *who) { icalcomponent_add_property(fb, icalproperty_new_organizer(buf)); /* Add busy time from events */ - CtdlLogPrintf(CTDL_DEBUG, "Adding busy time from events\n"); + syslog(LOG_DEBUG, "Adding busy time from events\n"); CtdlForEachMessage(MSGS_ALL, 0, NULL, NULL, NULL, ical_freebusy_backend, (void *)fb ); /* If values for DTSTART and DTEND are still not present, set them @@ -1429,26 +1551,26 @@ void ical_freebusy(char *who) { } /* Put the freebusy component into the calendar component */ - CtdlLogPrintf(CTDL_DEBUG, "Encapsulating\n"); + syslog(LOG_DEBUG, "Encapsulating\n"); encaps = ical_encapsulate_subcomponent(fb); if (encaps == NULL) { icalcomponent_free(fb); cprintf("%d Internal error: cannot allocate memory.\n", ERROR + INTERNAL_ERROR); - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); return; } /* Set the method to PUBLISH */ - CtdlLogPrintf(CTDL_DEBUG, "Setting method\n"); + syslog(LOG_DEBUG, "Setting method\n"); icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH); /* Serialize it */ - CtdlLogPrintf(CTDL_DEBUG, "Serializing\n"); + syslog(LOG_DEBUG, "Serializing\n"); serialized_request = icalcomponent_as_ical_string_r(encaps); icalcomponent_free(encaps); /* Don't need this anymore. */ - cprintf("%d Here is the free/busy data:\n", LISTING_FOLLOWS); + cprintf("%d Free/busy for %s\n", LISTING_FOLLOWS, usbuf.fullname); if (serialized_request != NULL) { client_write(serialized_request, strlen(serialized_request)); free(serialized_request); @@ -1456,7 +1578,7 @@ void ical_freebusy(char *who) { cprintf("\n000\n"); /* Go back to the room from which we came... */ - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); } @@ -1553,7 +1675,7 @@ void ical_getics(void) encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { - CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n"); + syslog(LOG_ALERT, "ERROR: could not allocate component!\n"); cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR); return; } @@ -1596,7 +1718,7 @@ void ical_putics_grabtzids(icalparameter *param, void *data) HashList *keys = (HashList *) data; if ( (keys) && (tzid) && (!IsEmptyStr(tzid)) ) { - Put(keys, tzid, strlen(tzid), strdup(tzid), generic_free_handler); + Put(keys, tzid, strlen(tzid), strdup(tzid), NULL); } } @@ -1631,7 +1753,7 @@ void ical_putics(void) } cprintf("%d Transmit data now\n", SEND_LISTING); - calstream = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0); + calstream = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); if (calstream == NULL) { return; } @@ -1679,7 +1801,7 @@ void ical_putics(void) HashPos = GetNewHashPos(tzidlist, 0); while (GetNextHashPos(tzidlist, HashPos, &len, &Key, &Value)) { - CtdlLogPrintf(CTDL_DEBUG, "Attaching timezone '%s'\n", Value); + syslog(LOG_DEBUG, "Attaching timezone '%s'\n", (char*) Value); icaltimezone *t = NULL; /* First look for a timezone attached to the original calendar */ @@ -1794,22 +1916,22 @@ void cmd_ical(char *argbuf) /* * We don't know if the calendar room exists so we just create it at login */ -void ical_create_room(void) +void ical_CtdlCreateRoom(void) { struct ctdlroom qr; - struct visit vbuf; + visit vbuf; /* Create the calendar room if it doesn't already exist */ - create_room(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR); + CtdlCreateRoom(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR); /* Set expiration policy to manual; otherwise objects will be lost! */ - if (lgetroom(&qr, USERCALENDARROOM)) { - CtdlLogPrintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); + if (CtdlGetRoomLock(&qr, USERCALENDARROOM)) { + syslog(LOG_CRIT, "Couldn't get the user calendar room!\n"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; qr.QRdefaultview = VIEW_CALENDAR; /* 3 = calendar view */ - lputroom(&qr); + CtdlPutRoomLock(&qr); /* Set the view to a calendar view */ CtdlGetRelationship(&vbuf, &CC->user, &qr); @@ -1817,16 +1939,16 @@ void ical_create_room(void) CtdlSetRelationship(&vbuf, &CC->user, &qr); /* Create the tasks list room if it doesn't already exist */ - create_room(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS); + CtdlCreateRoom(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS); /* Set expiration policy to manual; otherwise objects will be lost! */ - if (lgetroom(&qr, USERTASKSROOM)) { - CtdlLogPrintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); + if (CtdlGetRoomLock(&qr, USERTASKSROOM)) { + syslog(LOG_CRIT, "Couldn't get the user calendar room!\n"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; qr.QRdefaultview = VIEW_TASKS; - lputroom(&qr); + CtdlPutRoomLock(&qr); /* Set the view to a task list view */ CtdlGetRelationship(&vbuf, &CC->user, &qr); @@ -1834,16 +1956,16 @@ void ical_create_room(void) CtdlSetRelationship(&vbuf, &CC->user, &qr); /* Create the notes room if it doesn't already exist */ - create_room(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES); + CtdlCreateRoom(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES); /* Set expiration policy to manual; otherwise objects will be lost! */ - if (lgetroom(&qr, USERNOTESROOM)) { - CtdlLogPrintf(CTDL_CRIT, "Couldn't get the user calendar room!\n"); + if (CtdlGetRoomLock(&qr, USERNOTESROOM)) { + syslog(LOG_CRIT, "Couldn't get the user calendar room!\n"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; qr.QRdefaultview = VIEW_NOTES; - lputroom(&qr); + CtdlPutRoomLock(&qr); /* Set the view to a notes view */ CtdlGetRelationship(&vbuf, &CC->user, &qr); @@ -1878,14 +2000,16 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) size_t reqsize; icalproperty *p; struct icaltimetype t; - icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL }; + const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL }; int i; - icaltimezone *z; + const icaltimezone *z; int num_zones_attached = 0; int zone_already_attached; + icalparameter *tzidp = NULL; + const char *tzidc = NULL; if (cal == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n"); + syslog(LOG_ERR, "ERROR: trying to reply to NULL event?\n"); return; } @@ -1903,7 +2027,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) /* Clone the event */ the_request = icalcomponent_new_clone(cal); if (the_request == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: cannot clone calendar object\n"); + syslog(LOG_ERR, "ERROR: cannot clone calendar object\n"); return; } @@ -1922,24 +2046,22 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) /* 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)) { - if (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]); - - 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 + 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! */ + snprintf(&attendees_string[strlen(attendees_string)], + sizeof(attendees_string) - strlen(attendees_string), + "%s, ", + this_attendee ); - ++num_attendees; - } + ++num_attendees; } } } - CtdlLogPrintf(CTDL_DEBUG, "<%d> attendees: <%s>\n", num_attendees, attendees_string); + syslog(LOG_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! @@ -1952,7 +2074,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) /* Encapsulate the VEVENT component into a complete VCALENDAR */ encaps = icalcomponent_new_vcalendar(); if (encaps == NULL) { - CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n"); + syslog(LOG_ALERT, "ERROR: could not allocate component!\n"); icalcomponent_free(the_request); return; } @@ -1986,9 +2108,15 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY) ) { t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them - CtdlLogPrintf(CTDL_DEBUG, "Found an icaltimetype: %s\n", - icaltime_as_ical_string(t) - ); + + /* 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); + } + else { + tzidc = NULL; + } /* First see if there's a timezone attached to the data structure itself */ if (icaltime_is_utc(t)) { @@ -1997,40 +2125,29 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) else { z = icaltime_get_timezone(t); } - if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone is present in data structure\n"); /* If not, try to determine the tzid from the parameter using attached zones */ - if (!z) { - z = icalcomponent_get_timezone(top_level_cal, - icalparameter_get_tzid( - icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) - ) - ); - if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in attached zones\n"); + if ((!z) && (tzidc)) { + z = icalcomponent_get_timezone(top_level_cal, tzidc); } /* Still no good? Try our internal database */ - if (!z) { - z = icaltimezone_get_builtin_timezone_from_tzid( - icalparameter_get_tzid( - icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER) - ) - ); - if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in internal db\n"); + if ((!z) && (tzidc)) { + z = icaltimezone_get_builtin_timezone_from_tzid(tzidc); } if (z) { - CtdlLogPrintf(CTDL_DEBUG, "Have valid timezone, need to attach it.\n"); + /* 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. */ ++zone_already_attached; - CtdlLogPrintf(CTDL_DEBUG, "zone already attached!!\n"); } } if ((!zone_already_attached) && (num_zones_attached < 5)) { - CtdlLogPrintf(CTDL_DEBUG, "attach zone %d\n", num_zones_attached); + /* This is a new one, so attach it. */ attached_zones[num_zones_attached++] = z; } @@ -2059,8 +2176,6 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) icalcomponent_free(encaps); /* Don't need this anymore. */ if (serialized_request == NULL) return; - CtdlLogPrintf(CTDL_DEBUG, "SENDING INVITATIONS:\n%s\n", serialized_request); - reqsize = strlen(serialized_request) + SIZ; request_message_text = malloc(reqsize); if (request_message_text != NULL) { @@ -2069,16 +2184,20 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) serialized_request ); - msg = CtdlMakeMessage(&CC->user, - "", /* No single recipient here */ - "", /* No single recipient here */ - CC->room.QRname, 0, FMT_RFC822, - "", - "", + msg = CtdlMakeMessage( + &CC->user, + NULL, /* No single recipient here */ + NULL, /* No single recipient here */ + CC->room.QRname, + 0, + FMT_RFC822, + NULL, + NULL, summary_string, /* Use summary for subject */ NULL, request_message_text, - NULL); + NULL + ); if (msg != NULL) { valid = validate_recipients(attendees_string, NULL, 0); @@ -2107,7 +2226,7 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) { icalproperty *organizer = NULL; char organizer_string[SIZ]; - CtdlLogPrintf(CTDL_DEBUG, "ical_saving_vevent() has been called!\n"); + syslog(LOG_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) { @@ -2222,7 +2341,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, free(msg->cm_fields['E']); } msg->cm_fields['E'] = strdup(buf); - CtdlLogPrintf(CTDL_DEBUG, "Saving calendar UID <%s>\n", buf); + syslog(LOG_DEBUG, "Saving calendar UID <%s>\n", buf); } } @@ -2235,7 +2354,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum, if (msg->cm_fields['U'] != NULL) { free(msg->cm_fields['U']); } - msg->cm_fields['U'] = strdup(buf); + msg->cm_fields['U'] = rfc2047encode(buf, strlen(buf)); } } @@ -2283,7 +2402,7 @@ int ical_obj_beforesave(struct CtdlMessage *msg) /* It must be an RFC822 message! */ if (msg->cm_format_type != 4) { - CtdlLogPrintf(CTDL_DEBUG, "Rejecting non-RFC822 message\n"); + syslog(LOG_DEBUG, "Rejecting non-RFC822 message\n"); return(1); /* You tried to save a non-RFC822 message! */ } @@ -2349,7 +2468,7 @@ int ical_obj_aftersave(struct CtdlMessage *msg) */ /* First determine if this is our room */ - MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); + CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM); if (strcasecmp(roomname, CC->room.QRname)) { return(0); /* Not the Calendar room -- don't do anything. */ } @@ -2392,6 +2511,7 @@ void ical_fixed_output_backend(icalcomponent *cal, icalcomponent *c; icalproperty *p; char buf[256]; + const char *ch; p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY); if (p != NULL) { @@ -2410,11 +2530,12 @@ void ical_fixed_output_backend(icalcomponent *cal, /* 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)) { + ch = icalproperty_get_attendee(p); + if ((ch != NULL) && + !strncasecmp(ch, "MAILTO:", 7)) { /* screen name or email address */ - strcpy(buf, &buf[7]); + safestrncpy(buf, ch + 7, sizeof(buf)); striplt(buf); cprintf("%s ", buf); } @@ -2480,7 +2601,7 @@ CTDL_MODULE_INIT(calendar) /* Initialize our hook functions */ CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE); CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE); - CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN); + CtdlRegisterSessionHook(ical_CtdlCreateRoom, EVT_LOGIN); CtdlRegisterProtoHook(cmd_ical, "ICAL", "Citadel iCal commands"); CtdlRegisterSessionHook(ical_session_startup, EVT_START); CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP); @@ -2489,6 +2610,6 @@ CTDL_MODULE_INIT(calendar) CtdlRegisterCleanupHook(serv_calendar_destroy); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "calendar"; }