removed a bunch of blank comment lines

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index e5ecf5d6d6f77fb458312e8fde0d36f13af4cc08..5fffee44c3b692e5358fa4c78629165fde99c176 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -1,12 +1,21 @@
 /*
- * $Id$
- *
  * Miscellaneous functions which handle calendar components.
+ *
+ * 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.
+ *
+ * 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"
 #include "time.h"
+#include "calendar.h"
 
 /* Hour strings */
 char *hourname[] = {
@@ -38,7 +47,6 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
        int i;
        time_t now;
        struct tm tm_now;
-       int this_year;
        time_t tt;
        struct tm tm;
        int all_day_event = 0;
@@ -49,7 +57,6 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
 
        now = time(NULL);
        localtime_r(&now, &tm_now);
-       this_year = tm_now.tm_year + 1900;
 
        if (t == NULL) return;
        if (t->is_date) all_day_event = 1;
@@ -236,7 +243,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        int zone_already_attached;
 
        if (subcomp == NULL) {
-               lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
+               syslog(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
                return NULL;
        }
 
@@ -244,7 +251,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
         * If we're already looking at a full VCALENDAR component, this is probably an error.
         */
        if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
-               lprintf(3, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
+               syslog(3, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
                return subcomp;
        }
 
@@ -274,11 +281,11 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                                for (i=0; i<5; ++i) {
                                        if (z == attached_zones[i]) {
                                                ++zone_already_attached;
-                                               lprintf(9, "zone already attached!!\n");
+                                               syslog(9, "zone already attached!!\n");
                                        }
                                }
                                if ((!zone_already_attached) && (num_zones_attached < 5)) {
-                                       lprintf(9, "attaching zone %d!\n", num_zones_attached);
+                                       syslog(9, "attaching zone %d!\n", num_zones_attached);
                                        attached_zones[num_zones_attached++] = z;
                                }
 
@@ -292,7 +299,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        /* Encapsulate the VEVENT component into a complete VCALENDAR */
        encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
        if (encaps == NULL) {
-               lprintf(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
+               syslog(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
                return NULL;
        }