X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Favailability.c;h=3e8bfa2e51004a3a95cbbde85294b4c90bb9a59a;hb=5d38a76f8f06640e3a3f097d584ac52336110f7c;hp=27d99240787803f2d60e53c652567bb7c3548805;hpb=3dda3cda8acb9c1c4eb227f4780630913ffc633a;p=citadel.git diff --git a/webcit/availability.c b/webcit/availability.c index 27d992407..3e8bfa2e5 100644 --- a/webcit/availability.c +++ b/webcit/availability.c @@ -1,58 +1,41 @@ /* - * $Id$ + * Copyright (c) 1996-2012 by the citadel.org team * - * Check attendee availability for scheduling a meeting. + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. * + * 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. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + #include "webcit.h" #include "webserver.h" - - -#ifdef WEBCIT_WITH_CALENDAR_SERVICE - - +#include "calendar.h" /* - * Utility function to fetch a VFREEBUSY type of thing for - * any specified user. + * Utility function to fetch a VFREEBUSY type of thing for any specified user. */ icalcomponent *get_freebusy_for_user(char *who) { + long nLines; char buf[SIZ]; - char *serialized_fb = NULL; + StrBuf *serialized_fb = NewStrBuf(); icalcomponent *fb = NULL; serv_printf("ICAL freebusy|%s", who); serv_getln(buf, sizeof buf); if (buf[0] == '1') { - serialized_fb = read_server_text(); + read_server_text(serialized_fb, &nLines); } if (serialized_fb == NULL) { return NULL; } - fb = icalcomponent_new_from_string(serialized_fb); - free(serialized_fb); + fb = icalcomponent_new_from_string(ChrPtr(serialized_fb)); + FreeStrBuf(&serialized_fb); if (fb == NULL) { return NULL; } @@ -61,12 +44,13 @@ icalcomponent *get_freebusy_for_user(char *who) { } - - /* - * Check to see if two events overlap. Returns nonzero if they do. + * Check to see if two events overlap. * (This function is used in both Citadel and WebCit. If you change it in - * one place, change it in the other. Better yet, put it in a library.) + * one place, change it in the other. We should seriously consider moving + * this function upstream into libical.) + * + * Returns nonzero if they do overlap. */ int ical_ctdl_is_overlap( struct icaltimetype t1start, @@ -78,40 +62,56 @@ int ical_ctdl_is_overlap( 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); + } - /* 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); + /* syslog(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); + */ + + /* 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(9, "first passed\n"); */ /* If event 2 ends before event 1 starts, we're also ok. */ if (icaltime_compare(t2end, t1start) <= 0) return(0); + /* syslog(9, "second passed\n"); */ /* Otherwise, they overlap. */ return(1); @@ -123,7 +123,13 @@ int ical_ctdl_is_overlap( * Back end function for check_attendee_availability() * This one checks an individual attendee against a supplied * event start and end time. All these fields have already been - * broken out. The result is placed in 'annotation'. + * broken out. + * + * attendee_string name of the attendee + * event_start start time of the event to check + * event_end end time of the event to check + * + * The result is placed in 'annotation'. */ void check_individual_attendee(char *attendee_string, struct icaltimetype event_start, @@ -135,17 +141,19 @@ void check_individual_attendee(char *attendee_string, icalproperty *thisfb = NULL; struct icalperiodtype period; - /* Set to 'unknown' right from the beginning. Unless we learn + /* + * Set to 'unknown' right from the beginning. Unless we learn * something else, that's what we'll go with. */ - strcpy(annotation, "availability unknown"); + strcpy(annotation, _("availability unknown")); fbc = get_freebusy_for_user(attendee_string); if (fbc == NULL) { return; } - /* Make sure we're looking at a VFREEBUSY by itself. What we're probably + /* + * Make sure we're looking at a VFREEBUSY by itself. What we're probably * looking at initially is a VFREEBUSY encapsulated in a VCALENDAR. */ if (icalcomponent_isa(fbc) == ICAL_VCALENDAR_COMPONENT) { @@ -158,17 +166,17 @@ void check_individual_attendee(char *attendee_string, /* Iterate through all FREEBUSY's looking for conflicts. */ if (fb != NULL) { - strcpy(annotation, "free"); + strcpy(annotation, _("free")); for (thisfb = icalcomponent_get_first_property(fb, ICAL_FREEBUSY_PROPERTY); thisfb != NULL; thisfb = icalcomponent_get_next_property(fb, ICAL_FREEBUSY_PROPERTY) ) { - /* Do the check */ + /** Do the check */ period = icalproperty_get_freebusy(thisfb); if (ical_ctdl_is_overlap(period.start, period.end, event_start, event_end)) { - strcpy(annotation, "BUSY"); + strcpy(annotation, _("BUSY")); } } @@ -183,6 +191,8 @@ void check_individual_attendee(char *attendee_string, /* * Check the availability of all attendees for an event (when possible) * and annotate accordingly. + * + * vevent the event which should be compared with attendees calendar */ void check_attendee_availability(icalcomponent *vevent) { icalproperty *attendee = NULL; @@ -193,12 +203,14 @@ void check_attendee_availability(icalcomponent *vevent) { char attendee_string[SIZ]; char annotated_attendee_string[SIZ]; char annotation[SIZ]; + const char *ch; if (vevent == NULL) { return; } - /* If we're looking at a fully encapsulated VCALENDAR + /* + * If we're looking at a fully encapsulated VCALENDAR * rather than a VEVENT component, attempt to use the first * relevant VEVENT subcomponent. If there is none, the * NULL returned by icalcomponent_get_first_component() will @@ -214,7 +226,7 @@ void check_attendee_availability(icalcomponent *vevent) { return; } - ical_dezonify(vevent); /* Convert everything to UTC */ + ical_dezonify(vevent); /**< Convert everything to UTC */ /* * Learn the start and end times. @@ -231,19 +243,18 @@ void check_attendee_availability(icalcomponent *vevent) { for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) { + ch = icalproperty_get_attendee(attendee); + if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) { - strcpy(attendee_string, icalproperty_get_attendee(attendee)); - if (!strncasecmp(attendee_string, "MAILTO:", 7)) { - - /* screen name or email address */ - strcpy(attendee_string, &attendee_string[7]); + /** screen name or email address */ + safestrncpy(attendee_string, ch + 7, sizeof(attendee_string)); striplt(attendee_string); check_individual_attendee(attendee_string, dtstart_t, dtend_t, annotation); - /* Replace the attendee name with an annotated one. */ + /** Replace the attendee name with an annotated one. */ snprintf(annotated_attendee_string, sizeof annotated_attendee_string, "MAILTO:%s (%s)", attendee_string, annotation); icalproperty_set_attendee(attendee, annotated_attendee_string); @@ -253,5 +264,3 @@ void check_attendee_availability(icalcomponent *vevent) { } - -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */