X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_tools.c;h=86da183b8abcca7f6a8666b7e2b99a1ae1142fc5;hb=HEAD;hp=17dc4a739a7e02d1ae17bc5700abfff27a74eb7a;hpb=e75e8817291f1504a58c70d721075d82293c9e72;p=citadel.git diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c index 17dc4a739..488296ca7 100644 --- a/webcit/calendar_tools.c +++ b/webcit/calendar_tools.c @@ -5,21 +5,15 @@ * * 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" @@ -74,7 +68,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d localtime_r(&tt, &tm); } - wc_printf("WBuf, prefix, -1, 0); wc_printf("\" id=\""); StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0); @@ -157,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(); } @@ -176,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; } @@ -249,7 +242,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { int zone_already_attached; if (subcomp == NULL) { - syslog(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n"); + syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n"); return NULL; } @@ -257,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) { - syslog(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; } @@ -287,11 +280,11 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { for (i=0; i<5; ++i) { if (z == attached_zones[i]) { ++zone_already_attached; - syslog(9, "zone already attached!!\n"); + syslog(LOG_DEBUG, "zone already attached!!\n"); } } if ((!zone_already_attached) && (num_zones_attached < 5)) { - syslog(9, "attaching zone %d!\n", num_zones_attached); + syslog(LOG_DEBUG, "attaching zone %d!\n", num_zones_attached); attached_zones[num_zones_attached++] = z; } @@ -305,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) { - syslog(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n"); + syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n"); return NULL; }