In webcit-classic, include webserver.h from webcit.h.

[citadel.git] / webcit / availability.c

diff --git a/webcit/availability.c b/webcit/availability.c
index 3d49f1f550c1ea5ba59f5a142404d1e474f7e028..44e9ecf12a28756b81de9e8a88e6e70c45a6c4ff 100644 (file)
--- 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"
 
 /*
@@ -104,7 +98,7 @@ int ical_ctdl_is_overlap(
                return(1);
        }
 
-       /* syslog(9, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
+       /* syslog(LOG_DEBUG, "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);
        */
@@ -113,11 +107,11 @@ int ical_ctdl_is_overlap(
 
        /* 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"); */
+       /* syslog(LOG_DEBUG, "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"); */
+       /* syslog(LOG_DEBUG, "second passed\n"); */
 
        /* Otherwise, they overlap. */
        return(1);
@@ -254,7 +248,7 @@ void check_attendee_availability(icalcomponent *vevent) {
 
                        /** screen name or email address */
                        safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
-                       striplt(attendee_string);
+                       string_trim(attendee_string);
 
                        check_individual_attendee(attendee_string,
                                                dtstart_t, dtend_t,