final touches on dkim test harness
[citadel.git] / webcit / calendar_tools.c
index b717cd2aacc7908bb79a99f4a197e93d82be891a..488296ca7ed7b12a315708ed98b2edf392145185 100644 (file)
@@ -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;
@@ -61,14 +68,14 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
                localtime_r(&tt, &tm);
        }
 
-       wprintf("<input type=\"text\" name=\"");
+       wc_printf("<input type=\"date\" name=\"");
        StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-       wprintf("\" id=\"");
+       wc_printf("\" id=\"");
        StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-       wprintf("\" size=\"10\" maxlength=\"10\" value=\"");
+       wc_printf("\" size=\"10\" maxlength=\"10\" value=\"");
        wc_strftime(timebuf, 32, "%Y-%m-%d", &tm);
        StrBufAppendBufPlain(WCC->WBuf, timebuf, -1, 0);
-       wprintf("\">");
+       wc_printf("\">");
 
        StrBufAppendPrintf(WC->trailing_javascript, "attachDatePicker('");
        StrBufAppendPrintf(WC->trailing_javascript, prefix);
@@ -78,46 +85,46 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d
         * This keeps the data model consistent.
         */
        if (date_only) {
-               wprintf("<div style=\"display:none\">");
+               wc_printf("<div style=\"display:none\">");
        }
 
-       wprintf("<span ID=\"");
+       wc_printf("<span ID=\"");
        StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
-       wprintf("_time\">");
-       wprintf(_("Hour: "));
-       wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
+       wc_printf("_time\">");
+       wc_printf(_("Hour: "));
+       wc_printf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
        for (i=0; i<=23; ++i) {
 
                if (time_format == WC_TIMEFORMAT_24) {
-                       wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
+                       wc_printf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
                                ((tm.tm_hour == i) ? "SELECTED" : ""),
                                i, i
                                );
                }
                else {
-                       wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
+                       wc_printf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
                                ((tm.tm_hour == i) ? "SELECTED" : ""),
                                i, hourname[i]
                                );
                }
 
        }
-       wprintf("</SELECT>\n");
+       wc_printf("</SELECT>\n");
 
-       wprintf(_("Minute: "));
-       wprintf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
+       wc_printf(_("Minute: "));
+       wc_printf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
        for (i=0; i<=59; ++i) {
                if ( (i % 5 == 0) || (tm.tm_min == i) ) {
-                       wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
+                       wc_printf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
                                ((tm.tm_min == i) ? "SELECTED" : ""),
                                i, i
                                );
                }
        }
-       wprintf("</SELECT></span>\n");
+       wc_printf("</SELECT></span>\n");
 
        if (date_only) {
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 }
 
@@ -144,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();
 }
@@ -163,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;
 }
 
@@ -236,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;
        }
 
@@ -244,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;
        }
 
@@ -274,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;
                                }
 
@@ -292,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;
        }