X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_tools.c;h=86da183b8abcca7f6a8666b7e2b99a1ae1142fc5;hb=HEAD;hp=713a7feb046990b3ee705faeccca300c977cef83;hpb=7b6378740e80c464164cc5393f0a724705649830;p=citadel.git diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c index 713a7feb0..488296ca7 100644 --- a/webcit/calendar_tools.c +++ b/webcit/calendar_tools.c @@ -1,41 +1,23 @@ /* - * $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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "webcit.h" -#include "webserver.h" - -char *months[] = { - "January", "February", "March", "April", "May", "June", "July", - "August", "September", "October", "November", "December" -}; -char *days[] = { - "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday" -}; +#include "time.h" +#include "calendar.h" +/* Hour strings */ char *hourname[] = { "12am", "1am", "2am", "3am", "4am", "5am", "6am", "7am", "8am", "9am", "10am", "11am", "12pm", @@ -43,8 +25,6 @@ char *hourname[] = { "7pm", "8pm", "9pm", "10pm", "11pm" }; -#ifdef WEBCIT_WITH_CALENDAR_SERVICE - /* * The display_icaltimetype_as_webform() and icaltime_from_webform() functions * handle the display and editing of date/time properties in web pages. The @@ -62,20 +42,21 @@ char *hourname[] = { * might be to allow the user to specify his/her timezone. */ - -void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) { +void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int date_only) { + wcsession *WCC = WC; int i; time_t now; struct tm tm_now; - int this_year; time_t tt; struct tm tm; - const int span = 10; int all_day_event = 0; + int time_format; + char timebuf[32]; + + time_format = get_time_format_cached (); 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; @@ -87,88 +68,109 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) { localtime_r(&tt, &tm); } - wprintf("Month: "); - wprintf("\n"); - - wprintf("Day: "); - wprintf("\n"); - - wprintf("Year: "); - wprintf("WBuf, prefix, -1, 0); + wc_printf("\" id=\""); + StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0); + wc_printf("\" size=\"10\" maxlength=\"10\" value=\""); + wc_strftime(timebuf, 32, "%Y-%m-%d", &tm); + StrBufAppendBufPlain(WCC->WBuf, timebuf, -1, 0); + wc_printf("\">"); + + StrBufAppendPrintf(WC->trailing_javascript, "attachDatePicker('"); + StrBufAppendPrintf(WC->trailing_javascript, prefix); + StrBufAppendPrintf(WC->trailing_javascript, "', '%s');\n", get_selected_language()); + + /* If we're editing a date only, we still generate the time boxes, but we hide them. + * This keeps the data model consistent. + */ + if (date_only) { + wc_printf("
"); } - wprintf("\n"); - wprintf("Hour: "); - wprintf("\n", prefix); for (i=0; i<=23; ++i) { - wprintf("\n", - ((tm.tm_hour == i) ? "SELECTED" : ""), - i, hourname[i] - ); + + if (time_format == WC_TIMEFORMAT_24) { + wc_printf("\n", + ((tm.tm_hour == i) ? "SELECTED" : ""), + i, i + ); + } + else { + wc_printf("\n", + ((tm.tm_hour == i) ? "SELECTED" : ""), + i, hourname[i] + ); + } + } - wprintf("\n"); + wc_printf("\n"); - wprintf("Minute: "); - wprintf("\n", prefix); for (i=0; i<=59; ++i) { if ( (i % 5 == 0) || (tm.tm_min == i) ) { - wprintf("\n", + wc_printf("\n", ((tm.tm_min == i) ? "SELECTED" : ""), i, i - ); + ); } } - wprintf("\n"); + wc_printf("\n"); + + if (date_only) { + wc_printf("
"); + } } +/* + * Get date/time from a web form and convert it into an icaltimetype struct. + */ +void icaltime_from_webform(struct icaltimetype *t, char *prefix) { + char vname[32]; -struct icaltimetype icaltime_from_webform(char *prefix) { - struct icaltimetype t; - time_t tt; - struct tm tm; - char vname[SIZ]; + if (!t) return; - tt = time(NULL); - localtime_r(&tt, &tm); + /* Stuff with zero values */ + memset(t, 0, sizeof(struct icaltimetype)); - sprintf(vname, "%s_month", prefix); tm.tm_mon = atoi(bstr(vname)) - 1; - sprintf(vname, "%s_day", prefix); tm.tm_mday = atoi(bstr(vname)); - sprintf(vname, "%s_year", prefix); tm.tm_year = atoi(bstr(vname)) - 1900; - sprintf(vname, "%s_hour", prefix); tm.tm_hour = atoi(bstr(vname)); - sprintf(vname, "%s_minute", prefix); tm.tm_min = atoi(bstr(vname)); + /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */ + sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day); - tt = mktime(&tm); - t = icaltime_from_timet(tt, 0); - t = icaltime_normalize(t); - return(t); + /* hour */ + sprintf(vname, "%s_hour", prefix); + t->hour = IBSTR(vname); + + /* minute */ + sprintf(vname, "%s_minute", prefix); + t->minute = IBSTR(vname); + + /* time zone is set to the default zone for this server */ + t->is_date = 0; + t->zone = get_default_icaltimezone(); +} + + +/* + * Get date (no time) from a web form and convert it into an icaltimetype struct. + */ +void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) { + if (!t) return; + + /* Stuff with zero values */ + memset(t, 0, sizeof(struct icaltimetype)); + + /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */ + 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->zone = icaltimezone_get_utc_timezone(); + t->is_date = 1; } @@ -179,75 +181,124 @@ void partstat_as_string(char *buf, icalproperty *attendee) { icalparameter *partstat_param; icalparameter_partstat partstat; - strcpy(buf, "(status unknown)"); + strcpy(buf, _("(status unknown)")); partstat_param = icalproperty_get_first_parameter( - attendee, - ICAL_PARTSTAT_PARAMETER - ); + attendee, + ICAL_PARTSTAT_PARAMETER + ); if (partstat_param == NULL) { return; } partstat = icalparameter_get_partstat(partstat_param); switch(partstat) { - case ICAL_PARTSTAT_X: - strcpy(buf, "(x)"); - break; - case ICAL_PARTSTAT_NEEDSACTION: - strcpy(buf, "(needs action)"); - break; - case ICAL_PARTSTAT_ACCEPTED: - strcpy(buf, "(accepted)"); - break; - case ICAL_PARTSTAT_DECLINED: - strcpy(buf, "(declined)"); - break; - case ICAL_PARTSTAT_TENTATIVE: - strcpy(buf, "(tenative)"); - break; - case ICAL_PARTSTAT_DELEGATED: - strcpy(buf, "(delegated)"); - break; - case ICAL_PARTSTAT_COMPLETED: - strcpy(buf, "(completed)"); - break; - case ICAL_PARTSTAT_INPROCESS: - strcpy(buf, "(in process)"); - break; - case ICAL_PARTSTAT_NONE: - strcpy(buf, "(none)"); - break; + case ICAL_PARTSTAT_X: + strcpy(buf, "(x)"); + break; + case ICAL_PARTSTAT_NEEDSACTION: + strcpy(buf, _("(needs action)")); + break; + case ICAL_PARTSTAT_ACCEPTED: + strcpy(buf, _("(accepted)")); + break; + case ICAL_PARTSTAT_DECLINED: + strcpy(buf, _("(declined)")); + break; + case ICAL_PARTSTAT_TENTATIVE: + strcpy(buf, _("(tenative)")); + break; + case ICAL_PARTSTAT_DELEGATED: + strcpy(buf, _("(delegated)")); + break; + case ICAL_PARTSTAT_COMPLETED: + strcpy(buf, _("(completed)")); + break; + case ICAL_PARTSTAT_INPROCESS: + strcpy(buf, _("(in process)")); + break; + case ICAL_PARTSTAT_NONE: + strcpy(buf, _("(none)")); + break; } } - /* - * Utility function to encapsulate a subcomponent into a full VCALENDAR + * Utility function to encapsulate a subcomponent into a full VCALENDAR. + * + * We also scan for any date/time properties that reference timezones, and attach + * those timezones along with the supplied subcomponent. (Increase the size of the array if you need to.) + * + * Note: if you change anything here, change it in Citadel server's ical_send_out_invitations() too. */ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { icalcomponent *encaps; - - lprintf(9, "ical_encapsulate_subcomponent() called\n"); + icalproperty *p; + struct icaltimetype t; + const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL }; + int i; + const icaltimezone *z; + int num_zones_attached = 0; + int zone_already_attached; if (subcomp == NULL) { - lprintf(3, "ERROR: called with NULL argument!\n"); + syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n"); return NULL; } - /* If we're already looking at a full VCALENDAR component, - * don't bother ... just return itself. + /* + * If we're already looking at a full VCALENDAR component, this is probably an error. */ if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) { - lprintf(9, "Already encapsulated. Returning itself.\n"); + syslog(LOG_WARNING, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n"); return subcomp; } + /* search for... */ + for (p = icalcomponent_get_first_property(subcomp, ICAL_ANY_PROPERTY); + p != NULL; + p = icalcomponent_get_next_property(subcomp, ICAL_ANY_PROPERTY)) + { + if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY) + || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY) + || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY) + || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY) + || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY) + || (icalproperty_isa(p) == ICAL_DUE_PROPERTY) + || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY) + || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY) + || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY) + ) { + t = icalproperty_get_dtstart(p); /*/ it's safe to use dtstart for all of them */ + if ((icaltime_is_valid_time(t)) && (z=icaltime_get_timezone(t), z)) { + + zone_already_attached = 0; + for (i=0; i<5; ++i) { + if (z == attached_zones[i]) { + ++zone_already_attached; + syslog(LOG_DEBUG, "zone already attached!!\n"); + } + } + if ((!zone_already_attached) && (num_zones_attached < 5)) { + syslog(LOG_DEBUG, "attaching zone %d!\n", num_zones_attached); + attached_zones[num_zones_attached++] = z; + } + + icalproperty_set_parameter(p, + icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z)) + ); + } + } + } + /* Encapsulate the VEVENT component into a complete VCALENDAR */ encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT); if (encaps == NULL) { - lprintf(3, "Error at %s:%d - could not allocate component!\n", - __FILE__, __LINE__); + syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n"); return NULL; } @@ -257,20 +308,16 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { /* Set the Version Number */ icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); + /* Attach any timezones we need */ + if (num_zones_attached > 0) for (i=0; i