/*
* 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 VEVENT to be added
+ * cal Caller supplies NULL, but we then use this variable for recursion
*/
-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;
- if (cal == NULL) return;
- my_period = icalperiodtype_null_period();
+ if (!top_level_cal) return;
+ if (!cal) cal = top_level_cal;
+
+ this_event_period = icalperiodtype_null_period();
+
+ /* Convert all time zones to UTC (FIXME this won't work with recurring events) */
+ if (icalcomponent_isa(cal) != ICAL_VCALENDAR_COMPONENT) {
+ ical_dezonify(cal);
+ }
+ /* Now boil it down to the VEVENT only (FIXME this won't work with recurring events) */
if (icalcomponent_isa(cal) != ICAL_VEVENT_COMPONENT) {
- ical_add_to_freebusy(fb,
+ ical_add_to_freebusy(fb, top_level_cal,
icalcomponent_get_first_component(
cal, ICAL_VEVENT_COMPONENT
)
/* Convert the DTSTART and DTEND properties to an icalperiod. */
p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
- my_period.start = icalproperty_get_dtstart(p);
+ this_event_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);
+ this_event_period.end = icalproperty_get_dtstart(p);
}
/* Now add it. */
icalcomponent_add_property(fb,
- icalproperty_new_freebusy(my_period)
+ icalproperty_new_freebusy(this_event_period)
);
/* Make sure the DTSTART property of the freebusy *list* is set to
*
*/
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, NULL); /* Add VEVENT times to VFREEBUSY */
+ icalcomponent_free(ird.cal);
+ }
}