/*
* 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,
*
* 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.
*/
-void ical_conflicts_phase6(struct icaltimetype t1start,
+int ical_conflicts_phase6(struct icaltimetype t1start,
struct icaltimetype t1end,
struct icaltimetype t2start,
struct icaltimetype t2end,
char *conflict_event_summary,
char *compare_uid)
{
-
- /* 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));
+ int conflict_reported = 0;
+
+ /* debugging cruft *
+ time_t tt;
+ tt = icaltime_as_timet_with_zone(t1start, t1start.zone);
+ CtdlLogPrintf(CTDL_DEBUG, "PROPOSED START: %s", ctime(&tt));
+ tt = icaltime_as_timet_with_zone(t1end, t1end.zone);
+ CtdlLogPrintf(CTDL_DEBUG, " PROPOSED END: %s", ctime(&tt));
+ tt = icaltime_as_timet_with_zone(t2start, t2start.zone);
+ CtdlLogPrintf(CTDL_DEBUG, "EXISTING START: %s", ctime(&tt));
+ tt = icaltime_as_timet_with_zone(t2end, t2end.zone);
+ CtdlLogPrintf(CTDL_DEBUG, " EXISTING END: %s", ctime(&tt));
+ * debugging cruft */
/* compare and output */
conflict_event_uid))) ? 1 : 0
)
);
+ conflict_reported = 1;
}
+ return(conflict_reported);
}
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);
}
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 {
strcpy(conflict_event_summary, icalproperty_get_comment(p));
}
- ical_conflicts_phase6(t1start, t1end, t2start, t2end,
- existing_msgnum, conflict_event_uid, conflict_event_summary, compare_uid
- );
+ 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 */
+ }
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) {
+ 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);
}
p = ical_ctdl_get_subprop(proposed_event, ICAL_DTSTART_PROPERTY);
if (p == NULL) return;
if (p != NULL) 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);
}
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);
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);
}
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
);
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 = icaltime_null_time();
+ icaltimetype dtend = icaltime_null_time();
- 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.
}
}
- /* 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);
- }
+ if (!p) return;
+ dtstart = icalproperty_get_dtstart(p);
- p = icalcomponent_get_first_property(cal, ICAL_DTEND_PROPERTY);
- if (p != NULL) {
- my_period.end = icalproperty_get_dtstart(p);
- }
-
- /* Now add it. */
- icalcomponent_add_property(fb,
- icalproperty_new_freebusy(my_period)
- );
-
- /* Make sure the DTSTART property of the freebusy *list* is set to
- * the DTSTART property of the *earliest event*.
- */
- p = icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY);
- if (p == NULL) {
- icalcomponent_set_dtstart(fb,
- icalcomponent_get_dtstart(cal) );
+ 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();
}
}
+ // FIXME do more here
- /* 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) );
- }
+
+ /* 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 {
+
+
+ // FIXME add timezone conversion, we are currently outputting floating times
+
+ CtdlLogPrintf(CTDL_DEBUG, "Start, utc=%d, %s\n",
+ dtstart.is_utc,
+ icaltime_as_ical_string(dtstart)
+ );
+
+
+
+ /* 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;
+ }
+
+ /* 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, dtstart);
+ }
+ else {
+ if (icaltime_compare(dtstart, icalcomponent_get_dtstart(fb)) < 0) {
+ icalcomponent_set_dtstart(fb, dtstart);
+ }
+ }
+
+ /* 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, dtend);
+ }
+ else {
+ if (icaltime_compare(dtend, icalcomponent_get_dtend(fb)) > 0) {
+ icalcomponent_set_dtend(fb, dtend);
+ }
+ }
+
+ if (rrule) {
+ dtstart = icalrecur_iterator_next(ritr);
+ if (!icaltime_is_null_time(dtend)) {
+ dtend = icaltime_add(dtstart, dur);
+ }
+ ++num_recur;
+ }
+
+ } while ( (rrule) && (!icaltime_is_null_time(dtstart)) && (num_recur < MAX_RECUR) ) ;
+ icalrecur_iterator_free(ritr);
}
*
*/
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;
);
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);
+ }
}
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);
}
+/*
+ * Helper callback function for ical_putics() to discover which TZID's we need.
+ * Simply put the tzid name string into a hash table. After the callbacks are
+ * done we'll go through them and attach the ones that we have.
+ */
+void ical_putics_grabtzids(icalparameter *param, void *data)
+{
+ const char *tzid = icalparameter_get_tzid(param);
+ HashList *keys = (HashList *) data;
+
+ if ( (keys) && (tzid) && (!IsEmptyStr(tzid)) ) {
+ Put(keys, tzid, strlen(tzid), strdup(tzid), generic_free_handler);
+ }
+}
+
+
/*
* Delete all of the calendar items in the current room, and replace them
* with calendar items from a client-supplied data stream.
char *calstream = NULL;
icalcomponent *cal;
icalcomponent *c;
+ icalcomponent *encaps = NULL;
+ HashList *tzidlist = NULL;
+ HashPos *HashPos;
+ void *Value;
+ const char *Key;
+ long len;
+ /* 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) ) {
cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
- return; /* Not an iCalendar-centric room */
+ return;
}
+ /* Only allow this operation if we have permission to overwrite the existing calendar */
if (!CtdlDoIHavePermissionToDeleteMessagesFromThisRoom()) {
cprintf("%d Permission denied.\n", ERROR+HIGHER_ACCESS_REQUIRED);
return;
}
cprintf("%d Transmit data now\n", SEND_LISTING);
- calstream = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0);
+ calstream = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0);
if (calstream == NULL) {
return;
}
/* We got our data stream -- now do something with it. */
- /* Delete the existing messages in the room, because we are replacing
+ /* 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!)
*/
for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
(c != NULL);
c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
- ical_write_to_cal(NULL, c);
+
+ /* 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 */
+ tzidlist = NewHash(1, NULL);
+ if (tzidlist) {
+ icalcomponent_foreach_tzid(c, ical_putics_grabtzids, tzidlist);
+ }
+ HashPos = GetNewHashPos(tzidlist, 0);
+
+ while (GetNextHashPos(tzidlist, HashPos, &len, &Key, &Value)) {
+ CtdlLogPrintf(CTDL_DEBUG, "Attaching timezone '%s'\n", Value);
+ icaltimezone *t = NULL;
+
+ /* 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 */
+ if (!t) {
+ t = icaltimezone_get_builtin_timezone(Value);
+ }
+
+ /* I've got a valid timezone to attach. */
+ if (t) {
+ icalcomponent_add_component(encaps,
+ icalcomponent_new_clone(
+ icaltimezone_get_component(t)
+ )
+ );
+ }
+
+ }
+ DeleteHashPos(&HashPos);
+ DeleteHash(&tzidlist);
+
+ /* Now attach the component itself (usually a VEVENT or VTODO) */
+ icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
+
+ /* Write it to the message store */
+ ical_write_to_cal(NULL, encaps);
+ icalcomponent_free(encaps);
+ }
}
}
projects / citadel.git / blobdiff