/*
- * $Id$
+ * Copyright (c) 1996-2010 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 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
*/
#include "webcit.h"
#include "webserver.h"
+#include "calendar.h"
/*
* 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];
- StrBuf *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(&nLines);
+ read_server_text(serialized_fb, &nLines);
}
if (serialized_fb == NULL) {
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);
}
}
- /* lprintf (9, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
+ /* 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);
+ }
+
+ /* 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. */
- /* 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 (icaltime_compare(t1end, t2start) <= 0) return(0);
- // lprintf(9, "first passed\n");
+ /* 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);
- // lprintf(9, "second passed\n");
+ /* syslog(9, "second passed\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,
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.
*/
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.
*/
fb = fbc;
}
- /** Iterate through all FREEBUSY's looking for conflicts. */
+ /* Iterate through all FREEBUSY's looking for conflicts. */
if (fb != NULL) {
strcpy(annotation, _("free"));
-/**
- * \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;
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
ical_dezonify(vevent); /**< Convert everything to UTC */
- /**
+ /*
* Learn the start and end times.
*/
dtstart_p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
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);
projects / citadel.git / blobdiff