{
int conflict_reported = 0;
- /* debugging cruft */
+ /* debugging cruft *
time_t tt;
- tt = icaltime_as_timet(t1start);
+ tt = icaltime_as_timet_with_zone(t1start, t1start.zone);
CtdlLogPrintf(CTDL_DEBUG, "PROPOSED START: %s", ctime(&tt));
- tt = icaltime_as_timet(t1end);
+ tt = icaltime_as_timet_with_zone(t1end, t1end.zone);
CtdlLogPrintf(CTDL_DEBUG, " PROPOSED END: %s", ctime(&tt));
- tt = icaltime_as_timet(t2start);
+ tt = icaltime_as_timet_with_zone(t2start, t2start.zone);
CtdlLogPrintf(CTDL_DEBUG, "EXISTING START: %s", ctime(&tt));
- tt = icaltime_as_timet(t2end);
+ tt = icaltime_as_timet_with_zone(t2end, t2end.zone);
CtdlLogPrintf(CTDL_DEBUG, " EXISTING END: %s", ctime(&tt));
- /* debugging cruft */
+ * debugging cruft */
/* compare and output */
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 {
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);
}
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);
}
/*
* 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;
- if (cal == NULL) return;
+ if (!top_level_cal) return;
+ if (!cal) cal = top_level_cal;
+
my_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
)
if (ird.cal == NULL) return;
- ical_add_to_freebusy(cal, ird.cal);
+ ical_add_to_freebusy(cal, ird.cal, NULL);
/* Now free the memory. */
icalcomponent_free(ird.cal);
projects / citadel.git / blobdiff