X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar.c;h=bb1166d8babbed331965383e3fbc42dfe8a63526;hb=cf934431c7c8c1091b38c0b374f6a3b9293841ca;hp=3702758604a990db85ca34d349165a7f25c5fb4b;hpb=486fe78f4d6aefd8e6b3935dc046f735056cc756;p=citadel.git diff --git a/webcit/calendar.c b/webcit/calendar.c index 370275860..bb1166d8b 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -2,75 +2,19 @@ * $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 + * \brief Process a calendar object * ...at this point it's already been deserialized by cal_process_attachment() - * + * \param cal the calendar object + * \param recursion_level call stack depth ?????? + * \param msgnum number of the mesage in our db + * \param cal_partnum of the calendar object ???? */ void cal_process_object(icalcomponent *cal, int recursion_level, @@ -83,72 +27,71 @@ void cal_process_object(icalcomponent *cal, 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; - /* Leading HTML for the display of this object */ + 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 */ + /** Look for a method */ method = icalcomponent_get_first_property(cal, ICAL_METHOD_PROPERTY); - /* See what we need to do with this */ + /** 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" - ); + title = _("Meeting invitation"); break; case ICAL_METHOD_REPLY: - wprintf("\n" - ); + title = _("Attendee's reply to your invitation"); break; case ICAL_METHOD_PUBLISH: - wprintf("\n" - ); + title = _("Published event"); break; default: - wprintf("" - "\n"); + 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"); } - /* + /** * Only show start/end times if we're actually looking at the VEVENT * component. Otherwise it shows bogus dates for things like timezone. */ @@ -160,20 +103,23 @@ void cal_process_object(icalcomponent *cal, 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); } } @@ -181,41 +127,45 @@ 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. */ + /** 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. */ + /** 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)) { @@ -223,108 +173,101 @@ void cal_process_object(icalcomponent *cal, cal_process_object(c, recursion_level+1, msgnum, cal_partnum); } - /* If this is a REQUEST, display conflicts and buttons */ + /** If this is a REQUEST, display conflicts and buttons */ if (the_method == ICAL_METHOD_REQUEST) { /* 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"); + wprintf("
"); + escputs(conflict_message); + wprintf("
\n"); } } lprintf(9, "...done.\n"); - /* Display the Accept/Decline buttons */ - wprintf("\n", - msgnum, cal_partnum + wprintf(""); + + /** Display the Accept/Decline buttons */ + 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 this is a REPLY, display update button */ if (the_method == ICAL_METHOD_REPLY) { - /*********** - * In the future, if we want to validate this object before + /** \todo 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_getln(buf, sizeof buf); } ***********/ - /* Display the update buttons */ - wprintf("\n", - msgnum, cal_partnum + /** Display the update buttons */ + 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 */ + /** 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)); + 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" + _("Update:") : + _("CONFLICT:") ) - ); - 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) { icalcomponent *cal; @@ -332,7 +275,8 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) { 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; } @@ -346,149 +290,131 @@ 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]; + char buf[1024]; - output_headers(1, 1, 2, 0, 0, 0, 0); - - wprintf("
\n"); - wprintf("
" - "Respond to meeting request" - "
\n" - ); - wprintf("
\n
\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]; + char buf[1024]; - output_headers(1, 1, 2, 0, 0, 0, 0); - - wprintf("
\n"); - wprintf("
" - "" - "Update your calendar with this RSVP" - "
\n" - "
\n
\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"); + end_ajax_response(); - wDumpContent(1); } - -/*****************************************************************************/ +/*@}*/ +/*-----------------------------------------------------------------------**/ -/* - * Display handlers for message reading +/** + * \defgroup MsgDisplayHandlers Display handlers for message reading + * \ingroup Calendaring */ +/*@{*/ -/* + +/** + * \brief get items, keep them. * 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. + * \param cal Our calendar to process + * \param msgnum number of the mesage in our db */ -void display_individual_cal(icalcomponent *cal, long msgnum) { - - WC->num_cal += 1; - - WC->disp_cal = realloc(WC->disp_cal, - (sizeof(struct disp_cal) * WC->num_cal) ); - WC->disp_cal[WC->num_cal - 1].cal = icalcomponent_new_clone(cal); - - WC->disp_cal[WC->num_cal - 1].cal_msgnum = msgnum; +void display_individual_cal(icalcomponent *cal, long msgnum, char *from, int unread) +{ + struct wcsession *WCC = WC; /* stack this for faster access (WC is a function) */ + + WCC->num_cal += 1; + WCC->disp_cal = realloc(WC->disp_cal, (sizeof(struct disp_cal) * WCC->num_cal) ); + WCC->disp_cal[WCC->num_cal - 1].cal = icalcomponent_new_clone(cal); + WCC->disp_cal[WCC->num_cal - 1].unread = unread; + WCC->disp_cal[WCC->num_cal - 1].from = malloc (strlen(from) + 1); + strcpy (WCC->disp_cal[WCC->num_cal - 1].from, from); + ical_dezonify(WCC->disp_cal[WCC->num_cal - 1].cal); + WCC->disp_cal[WCC->num_cal - 1].cal_msgnum = msgnum; } /* + * \brief edit a task * Display a task by itself (for editing) - * + * \param supplied_vtodo the todo item we want to edit + * \param msgnum number of the mesage in our db */ -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; @@ -500,7 +426,8 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { if (supplied_vtodo != NULL) { vtodo = supplied_vtodo; - /* If we're looking at a fully encapsulated VCALENDAR + /** + * 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 @@ -511,7 +438,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { display_edit_individual_task( icalcomponent_get_first_component( vtodo, ICAL_VTODO_COMPONENT - ), msgnum + ), + msgnum, + from, unread ); return; } @@ -521,23 +450,29 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { created_new_vtodo = 1; } - output_headers(1, 1, 2, 0, 0, 0, 0); - wprintf("
\n" - "
" - "Edit task" - "
\n" - "
\n
\n" - ); + output_headers(1, 1, 2, 0, 0, 0); + wprintf("
\n"); + wprintf(""); + wprintf("

"); + wprintf(_("Edit task")); + wprintf("

"); + wprintf("
\n"); + + wprintf("
\n"); - wprintf("
"); + wprintf("
" + "
"); - wprintf("
\n"); + wprintf("\n"); + wprintf("\n", WC->nonce); wprintf("\n", msgnum); wprintf("\n"); - wprintf("\n"); - wprintf("\n"); - wprintf("\n"); - wprintf("
Summary:" + wprintf("
"); + wprintf(_("Summary:")); + wprintf("" "
Start date:"); + wprintf("
"); + wprintf(_("Start date:")); + wprintf(""); p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY); if (p != NULL) { t = icalproperty_get_dtstart(p); @@ -557,7 +494,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { display_icaltimetype_as_webform(&t, "dtstart"); wprintf("
Due date:"); + wprintf("
"); + wprintf(_("Due date:")); + wprintf(""); p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY); if (p != NULL) { t = icalproperty_get_due(p); @@ -567,7 +506,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { } display_icaltimetype_as_webform(&t, "due"); wprintf("
Description:"); + wprintf("
"); + wprintf(_("Description:")); + wprintf(""); wprintf("
\n"); wprintf("
" - "" + "" "  " - "\n" + "\n" "  " - "\n" - "
\n" + "\n" + "\n", + _("Save"), + _("Delete"), + _("Cancel") ); wprintf("
\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); if (created_new_vtodo) { @@ -597,10 +541,11 @@ 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; @@ -608,10 +553,12 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { 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 + /** + * 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 @@ -621,8 +568,8 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) { save_individual_task( icalcomponent_get_first_component( - vtodo, ICAL_VTODO_COMPONENT - ), msgnum + vtodo, ICAL_VTODO_COMPONENT), + msgnum, from, unread ); return; } @@ -632,18 +579,24 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { created_new_vtodo = 1; } - if (!strcasecmp(bstr("sc"), "Save")) { + if (!IsEmptyStr(bstr("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) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } - icalcomponent_add_property(vtodo, - icalproperty_new_summary(bstr("summary"))); - + if (!IsEmptyStr(bstr("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) { icalcomponent_remove_property(vtodo, prop); @@ -657,10 +610,9 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } + icaltime_from_webform(&t, "dtstart"); icalcomponent_add_property(vtodo, - icalproperty_new_dtstart( - icaltime_from_webform("dtstart") - ) + icalproperty_new_dtstart(t) ); while (prop = icalcomponent_get_first_property(vtodo, @@ -668,13 +620,12 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } + icaltime_from_webform(&t, "due"); icalcomponent_add_property(vtodo, - icalproperty_new_due( - icaltime_from_webform("due") - ) + icalproperty_new_due(t) ); - /* Give this task a UID if it doesn't have one. */ + /** 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) { @@ -684,7 +635,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { ); } - /* Increment the sequence ID */ + /** Increment the sequence ID */ lprintf(9, "Increment the sequence ID\n"); while (prop = icalcomponent_get_first_property(vtodo, ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) { @@ -700,26 +651,27 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { 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 full VCALENDAR component\n"); + 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(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... */ @@ -728,71 +680,82 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { icalcomponent_free(encaps); } - /* + /** * If the user clicked 'Delete' then explicitly delete the message. */ - if (!strcasecmp(bstr("sc"), "Delete")) { + if (!IsEmptyStr(bstr("delete_button"))) { delete_existing = 1; } if ( (delete_existing) && (msgnum > 0L) ) { serv_printf("DELE %ld", atol(bstr("msgnum"))); - serv_gets(buf); + 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"); } -/* +/** + * \brief generic item handler * Code common to all 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. + * \param mimetype mimetyp of our object + * \param which_kind sort of ical type + * \param msgnum number of the mesage in our db + * \param callback a funcion \todo * */ -void display_using_handler(long msgnum, - char *mimetype, - icalcomponent_kind which_kind, - void (*callback)(icalcomponent *, long) +void display_using_handler(long msgnum, int unread, + icalcomponent_kind which_kind, + void (*callback)(icalcomponent *, long, char*, int) ) { - char buf[SIZ]; - char mime_partnum[SIZ]; - char mime_filename[SIZ]; - char mime_content_type[SIZ]; - char mime_disposition[SIZ]; + 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) { @@ -801,102 +764,122 @@ void display_using_handler(long msgnum, ical_dezonify(cal); - /* Simple components of desired type */ + /** Simple components of desired type */ if (icalcomponent_isa(cal) == which_kind) { - callback(cal, msgnum); + callback(cal, msgnum, from, unread); } - /* Subcomponents of desired type */ + /** 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); + 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", +/** + * \brief display whole calendar + * \param msgnum number of the mesage in our db + */ +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", +/** + * \brief display whole taksview + * \param msgnum number of the mesage in our db + */ +void display_task(long msgnum, int unread) { + display_using_handler(msgnum, unread, ICAL_VTODO_COMPONENT, display_individual_cal); } +/** + * \brief 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) { + /** Force change the room if we have to */ + if (!IsEmptyStr(bstr("taskrm"))) { gotoroom(bstr("taskrm")); } msgnum = atol(bstr("msgnum")); if (msgnum > 0L) { - /* existing task */ - display_using_handler(msgnum, "text/calendar", + /** existing task */ + display_using_handler(msgnum, 0, ICAL_VTODO_COMPONENT, display_edit_individual_task); } else { - /* new task */ - display_edit_individual_task(NULL, 0L); + /** new task */ + display_edit_individual_task(NULL, 0L, "", 0); } } +/** + *\brief save an edited task + */ void save_task(void) { long msgnum = 0L; msgnum = atol(bstr("msgnum")); if (msgnum > 0L) { - display_using_handler(msgnum, "text/calendar", + display_using_handler(msgnum, 0, ICAL_VTODO_COMPONENT, save_individual_task); } else { - save_individual_task(NULL, 0L); + save_individual_task(NULL, 0L, "", 0); } } +/** + * \brief display the editor component for an event + */ void display_edit_event(void) { long msgnum = 0L; msgnum = atol(bstr("msgnum")); if (msgnum > 0L) { /* existing event */ - display_using_handler(msgnum, "text/calendar", + 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); } } +/** + * \brief save an edited event + */ void save_event(void) { long msgnum = 0L; msgnum = atol(bstr("msgnum")); if (msgnum > 0L) { - display_using_handler(msgnum, "text/calendar", + display_using_handler(msgnum, 0, ICAL_VEVENT_COMPONENT, save_individual_event); } else { - save_individual_event(NULL, 0L); + save_individual_event(NULL, 0L, "", 0); } } @@ -904,34 +887,38 @@ void save_event(void) { -/* - * freebusy display (for client software) +/** + * \brief freebusy display (for client software) + * \param req dunno. ????? */ void do_freebusy(char *req) { char who[SIZ]; char buf[SIZ]; char *fb; + int len; - extract_token(who, req, 1, ' '); + extract_token(who, req, 1, ' ', sizeof who); if (!strncasecmp(who, "/freebusy/", 10)) { strcpy(who, &who[10]); } unescape_input(who); - if ( (!strcasecmp(&who[strlen(who)-4], ".vcf")) - || (!strcasecmp(&who[strlen(who)-4], ".vfb")) ) { - who[strlen(who)-4] = 0; + 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_gets(buf); + serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("HTTP/1.0 404 %s\n", &buf[4]); - output_headers(0, 0, 0, 0, 0, 0, 0); - wprintf("Content-Type: text/plain\n"); - wprintf("\n"); + wprintf("HTTP/1.1 404 %s\n", &buf[4]); + output_headers(0, 0, 0, 0, 0, 0); + wprintf("Content-Type: text/plain\r\n"); + wprintf("\r\n"); wprintf("%s\n", &buf[4]); return; } @@ -942,5 +929,3 @@ void do_freebusy(char *req) { } - -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */