final touches on dkim test harness

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index ebf1918b71cf760e8c0d07594b6d7db21be0a2d1..488296ca7ed7b12a315708ed98b2edf392145185 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -1,26 +1,21 @@
 /*
  * Miscellaneous functions which handle calendar components.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
- * This program is free 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 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.
- *
- * 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 "time.h"
+#include "calendar.h"
 
 /* Hour strings */
 char *hourname[] = {
@@ -52,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;
@@ -63,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;
@@ -75,7 +68,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
                localtime_r(&tt, &tm);
        }
 
-       wc_printf("<input type=\"text\" name=\"");
+       wc_printf("<input type=\"date\" name=\"");
        StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
        wc_printf("\" id=\"");
        StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
@@ -158,7 +151,6 @@ void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
        t->minute = IBSTR(vname);
 
        /* time zone is set to the default zone for this server */
-       t->is_utc = 0;
        t->is_date = 0;
        t->zone = get_default_icaltimezone();
 }
@@ -177,7 +169,7 @@ void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) {
        sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day);
 
        /* time zone is set to the default zone for this server */
-       t->is_utc = 1;
+       t->zone = icaltimezone_get_utc_timezone();
        t->is_date = 1;
 }
 
@@ -250,7 +242,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(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
                return NULL;
        }
 
@@ -258,7 +250,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(LOG_WARNING, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
                return subcomp;
        }
 
@@ -288,11 +280,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(LOG_DEBUG, "zone already attached!!\n");
                                        }
                                }
                                if ((!zone_already_attached) && (num_zones_attached < 5)) {
-                                       lprintf(9, "attaching zone %d!\n", num_zones_attached);
+                                       syslog(LOG_DEBUG, "attaching zone %d!\n", num_zones_attached);
                                        attached_zones[num_zones_attached++] = z;
                                }
 
@@ -306,7 +298,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(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
                return NULL;
        }