/*
* $Id$
- */
-/**
*
- * \defgroup CalendarAv Check attendee availability for scheduling a meeting.
- * \todo why doesn't anything of the documentation apear?
*/
-/*@{*/
#include "webcit.h"
#include "webserver.h"
-/** only available if we have calendaring */
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-
-
-/**
- * \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;
}
}
-
-
-/**
- * \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.
+ * 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,
if (icaltime_is_null_time(t1start)) return(0);
if (icaltime_is_null_time(t2start)) return(0);
- /** First, check for all-day events */
+ /* First, check for all-day events */
if (t1start.is_date) {
if (!icaltime_compare_date_only(t1start, t2start)) {
return(1);
}
}
- /** Now check for overlaps using date *and* time. */
+ /* 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. */
+ /* 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 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 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. */
+ /* Otherwise, they overlap. */
return(1);
}
}
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/** @} */