X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar.c;h=b966c264bf02c049d32c65d8abdcef751dc1a837;hb=7c6a8c0e7caf1da50e235049d4c4834aef1ca1be;hp=087a2a8b3f26a071b72d16e931eda146de4593e4;hpb=069ad0b4147645fe42dad360773ab9f1a3b98ca3;p=citadel.git diff --git a/webcit/calendar.c b/webcit/calendar.c index 087a2a8b3..b966c264b 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -2,93 +2,43 @@ * $Id$ * * Functions which handle calendar objects and their processing/display. - * */ -#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" -#ifndef WEBCIT_WITH_CALENDAR_SERVICE /* - * Handler stubs for builds with no calendar library available - */ -void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) { - - wprintf("This message contains calendaring/scheduling information," - " but support for calendars is not available on this " - "particular system. Please ask your system administrator to " - "install a new version of the Citadel web service with " - "calendaring enabled.
\n" - ); - -} - -void display_calendar(long msgnum) { - wprintf("" - "Cannot display calendar item. You are seeing this error " - "because your WebCit service has not been installed with " - "calendar support. Please contact your system administrator." - "
\n"); -} - -void display_task(long msgnum) { - wprintf("" - "Cannot display to-do item. You are seeing this error " - "because your WebCit service has not been installed with " - "calendar support. Please contact your system administrator." - "
\n"); -} - -#else /* WEBCIT_WITH_CALENDAR_SERVICE */ - - -/****** End of handler stubs. Everything below this line is real. ******/ - - - - -/* - * Process a calendar object - * ...at this point it's already been deserialized by cal_process_attachment() + * Process a calendar object. At this point it's already been deserialized by cal_process_attachment() + * + * cal: the calendar object + * recursion_level: Number of times we've recursed into this function + * msgnum: Message number on the Citadel server + * cal_partnum: MIME part number within that message containing the calendar object */ void cal_process_object(icalcomponent *cal, int recursion_level, long msgnum, - char *cal_partnum -) { + char *cal_partnum) +{ icalcomponent *c; icalproperty *method = NULL; icalproperty_method the_method = ICAL_METHOD_NONE; icalproperty *p; struct icaltimetype t; time_t tt; - char buf[SIZ]; - char conflict_name[SIZ]; + char buf[256]; + char conflict_name[256]; + char conflict_message[256]; int is_update = 0; + char divname[32]; + static int divcount = 0; + + sprintf(divname, "rsvp%04x", ++divcount); /* Leading HTML for the display of this object */ if (recursion_level == 0) { - wprintf("
\n"); + wprintf("
\n"); } /* Look for a method */ @@ -97,54 +47,48 @@ void cal_process_object(icalcomponent *cal, /* See what we need to do with this */ if (method != NULL) { the_method = icalproperty_get_method(method); + char *title; + + wprintf("
", divname); + wprintf(""); + wprintf(""); switch(the_method) { - case ICAL_METHOD_REQUEST: - wprintf("
\n" - ); + case ICAL_METHOD_REQUEST: + title = _("Meeting invitation"); break; - case ICAL_METHOD_REPLY: - wprintf("\n" - ); + case ICAL_METHOD_REPLY: + title = _("Attendee's reply to your invitation"); break; - case ICAL_METHOD_PUBLISH: - wprintf("\n" - ); + case ICAL_METHOD_PUBLISH: + title = _("Published event"); break; - default: - wprintf("" - "\n"); + default: + title = _("This is an unknown type of calendar item."); break; } + wprintf(""); + + wprintf("  %s",title); + wprintf(""); } + wprintf("
"); p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY); if (p != NULL) { - wprintf("
\n"); + wprintf("\n"); } p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY); if (p != NULL) { - wprintf("\n"); + wprintf("\n"); } /* @@ -153,26 +97,28 @@ void cal_process_object(icalcomponent *cal, */ if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) { - p = icalcomponent_get_first_property(cal, - ICAL_DTSTART_PROPERTY); + p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY); if (p != NULL) { t = icalproperty_get_dtstart(p); if (t.is_date) { - wprintf("", - months[t.month - 1], - t.day, t.year - ); + struct tm d_tm; + char d_str[32]; + memset(&d_tm, 0, sizeof d_tm); + d_tm.tm_year = t.year - 1900; + d_tm.tm_mon = t.month - 1; + d_tm.tm_mday = t.day; + wc_strftime(d_str, sizeof d_str, "%x", &d_tm); + wprintf("
"); + wprintf(_("Date:")); + wprintf("
%s
", d_str); } else { tt = icaltime_as_timet(t); - fmt_date(buf, tt); - wprintf("", buf - ); + webcit_fmt_date(buf, tt, 0); + wprintf("
"); + wprintf(_("Starting date/time:")); + wprintf("
%s
", buf); } } @@ -180,44 +126,50 @@ void cal_process_object(icalcomponent *cal, if (p != NULL) { t = icalproperty_get_dtend(p); tt = icaltime_as_timet(t); - fmt_date(buf, tt); - wprintf("", buf - ); + webcit_fmt_date(buf, tt, 0); + wprintf("
"); + wprintf(_("Ending date/time:")); + wprintf("
%s
", buf); } } p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY); if (p != NULL) { - wprintf("\n"); + wprintf("\n"); } /* If the component has attendees, iterate through them. */ - for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); (p != NULL); p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) { - wprintf("\n"); + wprintf("\n"); } /* If the component has subcomponents, recurse through them. */ for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); - (c != 0); - c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) { + (c != 0); + c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) { /* Recursively process subcomponent */ cal_process_object(c, recursion_level+1, msgnum, cal_partnum); } @@ -228,110 +180,105 @@ void cal_process_object(icalcomponent *cal, /* Check for conflicts */ lprintf(9, "Checking server calendar for conflicts...\n"); serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum); - serv_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] == '1') { - while (serv_gets(buf), strcmp(buf, "000")) { - extract(conflict_name, buf, 3); + while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + extract_token(conflict_name, buf, 3, '|', sizeof conflict_name); is_update = extract_int(buf, 4); - wprintf("" - "\n"); + _("Update:") : + _("CONFLICT:") + ) + ); + wprintf("
"); + escputs(conflict_message); + wprintf("
\n"); } } lprintf(9, "...done.\n"); + wprintf(""); + /* Display the Accept/Decline buttons */ - wprintf("\n", - msgnum, cal_partnum - ); + wprintf("

" + "%s " + "    " + "%s" + "   " + "%s" + "   " + "%s" + "

\n", + divname, + _("How would you like to respond to this invitation?"), + divname, divname, msgnum, cal_partnum, _("Accept"), + divname, divname, msgnum, cal_partnum, _("Tentative"), + divname, divname, msgnum, cal_partnum, _("Decline") + ); } /* If this is a REPLY, display update button */ if (the_method == ICAL_METHOD_REPLY) { - /*********** - * In the future, if we want to validate this object before + /* In the future, if we want to validate this object before * continuing, we can do it this way: - serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum); - serv_gets(buf); - } - ***********/ + serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum); + serv_getln(buf, sizeof buf); + } + ***********/ /* Display the update buttons */ - wprintf("\n", - msgnum, cal_partnum - ); - + wprintf("

" + "%s " + "    " + "%s" + "   " + "%s" + "

\n", + divname, + _("Click Update to accept this reply and update your calendar."), + divname, divname, msgnum, cal_partnum, _("Update"), + divname, divname, msgnum, cal_partnum, _("Ignore") + ); + } - + /* Trailing HTML for the display of this object */ if (recursion_level == 0) { - - wprintf("
\n" - "" - "  " - "Meeting invitation -
\n" - "" - "  " - "Attendee's reply to your invitation -
\n" - "" - "  " - "Published event -
" - "I don't know what to do with this.
Summary:"); + wprintf("
"); + wprintf(_("Summary:")); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
Location:"); + wprintf("
"); + wprintf(_("Location:")); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
Date:" - "" - "%s %d, %d
Starting date/time:" - "" - "%s
Ending date/time:" - "%s
Description:"); + wprintf("
"); + wprintf(_("Description:")); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
Attendee:"); - strcpy(buf, icalproperty_get_attendee(p)); + for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); + (p != NULL); + p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) { + wprintf("
"); + wprintf(_("Attendee:")); + wprintf("
"); + safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf); if (!strncasecmp(buf, "MAILTO:", 7)) { - /* screen name or email address */ + /** screen name or email address */ strcpy(buf, &buf[7]); striplt(buf); escputs(buf); wprintf(" "); - /* participant status */ + /** participant status */ partstat_as_string(buf, p); escputs(buf); } - wprintf("
%s" - "%s " - """, - (is_update ? - "Update:" : - "CONFLICT:" - ), + if (is_update) { + snprintf(conflict_message, sizeof conflict_message, + _("This is an update of '%s' which is already in your calendar."), conflict_name); + } + else { + snprintf(conflict_message, sizeof conflict_message, + _("This event would conflict with '%s' which is already in your calendar."), conflict_name); + } + wprintf("
%s", (is_update ? - "This is an update of" : - "This event would conflict with" - ) - - ); - escputs(conflict_name); - wprintf("" " - "which is already in your calendar." - "
" - "
\n" - "\n" - "  " - "\n" - "  " - "\n" - "" - "" - "
" - "
" - "Click Update to accept this reply and " - "update your calendar." - "
\n" - "\n" - "  " - "\n" - "" - "" - "
" - "
\n"); + wprintf("

 

\n"); } } -/* +/** + * \brief process calendar mail atachment * Deserialize a calendar object in a message so it can be processed. * (This is the main entry point for these things) + * \param part_source the part of the message we want to parse + * \param msgnum number of the mesage in our db + * \param cal_partnum the number of the calendar item */ -void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) { +void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) +{ icalcomponent *cal; cal = icalcomponent_new_from_string(part_source); if (cal == NULL) { - wprintf("Error parsing calendar object
\n"); + wprintf(_("There was an error parsing this calendar item.")); + wprintf("
\n"); return; } @@ -345,241 +292,424 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) { -/* +/** + * \brief accept/decline meeting * Respond to a meeting request */ -void respond_to_request(void) { - char buf[SIZ]; - - output_headers(3); +void respond_to_request(void) +{ + char buf[1024]; - wprintf("
" - "Respond to meeting request" - "

\n" - ); + begin_ajax_response(); serv_printf("ICAL respond|%s|%s|%s|", bstr("msgnum"), bstr("cal_partnum"), bstr("sc") ); - serv_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf("
" - "" - "" - ); + wprintf(""); if (!strcasecmp(bstr("sc"), "accept")) { - wprintf("You have accepted this meeting invitation. " - "It has been entered into your calendar, " + wprintf(_("You have accepted this meeting invitation. " + "It has been entered into your calendar.") ); } else if (!strcasecmp(bstr("sc"), "tentative")) { - wprintf("You have tentatively accepted this meeting invitation. " - "It has been 'pencilled in' to your calendar, " + wprintf(_("You have tentatively accepted this meeting invitation. " + "It has been 'pencilled in' to your calendar.") ); } else if (!strcasecmp(bstr("sc"), "decline")) { - wprintf("You have declined this meeting invitation. " - "It has not been entered into your calendar, " - ); + wprintf(_("You have declined this meeting invitation. " + "It has not been entered into your calendar.") + ); } - wprintf("and a reply has been sent to the meeting organizer." - "
\n" - ); + wprintf(" "); + wprintf(_("A reply has been sent to the meeting organizer.")); + wprintf(""); } else { - wprintf("" - "%s\n", &buf[4]); + wprintf(""); + wprintf("%s\n", &buf[4]); + wprintf(""); } - wprintf("wc_roomname); - wprintf("\">
Return to messages
\n"); - - wDumpContent(1); + end_ajax_response(); } -/* - * Handle an incoming RSVP +/** + * \brief Handle an incoming RSVP */ -void handle_rsvp(void) { - char buf[SIZ]; - - output_headers(3); +void handle_rsvp(void) +{ + char buf[1024]; - wprintf("
" - "Update your calendar with this RSVP" - "

\n" - ); + begin_ajax_response(); serv_printf("ICAL handle_rsvp|%s|%s|%s|", bstr("msgnum"), bstr("cal_partnum"), bstr("sc") ); - serv_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf("
" - "" - "" - ); + wprintf(""); if (!strcasecmp(bstr("sc"), "update")) { - wprintf("Your calendar has been updated " - "to reflect this RSVP." - ); + wprintf(_("Your calendar has been updated to reflect this RSVP.")); } else if (!strcasecmp(bstr("sc"), "ignore")) { - wprintf("You have chosen to ignore this RSVP. " - "Your calendar has not been updated." - ); + wprintf(_("You have chosen to ignore this RSVP. " + "Your calendar has not been updated.") + ); } - wprintf("
\n" - ); + wprintf(""); } else { - wprintf("" - "%s\n", &buf[4]); + wprintf(" %s\n", &buf[4]); + wprintf(""); } - wprintf("wc_roomname); - wprintf("\">
Return to messages
\n"); - - wDumpContent(1); + end_ajax_response(); } +/*@}*/ +/*-----------------------------------------------------------------------**/ -/*****************************************************************************/ - -/* - * Display handlers for message reading +/** + * \defgroup MsgDisplayHandlers Display handlers for message reading + * \ingroup Calendaring */ +/*@{*/ + +int Flathash(const char *str, long len) +{ + if (len != sizeof (int)) + return 0; + else return *(int*)str; +} + +/** + * \brief clean up ical memory + * todo this could get trouble with future ical versions + */ +void delete_cal(void *vCal) +{ + disp_cal *Cal = (disp_cal*) vCal; + icalcomponent_free(Cal->cal); + free(Cal->from); + free(Cal); +} + /* - * If we're reading calendar items, just store them for now. We have to - * sort and re-output them later when we draw the calendar. + * This is the meat-and-bones of the first part of our two-phase calendar display. + * As we encounter calendar items in messages being read from the server, we break out + * any iCalendar objects and store them in a hash table. Later on, the second phase will + * use this hash table to render the calendar for display. */ -void display_individual_cal(icalcomponent *cal, long msgnum) { +void display_individual_cal(icalcomponent *cal, long msgnum, char *from, int unread) +{ + icalproperty *ps = NULL; + struct icaltimetype dtstart, dtend; + struct icaldurationtype dur; + struct wcsession *WCC = WC; + disp_cal *Cal; + size_t len; + time_t final_recurrence = 0; + + /* recur variables */ + icalproperty *rrule = NULL; + struct icalrecurrencetype recur; + icalrecur_iterator *ritr = NULL; + struct icaltimetype next; + int num_recur = 0; + + dtstart = icaltime_null_time(); + dtend = icaltime_null_time(); + + if (WCC->disp_cal_items == NULL) + WCC->disp_cal_items = NewHash(0, Flathash); + + /* Note: anything we do here, we also have to do below for the recurrences. */ + Cal = (disp_cal*) malloc(sizeof(disp_cal)); + memset(Cal, 0, sizeof(disp_cal)); + + Cal->cal = icalcomponent_new_clone(cal); + Cal->unread = unread; + len = strlen(from); + Cal->from = (char*)malloc(len+ 1); + memcpy(Cal->from, from, len + 1); + ical_dezonify(Cal->cal); + Cal->cal_msgnum = msgnum; + + /* Precalculate the starting date and time of this event, and store it in our top-level + * structure. Later, when we are rendering the calendar, we can just peek at these values + * without having to break apart every calendar item. + */ + ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); + if (ps != NULL) { + dtstart = icalproperty_get_dtstart(ps); + Cal->event_start = icaltime_as_timet(dtstart); + } - WC->num_cal += 1; + /* Do the same for the ending date and time. It makes the day view much easier to render. */ + ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (ps != NULL) { + dtend = icalproperty_get_dtstart(ps); + Cal->event_end = icaltime_as_timet(dtend); + } - WC->disp_cal = realloc(WC->disp_cal, - (sizeof(icalcomponent *) * WC->num_cal) ); - WC->disp_cal[WC->num_cal - 1] = icalcomponent_new_clone(cal); + /* Store it in the hash list. */ + Put(WCC->disp_cal_items, + (char*) &Cal->event_start, + sizeof(Cal->event_start), + Cal, + delete_cal); - WC->cal_msgnum = realloc(WC->cal_msgnum, - (sizeof(long) * WC->num_cal) ); - WC->cal_msgnum[WC->num_cal - 1] = msgnum; -} + /* handle recurring events */ + if (icaltime_is_null_time(dtstart)) return; /* Can't recur without a start time */ + if (!icaltime_is_null_time(dtend)) { /* Need duration for recurrences */ + dur = icaltime_subtract(dtend, dtstart); + } -/* - * Display a task in the task list - */ -void display_individual_task(icalcomponent *vtodo, long msgnum) { - icalproperty *p; + /* + * Just let libical iterate the recurrence, and keep looping back to the top of this function, + * adding new hash entries that all point back to the same msgnum, until either the iteration + * stops or some outer bound is reached. The display code will automatically do the Right Thing. + */ - p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY); - wprintf("
  • wc_roomname); - wprintf("\">"); - if (p != NULL) { - escputs((char *)icalproperty_get_comment(p)); + rrule = icalcomponent_get_first_property(Cal->cal, ICAL_RRULE_PROPERTY); + if (!rrule) return; + recur = icalproperty_get_rrule(rrule); + ritr = icalrecur_iterator_new(recur, dtstart); + if (!ritr) return; + + while (next = icalrecur_iterator_next(ritr), !icaltime_is_null_time(next) ) { + ++num_recur; + + if (num_recur > 1) { /* Skip the first one. We already did it at the root. */ + + /* Note: anything we do here, we also have to do above for the root event. */ + Cal = (disp_cal*) malloc(sizeof(disp_cal)); + memset(Cal, 0, sizeof(disp_cal)); + + Cal->cal = icalcomponent_new_clone(cal); + Cal->unread = unread; + len = strlen(from); + Cal->from = (char*)malloc(len+ 1); + memcpy(Cal->from, from, len + 1); + ical_dezonify(Cal->cal); + Cal->cal_msgnum = msgnum; + + ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); + if (ps != NULL) { + icalcomponent_remove_property(Cal->cal, ps); + ps = icalproperty_new_dtstart(next); + icalcomponent_add_property(Cal->cal, ps); + Cal->event_start = icaltime_as_timet(next); + final_recurrence = Cal->event_start; + } + + ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY); + if (ps != NULL) { + icalcomponent_remove_property(Cal->cal, ps); + + /* Make a new dtend */ + ps = icalproperty_new_dtend(icaltime_add(next, dur)); + + /* and stick it somewhere */ + icalcomponent_add_property(Cal->cal, ps); + } + + Put(WCC->disp_cal_items, + (char*) &Cal->event_start, + sizeof(Cal->event_start), + Cal, + delete_cal); + } } - wprintf("\n"); + lprintf(9, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); + } + /* * Display a task by itself (for editing) */ -void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { +void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, char *from, int unread) +{ icalcomponent *vtodo; icalproperty *p; - struct icaltimetype t; + struct icaltimetype IcalTime; time_t now; int created_new_vtodo = 0; + icalproperty_status todoStatus; now = time(NULL); if (supplied_vtodo != NULL) { vtodo = supplied_vtodo; + + /** + * If we're looking at a fully encapsulated VCALENDAR + * rather than a VTODO component, attempt to use the first + * relevant VTODO subcomponent. If there is none, the + * NULL returned by icalcomponent_get_first_component() will + * tell the next iteration of this function to create a + * new one. + */ + if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) { + display_edit_individual_task( + icalcomponent_get_first_component( + vtodo, ICAL_VTODO_COMPONENT + ), + msgnum, + from, unread + ); + return; + } } else { vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT); created_new_vtodo = 1; } - - output_headers(3); - wprintf("
    " - "Edit task" - "

    \n" - ); - - wprintf("
    \n"); + + // TODO: Can we take all this and move it into a template? + output_headers(1, 1, 1, 0, 0, 0); + wprintf(""); + p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY); + // Get summary early for title + wprintf("
    \n"); + wprintf("
    "); + wprintf(_("Edit task")); + wprintf("- "); + if (p != NULL) { + escputs((char *)icalproperty_get_comment(p)); + } + wprintf("
    "); + + wprintf("
    \n"); + wprintf("\n"); + wprintf("
    \n "); + wprintf("\n", WC->nonce); wprintf("\n", msgnum); + wprintf("
    "); + wprintf("
    "); + wprintf("\n"); - wprintf("Summary: " + wprintf("\n"); - wprintf("Start date: "); + wprintf("\n"); + + wprintf("\n"); + todoStatus = icalcomponent_get_status(vtodo); + wprintf(""); + // start category field + p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY); + wprintf("
    "); + wprintf(_("Summary:")); + wprintf("" "
    \n"); + wprintf("\">
    "); + wprintf(_("Start date:")); + wprintf(""); p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY); - if (p != NULL) { - t = icalproperty_get_dtstart(p); + wprintf(""); + wprintf(_("No date")); + + wprintf(" "); + wprintf(_("or")); + wprintf(" "); + if (p != NULL) { + IcalTime = icalproperty_get_dtstart(p); } - display_icaltimetype_as_webform(&t, "dtstart"); - wprintf("
    \n"); - - wprintf("Due date: "); + else + IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone()); + display_icaltimetype_as_webform(&IcalTime, "dtstart"); + wprintf("
    "); + wprintf(_("Due date:")); + wprintf(""); p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY); + wprintf(""); + wprintf(_("No date")); + wprintf(" "); + wprintf(_("or")); + wprintf(" "); if (p != NULL) { - t = icalproperty_get_due(p); + IcalTime = icalproperty_get_due(p); } - else { - t = icaltime_from_timet(now, 0); + else + IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone()); + display_icaltimetype_as_webform(&IcalTime, "due"); + + wprintf("
    \n"); + wprintf(_("Completed:")); + wprintf(""); + wprintf(""); + wprintf("
    "); + wprintf(_("Category:")); + wprintf(""); + wprintf("\n"); - - wprintf("

    \n"); + wprintf("
    \n"); - wprintf("" + wprintf("" + "" "  " - "\n" + "\n" "  " - "\n" - "\n" - ); - + "\n" + "\n", + _("Save"), + _("Delete"), + _("Cancel") + ); + wprintf("
    "); wprintf("\n"); - + wprintf("
    \n"); + wprintf(""); wDumpContent(1); if (created_new_vtodo) { @@ -588,146 +718,240 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { } /* - * Save an edited task + * \brief Save an edited task + * \param supplied_vtodo the task to save + * \param msgnum number of the mesage in our db */ -void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { +void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from, int unread) +{ char buf[SIZ]; int delete_existing = 0; icalproperty *prop; - icalcomponent *vtodo; + icalcomponent *vtodo, *encaps; int created_new_vtodo = 0; + int i; + int sequence = 0; + struct icaltimetype t; if (supplied_vtodo != NULL) { vtodo = supplied_vtodo; + /** + * If we're looking at a fully encapsulated VCALENDAR + * rather than a VTODO component, attempt to use the first + * relevant VTODO subcomponent. If there is none, the + * NULL returned by icalcomponent_get_first_component() will + * tell the next iteration of this function to create a + * new one. + */ + if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) { + save_individual_task( + icalcomponent_get_first_component( + vtodo, ICAL_VTODO_COMPONENT), + msgnum, from, unread + ); + return; + } } else { vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT); created_new_vtodo = 1; } - if (!strcasecmp(bstr("sc"), "Save")) { + if (havebstr("save_button")) { - /* Replace values in the component with ones from the form */ + /** Replace values in the component with ones from the form */ while (prop = icalcomponent_get_first_property(vtodo, - ICAL_SUMMARY_PROPERTY), prop != NULL) { + ICAL_SUMMARY_PROPERTY), prop != NULL) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } - icalcomponent_add_property(vtodo, - icalproperty_new_summary(bstr("summary"))); - + if (havebstr("summary")) { + + icalcomponent_add_property(vtodo, + icalproperty_new_summary(bstr("summary"))); + } else { + icalcomponent_add_property(vtodo, + icalproperty_new_summary("Untitled Task")); + } + while (prop = icalcomponent_get_first_property(vtodo, - ICAL_DESCRIPTION_PROPERTY), prop != NULL) { + ICAL_DESCRIPTION_PROPERTY), prop != NULL) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } - icalcomponent_add_property(vtodo, - icalproperty_new_description(bstr("description"))); + if (havebstr("description")) { + icalcomponent_add_property(vtodo, + icalproperty_new_description(bstr("description"))); + } while (prop = icalcomponent_get_first_property(vtodo, - ICAL_DTSTART_PROPERTY), prop != NULL) { + ICAL_DTSTART_PROPERTY), prop != NULL) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } - icalcomponent_add_property(vtodo, - icalproperty_new_dtstart( - icaltime_from_webform("dtstart") - ) - ); - + if (IsEmptyStr(bstr("nodtstart"))) { + icaltime_from_webform(&t, "dtstart"); + icalcomponent_add_property(vtodo, + icalproperty_new_dtstart(t) + ); + } + while(prop = icalcomponent_get_first_property(vtodo, + ICAL_STATUS_PROPERTY), prop != NULL) { + icalcomponent_remove_property(vtodo,prop); + icalproperty_free(prop); + } + if (havebstr("status")) { + icalproperty_status taskStatus = icalproperty_string_to_status( + bstr("status")); + icalcomponent_set_status(vtodo, taskStatus); + } + while (prop = icalcomponent_get_first_property(vtodo, + ICAL_CATEGORIES_PROPERTY), prop != NULL) { + icalcomponent_remove_property(vtodo,prop); + icalproperty_free(prop); + } + if (!IsEmptyStr(bstr("category"))) { + prop = icalproperty_new_categories(bstr("category")); + icalcomponent_add_property(vtodo,prop); + } + while (prop = icalcomponent_get_first_property(vtodo, + ICAL_DUE_PROPERTY), prop != NULL) { + icalcomponent_remove_property(vtodo, prop); + icalproperty_free(prop); + } + if (IsEmptyStr(bstr("nodue"))) { + icaltime_from_webform(&t, "due"); + icalcomponent_add_property(vtodo, + icalproperty_new_due(t) + ); + } + /** Give this task a UID if it doesn't have one. */ + lprintf(9, "Give this task a UID if it doesn't have one.\n"); + if (icalcomponent_get_first_property(vtodo, + ICAL_UID_PROPERTY) == NULL) { + generate_uuid(buf); + icalcomponent_add_property(vtodo, + icalproperty_new_uid(buf) + ); + } + + /** Increment the sequence ID */ + lprintf(9, "Increment the sequence ID\n"); while (prop = icalcomponent_get_first_property(vtodo, - ICAL_DUE_PROPERTY), prop != NULL) { + ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) { + i = icalproperty_get_sequence(prop); + lprintf(9, "Sequence was %d\n", i); + if (i > sequence) sequence = i; icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } + ++sequence; + lprintf(9, "New sequence is %d. Adding...\n", sequence); icalcomponent_add_property(vtodo, - icalproperty_new_due( - icaltime_from_webform("due") - ) - ); - + icalproperty_new_sequence(sequence) + ); + + /** + * Encapsulate event into full VCALENDAR component. Clone it first, + * for two reasons: one, it's easier to just free the whole thing + * when we're done instead of unbundling, but more importantly, we + * can't encapsulate something that may already be encapsulated + * somewhere else. + */ + lprintf(9, "Encapsulating into a full VCALENDAR component\n"); + encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vtodo)); + /* Serialize it and save it to the message base */ serv_puts("ENT0 1|||4"); - serv_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] == '4') { serv_puts("Content-type: text/calendar"); serv_puts(""); - serv_puts(icalcomponent_as_ical_string(vtodo)); + serv_puts(icalcomponent_as_ical_string(encaps)); serv_puts("000"); - /* Probably not necessary; the server will see the UID + /** + * Probably not necessary; the server will see the UID * of the object and delete the old one anyway, but * just in case... */ delete_existing = 1; } + icalcomponent_free(encaps); } - /* + /** * If the user clicked 'Delete' then explicitly delete the message. */ - if (!strcasecmp(bstr("sc"), "Delete")) { + if (havebstr("delete_button")) { delete_existing = 1; } if ( (delete_existing) && (msgnum > 0L) ) { - serv_printf("DELE %ld", atol(bstr("msgnum"))); - serv_gets(buf); + serv_printf("DELE %ld", lbstr("msgnum")); + serv_getln(buf, sizeof buf); } if (created_new_vtodo) { icalcomponent_free(vtodo); } - /* Go back to the task list */ + /** Go back to the task list */ readloop("readfwd"); } /* - * Code common to all display handlers. Given a message number and a MIME + * Code common to all icalendar display handlers. Given a message number and a MIME * type, we load the message and hunt for that MIME type. If found, we load * the relevant part, deserialize it into a libical component, filter it for * the requested object type, and feed it to the specified handler. */ -void display_using_handler(long msgnum, - char *mimetype, - icalcomponent_kind which_kind, - void (*callback)(icalcomponent *, long) - ) { - char buf[SIZ]; - char mime_partnum[SIZ]; - char mime_filename[SIZ]; - char mime_content_type[SIZ]; - char mime_disposition[SIZ]; +void display_using_handler(long msgnum, int unread, + icalcomponent_kind which_kind, + void (*callback)(icalcomponent *, long, char*, int) + ) +{ + char buf[1024]; + char from[128] = ""; + char mime_partnum[256]; + char mime_filename[256]; + char mime_content_type[256]; + char mime_disposition[256]; int mime_length; - char relevant_partnum[SIZ]; + char relevant_partnum[256]; char *relevant_source = NULL; icalcomponent *cal, *c; - sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */ + relevant_partnum[0] = '\0'; + sprintf(buf, "MSG4 %ld", msgnum); /* we need the mime headers */ serv_puts(buf); - serv_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] != '1') return; - while (serv_gets(buf), strcmp(buf, "000")) { + while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if (!strncasecmp(buf, "part=", 5)) { - extract(mime_filename, &buf[5], 1); - extract(mime_partnum, &buf[5], 2); - extract(mime_disposition, &buf[5], 3); - extract(mime_content_type, &buf[5], 4); + extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename); + extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum); + extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition); + extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type); mime_length = extract_int(&buf[5], 5); - if (!strcasecmp(mime_content_type, "text/calendar")) { + if ( (!strcasecmp(mime_content_type, "text/calendar")) + || (!strcasecmp(mime_content_type, "application/ics")) + || (!strcasecmp(mime_content_type, "text/vtodo")) + ) { strcpy(relevant_partnum, mime_partnum); } - + } + else if (!strncasecmp(buf, "from=", 4)) { + extract_token(from, buf, 1, '=', sizeof(from)); } } - if (strlen(relevant_partnum) > 0) { + if (!IsEmptyStr(relevant_partnum)) { relevant_source = load_mimepart(msgnum, relevant_partnum); if (relevant_source != NULL) { @@ -738,101 +962,164 @@ void display_using_handler(long msgnum, /* Simple components of desired type */ if (icalcomponent_isa(cal) == which_kind) { - callback(cal, msgnum); + callback(cal, msgnum, from, unread); } /* Subcomponents of desired type */ - for (c = icalcomponent_get_first_component(cal, - which_kind); - (c != 0); - c = icalcomponent_get_next_component(cal, - which_kind)) { - callback(c, msgnum); + for (c = icalcomponent_get_first_component(cal, which_kind); + (c != 0); + c = icalcomponent_get_next_component(cal, which_kind)) { + callback(c, msgnum, from, unread); } icalcomponent_free(cal); } free(relevant_source); } } - + icalmemory_free_ring(); } -void display_calendar(long msgnum) { - display_using_handler(msgnum, "text/calendar", - ICAL_VEVENT_COMPONENT, - display_individual_cal); +/* + * Display a calendar item + */ +void display_calendar(long msgnum, int unread) { + display_using_handler(msgnum, unread, ICAL_VEVENT_COMPONENT, display_individual_cal); } -void display_task(long msgnum) { - display_using_handler(msgnum, "text/calendar", - ICAL_VTODO_COMPONENT, - display_individual_task); +/* + * Display task view + */ +void display_task(long msgnum, int unread) { + display_using_handler(msgnum, unread, ICAL_VTODO_COMPONENT, display_individual_cal); } +/* + * Display the editor component for a task + */ void display_edit_task(void) { long msgnum = 0L; - + /* Force change the room if we have to */ - if (strlen(bstr("taskrm")) > 0) { - gotoroom(bstr("taskrm"), 0); + if (havebstr("taskrm")) { + gotoroom((char *)bstr("taskrm")); } - msgnum = atol(bstr("msgnum")); + msgnum = lbstr("msgnum"); if (msgnum > 0L) { /* existing task */ - display_using_handler(msgnum, "text/calendar", - ICAL_VTODO_COMPONENT, - display_edit_individual_task); + display_using_handler(msgnum, 0, + ICAL_VTODO_COMPONENT, + display_edit_individual_task); } else { /* new task */ - display_edit_individual_task(NULL, 0L); + display_edit_individual_task(NULL, 0L, "", 0); } } +/* + * save an edited task + */ void save_task(void) { long msgnum = 0L; - msgnum = atol(bstr("msgnum")); + msgnum = lbstr("msgnum"); if (msgnum > 0L) { - display_using_handler(msgnum, "text/calendar", - ICAL_VTODO_COMPONENT, - save_individual_task); + display_using_handler(msgnum, 0, ICAL_VTODO_COMPONENT, save_individual_task); } else { - save_individual_task(NULL, 0L); + save_individual_task(NULL, 0L, "", 0); } } +/* + * display the editor component for an event + */ void display_edit_event(void) { long msgnum = 0L; - msgnum = atol(bstr("msgnum")); + msgnum = lbstr("msgnum"); if (msgnum > 0L) { /* existing event */ - display_using_handler(msgnum, "text/calendar", - ICAL_VEVENT_COMPONENT, - display_edit_individual_event); + display_using_handler(msgnum, 0, ICAL_VEVENT_COMPONENT, display_edit_individual_event); } else { /* new event */ - display_edit_individual_event(NULL, 0L); + display_edit_individual_event(NULL, 0L, "", 0); } } +/* + * save an edited event + */ void save_event(void) { long msgnum = 0L; - msgnum = atol(bstr("msgnum")); + msgnum = lbstr("msgnum"); if (msgnum > 0L) { - display_using_handler(msgnum, "text/calendar", - ICAL_VEVENT_COMPONENT, - save_individual_event); + display_using_handler(msgnum, 0, ICAL_VEVENT_COMPONENT, save_individual_event); } else { - save_individual_event(NULL, 0L); + save_individual_event(NULL, 0L, "", 0); + } +} + + + + + +/* + * Anonymous request of freebusy data for a user + */ +void do_freebusy(const char *req) { + char who[SIZ]; + char buf[SIZ]; + int len; + long lines; + + extract_token(who, req, 1, ' ', sizeof who); + if (!strncasecmp(who, "/freebusy/", 10)) { + strcpy(who, &who[10]); + } + unescape_input(who); + + len = strlen(who); + if ( (!strcasecmp(&who[len-4], ".vcf")) + || (!strcasecmp(&who[len-4], ".ifb")) + || (!strcasecmp(&who[len-4], ".vfb")) ) { + who[len-4] = 0; + } + + lprintf(9, "freebusy requested for <%s>\n", who); + serv_printf("ICAL freebusy|%s", who); + serv_getln(buf, sizeof buf); + + if (buf[0] != '1') { + hprintf("HTTP/1.1 404 %s\n", &buf[4]); + output_headers(0, 0, 0, 0, 0, 0); + hprintf("Content-Type: text/plain\r\n"); + wprintf("%s\n", &buf[4]); + end_burst(); + return; } + + read_server_text(WC->WBuf, &lines); + http_transmit_thing("text/calendar", 0); } -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */ + + + + +void +InitModule_CALENDAR +(void) +{ + WebcitAddUrlHandler(HKEY("display_edit_task"), display_edit_task, 0); + WebcitAddUrlHandler(HKEY("save_task"), save_task, 0); + WebcitAddUrlHandler(HKEY("display_edit_event"), display_edit_event, 0); + WebcitAddUrlHandler(HKEY("save_event"), save_event, 0); + WebcitAddUrlHandler(HKEY("respond_to_request"), respond_to_request, 0); + WebcitAddUrlHandler(HKEY("handle_rsvp"), handle_rsvp, 0); +}