X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Favailability.c;h=17edb3393f7068c7420e148224eb1928a1548f04;hb=HEAD;hp=8676ab2cd5804fd79288c1fc19268aeb11b22b03;hpb=4b41d944cd644a326f347e8c7015182088d6d58a;p=citadel.git diff --git a/webcit/availability.c b/webcit/availability.c index 8676ab2cd..a57e3f713 100644 --- a/webcit/availability.c +++ b/webcit/availability.c @@ -1,45 +1,41 @@ /* - * $Id$ - */ -/** + * Copyright (c) 1996-2012 by the citadel.org team + * + * 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. * - * \defgroup CalendarAv Check attendee availability for scheduling a meeting. - * \ingroup Calendaring + * 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 "webcit.h" -#include "webserver.h" - -/** only available if we have calendaring */ -#ifdef WEBCIT_WITH_CALENDAR_SERVICE +#include "calendar.h" - -/** - * \brief verify users avaiability - * Utility function to fetch a VFREEBUSY type of thing for - * any specified user. - * \param who string of the user to search +/* + * 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; } @@ -48,134 +44,17 @@ icalcomponent *get_freebusy_for_user(char *who) { } -/* TODO: temporary copy from libical, apply this patch to libical... */ -int webcit_icaltime_compare(const struct icaltimetype a_in, const struct icaltimetype b_in) -{ - struct icaltimetype a, b; - - a = icaltime_convert_to_zone(a_in, icaltimezone_get_utc_timezone()); - b = icaltime_convert_to_zone(b_in, icaltimezone_get_utc_timezone()); - - if (a.year > b.year) - return 1; - else if (a.year < b.year) - return -1; - - else if (a.month > b.month) - return 1; - else if (a.month < b.month) - return -1; - - else if (a.day > b.day) - return 1; - else if (a.day < b.day) - return -1; - - /* if both are dates, we are done */ - if (a.is_date && b.is_date) - return 0; - - /* else, if only one is a date (and we already know the date part is equal), - then the other is greater */ - else if (b.is_date) - return 1; - else if (a.is_date) - return -1; - - else if (a.hour > b.hour) - return 1; - else if (a.hour < b.hour) - return -1; - - else if (a.minute > b.minute) - return 1; - else if (a.minute < b.minute) - return -1; - - else if (a.second > b.second) - return 1; - else if (a.second < b.second) - return -1; - - return 0; -} - - -/** - * \brief Check if dates are overlapping - * 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.) - * \param t1start date one start - * \param t1end date one end - * \param t2start date one start - * \param t2end date two end - * \returns nonzero if they do. - */ -int ical_ctdl_is_overlap( - struct icaltimetype t1start, - struct icaltimetype t1end, - 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 (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); - } - } - } - - lprintf (2,"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);// TODO: remove me. - - /** Now check for overlaps using date *and* time. */ - - /** 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); - - /** If event 1 ends before event 2 starts, we're in the clear. */ - if (webcit_icaltime_compare(t1end, t2start) <= 0) return(0); - lprintf(2,"first pased \n"); - /** If event 2 ends before event 1 starts, we're also ok. */ - if (webcit_icaltime_compare(t2end, t1start) <= 0) return(0); - lprintf(2,"second pased \n"); - - /** Otherwise, they overlap. */ - return(1); -} - - - /* - * \brief dig availability on citserver * 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. - * \param attendee_string name of the attendee - * \param event_start starttime of the event to check - * \param event_end endtime of the event to check - * \return The result is placed in 'annotation'. + * + * 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, @@ -187,7 +66,7 @@ void check_individual_attendee(char *attendee_string, icalproperty *thisfb = NULL; struct icalperiodtype period; - /** + /* * Set to 'unknown' right from the beginning. Unless we learn * something else, that's what we'll go with. */ @@ -198,7 +77,7 @@ void check_individual_attendee(char *attendee_string, return; } - /** + /* * Make sure we're looking at a VFREEBUSY by itself. What we're probably * looking at initially is a VFREEBUSY encapsulated in a VCALENDAR. */ @@ -209,7 +88,7 @@ void check_individual_attendee(char *attendee_string, fb = fbc; } - /** Iterate through all FREEBUSY's looking for conflicts. */ + /* Iterate through all FREEBUSY's looking for conflicts. */ if (fb != NULL) { strcpy(annotation, _("free")); @@ -234,11 +113,11 @@ void check_individual_attendee(char *attendee_string, -/** - * \brief check attendees availability +/* * Check the availability of all attendees for an event (when possible) * and annotate accordingly. - * \param vevent the event which should be compared with attendees calendar + * + * vevent the event which should be compared with attendees calendar */ void check_attendee_availability(icalcomponent *vevent) { icalproperty *attendee = NULL; @@ -249,12 +128,13 @@ 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 * rather than a VEVENT component, attempt to use the first * relevant VEVENT subcomponent. If there is none, the @@ -273,7 +153,7 @@ void check_attendee_availability(icalcomponent *vevent) { ical_dezonify(vevent); /**< Convert everything to UTC */ - /** + /* * Learn the start and end times. */ dtstart_p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY); @@ -282,19 +162,18 @@ void check_attendee_availability(icalcomponent *vevent) { dtend_p = icalcomponent_get_first_property(vevent, ICAL_DTEND_PROPERTY); if (dtend_p != NULL) dtend_t = icalproperty_get_dtend(dtend_p); - /** + /* * Iterate through attendees. */ for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) { - - strcpy(attendee_string, icalproperty_get_attendee(attendee)); - if (!strncasecmp(attendee_string, "MAILTO:", 7)) { + ch = icalproperty_get_attendee(attendee); + if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) { /** screen name or email address */ - strcpy(attendee_string, &attendee_string[7]); - striplt(attendee_string); + safestrncpy(attendee_string, ch + 7, sizeof(attendee_string)); + string_trim(attendee_string); check_individual_attendee(attendee_string, dtstart_t, dtend_t, @@ -310,7 +189,3 @@ void check_attendee_availability(icalcomponent *vevent) { } - -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */ - -/** @} */