X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Favailability.c;h=17edb3393f7068c7420e148224eb1928a1548f04;hb=HEAD;hp=67aa46f27af4b70f029433e1c595cacc4ce17c21;hpb=17ce76a935cdbd2e2fda4a6ee1680e603413eb0c;p=citadel.git

diff --git a/webcit/availability.c b/webcit/availability.c
index 67aa46f27..a57e3f713 100644
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -1,24 +1,18 @@
 /*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * 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"
 
 /*
@@ -50,81 +44,6 @@ icalcomponent *get_freebusy_for_user(char *who) {
 }
 
 
-/*
- * 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.  We should seriously consider moving
- * this function upstream into libical.)
- *
- * Returns nonzero if they do overlap.
- */
-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);
-
-	/* 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 (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);	
-		}
-	}
-
-	/* 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);
-	*/
-
-	/* 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);
-}
-
-
-
 /*
  * Back end function for check_attendee_availability()
  * This one checks an individual attendee against a supplied
@@ -209,6 +128,7 @@ 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;
@@ -248,13 +168,12 @@ 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)) {
-
-		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,