* room on a Citadel server. It handles iCalendar objects using the
* iTIP protocol. See RFCs 2445 and 2446.
*
+ *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ * This program is free 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"
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);
+ }
+
+ /* lprintf (9, "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);
+ /* lprintf(9, "first passed\n"); */
/* If event 2 ends before event 1 starts, we're also ok. */
if (icaltime_compare(t2end, t1start) <= 0) return(0);
+ /* lprintf(9, "second passed\n"); */
/* Otherwise, they overlap. */
return(1);
}
-
-
/*
* Phase 6 of "hunt for conflicts"
* called by ical_conflicts_phase5()
icalproperty *p;
icalvalue *v;
struct icalperiodtype this_event_period = icalperiodtype_null_period();
+ icaltimetype dtstart = icaltime_null_time();
+ icaltimetype dtend = icaltime_null_time();
+
+ /* recur variables */
+ icalproperty *rrule = NULL;
+ struct icalrecurrencetype recur;
+ icalrecur_iterator *ritr = NULL;
+ struct icaldurationtype dur;
+ int num_recur = 0;
if (!top_level_cal) return;
}
}
- /* 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) {
- this_event_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) {
- this_event_period.end = icalproperty_get_dtstart(p);
- }
-
- /* 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, 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));
- }
+
+ /* 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);
}
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n");
+ CtdlLogPrintf(CTDL_ALERT, "ERROR: could not allocate component!\n");
cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR);
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;
}
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");
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not allocate component!\n");
+ CtdlLogPrintf(CTDL_ALERT, "ERROR: could not allocate component!\n");
icalcomponent_free(the_request);
return;
}
|| (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)) {
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;
}
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) {
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);
projects / citadel.git / blobdiff