X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar.c;h=e91012eefcab1e131935a2354a2f2c79d7c2a9fb;hb=76f23da782e9e80dad0a8ae1336230da5a6fa124;hp=1836a2fea0a18fde001064d88da0c16f48e1a88d;hpb=ee8121a2817b5a36b314a6c55ecba5d83fef3bad;p=citadel.git diff --git a/webcit/calendar.c b/webcit/calendar.c index 1836a2fea..e91012eef 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -2,62 +2,25 @@ * $Id$ * * Functions which handle calendar objects and their processing/display. - * */ #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; @@ -68,10 +31,14 @@ void cal_process_object(icalcomponent *cal, 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 */ @@ -80,58 +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"); } /* @@ -140,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 - ); + wprintf("
%s
", d_str); } else { tt = icaltime_as_timet(t); - fmt_date(buf, tt, 0); - wprintf("", buf); + wprintf("
%s
", buf); } } @@ -167,48 +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, 0); - wprintf("", buf); + 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); } @@ -227,81 +188,90 @@ void cal_process_object(icalcomponent *cal, if (is_update) { snprintf(conflict_message, sizeof conflict_message, - _("This is an update of '%s' which is already in your calendar."), conflict_name); + _("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); + _("This event would conflict with '%s' which is already in your calendar."), conflict_name); } - wprintf("\n"); + wprintf("\n"); } } lprintf(9, "...done.\n"); + wprintf(""); + /* Display the Accept/Decline buttons */ - wprintf("" - "\n", - msgnum, cal_partnum, _("Accept"), - msgnum, cal_partnum, _("Tentative"), - msgnum, cal_partnum, _("Decline") - ); + 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_getln(buf, sizeof buf); - } - ***********/ + serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum); + serv_getln(buf, sizeof buf); + } + ***********/ /* Display the update buttons */ - wprintf("\n", + wprintf("

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

\n", + divname, _("Click Update to accept this reply and update your calendar."), - msgnum, cal_partnum, _("Update"), - msgnum, cal_partnum, _("Ignore") - ); - + 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" - "" - "  " - ""); - wprintf(_("Meeting invitation")); - wprintf("
\n" - "" - "  " - ""); - wprintf(_("Attendee's reply to your invitation")); - wprintf("
\n" - "" - "  " - ""); - wprintf(_("Published event")); - wprintf("
"); - wprintf(_("This is an unknown type of calendar item.")); - wprintf("
"); + wprintf("
"); wprintf(_("Summary:")); - wprintf("
"); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
"); + wprintf("
"); wprintf(_("Location:")); - wprintf("
"); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
"); + 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, %d
"); + webcit_fmt_date(buf, tt, 0); + wprintf("
"); wprintf(_("Starting date/time:")); - wprintf("
%s
"); + webcit_fmt_date(buf, tt, 0); + wprintf("
"); wprintf(_("Ending date/time:")); - wprintf("
%s
"); + wprintf("
"); wprintf(_("Description:")); - wprintf("
"); + wprintf("
"); escputs((char *)icalproperty_get_comment(p)); - wprintf("
"); + 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("
"); + 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", + wprintf("
%s", (is_update ? - _("Update:") : - _("CONFLICT:") - ) - ); + _("Update:") : + _("CONFLICT:") + ) + ); + wprintf("
"); escputs(conflict_message); - wprintf("
How would you like to respond to this invitation?" - "%s" - " | " - "%s" - " | " - "%s" - "
" - "%s" - "" - "%s" - " | " - "%s" - "" - "
\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); @@ -322,22 +292,15 @@ 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]; +void respond_to_request(void) +{ + char buf[1024]; - output_headers(1, 1, 2, 0, 0, 0); - - wprintf("
\n"); - wprintf("
" - ""); - wprintf(_("Respond to meeting request")); - wprintf("" - "
\n" - ); - wprintf("
\n
\n"); + begin_ajax_response(); serv_printf("ICAL respond|%s|%s|%s|", bstr("msgnum"), @@ -347,10 +310,7 @@ void respond_to_request(void) { 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.") @@ -361,44 +321,31 @@ void respond_to_request(void) { ); } else if (!strcasecmp(bstr("sc"), "decline")) { wprintf(_("You have declined this meeting invitation. " - "It has not been entered into your calendar.") - ); + "It has not been entered into your calendar.") + ); } wprintf(" "); wprintf(_("A reply has been sent to the meeting organizer.")); - wprintf("
\n"); + wprintf(""); } else { - wprintf("" - "%s\n", &buf[4]); + wprintf(""); + wprintf("%s\n", &buf[4]); + wprintf(""); } - wprintf("wc_roomname); - wprintf("\">
"); - wprintf(_("Return to messages")); - wprintf("
\n"); - - wDumpContent(1); + end_ajax_response(); } -/* - * Handle an incoming RSVP +/** + * \brief Handle an incoming RSVP */ -void handle_rsvp(void) { - char buf[SIZ]; +void handle_rsvp(void) +{ + char buf[1024]; - output_headers(1, 1, 2, 0, 0, 0); - - wprintf("
\n"); - wprintf("
" - ""); - wprintf(_("Update your calendar with this RSVP")); - wprintf("" - "
\n" - "
\n
\n" - ); + begin_ajax_response(); serv_printf("ICAL handle_rsvp|%s|%s|%s|", bstr("msgnum"), @@ -408,80 +355,139 @@ void handle_rsvp(void) { 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.")); } else if (!strcasecmp(bstr("sc"), "ignore")) { wprintf(_("You have chosen to ignore this RSVP. " - "Your calendar has not been updated.") - ); + "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("\">
"); - wprintf(_("Return to messages")); - wprintf("
\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; +} -/* - * 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. + + +/** + * \brief clean up ical memory + * todo this could get trouble with future ical versions */ -void display_individual_cal(icalcomponent *cal, long msgnum) { +void delete_cal(void *vCal) +{ + disp_cal *Cal = (disp_cal*) vCal; + icalcomponent_free(Cal->cal); + free(Cal->from); + free(Cal); +} - WC->num_cal += 1; +/* + * 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, char *from, int unread) +{ + icalproperty *ps = NULL; + struct icaltimetype t; + struct wcsession *WCC = WC; + disp_cal *Cal; + size_t len; + + if (WCC->disp_cal_items == NULL) + WCC->disp_cal_items = NewHash(0, Flathash); + + 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) { + t = icalproperty_get_dtstart(ps); + Cal->event_start = icaltime_as_timet(t); + } - 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); + /* 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) { + t = icalproperty_get_dtstart(ps); + Cal->event_end = icaltime_as_timet(t); + } - WC->disp_cal[WC->num_cal - 1].cal_msgnum = msgnum; + /* Store it in the hash list. */ + Put(WCC->disp_cal_items, + (char*) &Cal->event_start, + sizeof(Cal->event_start), + Cal, + delete_cal); + + /* Right about here is probably where we want to add code to handle recurring events. + * 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 *should* automatically do the right + * thing (but we'll have to see). + */ } /* * 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 + /** + * 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 @@ -492,8 +498,10 @@ 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; } } @@ -501,26 +509,30 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT); created_new_vtodo = 1; } - - output_headers(1, 1, 2, 0, 0, 0); - 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("" - "
\n" - "
\n
\n" - ); - - wprintf("
" - "
"); + wprintf("- "); + if (p != NULL) { + escputs((char *)icalproperty_get_comment(p)); + } + wprintf(""); - wprintf("
\n"); + wprintf("
\n"); + wprintf("\n"); + wprintf("
\n "); + wprintf("\n", WC->nonce); wprintf("\n", msgnum); - - wprintf("\n"); + wprintf(""); + wprintf("
"); + wprintf("\n"); wprintf("\n"); wprintf("\n"); + todoStatus = icalcomponent_get_status(vtodo); + wprintf(""); + // start category field + p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY); + wprintf("\n "); + // end category field wprintf("
"); wprintf(_("Summary:")); @@ -537,54 +549,94 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { 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"); + 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); - if (p != NULL) { - t = icalproperty_get_due(p); + wprintf(""); + wprintf(_("No date")); + wprintf(" "); + wprintf(_("or")); + wprintf(" "); + if (p != NULL) { + IcalTime = icalproperty_get_due(p); } - display_icaltimetype_as_webform(&t, "due"); + 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(""); + wprintf("
"); wprintf(_("Description:")); wprintf(""); - wprintf("
\n"); - wprintf("
" + wprintf("" "" "  " "\n" "  " "\n" - "
\n", + "\n", _("Save"), _("Delete"), _("Cancel") - ); - + ); + wprintf("
"); wprintf("\n"); - - wprintf("
\n"); + wprintf("
\n"); + wprintf(""); wDumpContent(1); if (created_new_vtodo) { @@ -593,10 +645,12 @@ 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,7 +662,8 @@ void save_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 @@ -618,9 +673,9 @@ 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; } } @@ -629,60 +684,89 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { created_new_vtodo = 1; } - if (strlen(bstr("save_button")) > 0) { + 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); } - icaltime_from_webform(&t, "dtstart"); - icalcomponent_add_property(vtodo, - icalproperty_new_dtstart(t) - ); - + 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) { + ICAL_DUE_PROPERTY), prop != NULL) { icalcomponent_remove_property(vtodo, prop); icalproperty_free(prop); } - icaltime_from_webform(&t, "due"); - icalcomponent_add_property(vtodo, - icalproperty_new_due(t) - ); - - /* Give this task a UID if it doesn't have one. */ + 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) { + ICAL_UID_PROPERTY) == NULL) { generate_uuid(buf); icalcomponent_add_property(vtodo, - icalproperty_new_uid(buf) - ); + icalproperty_new_uid(buf) + ); } - /* 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) ) { + ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) { i = icalproperty_get_sequence(prop); lprintf(9, "Sequence was %d\n", i); if (i > sequence) sequence = i; @@ -692,17 +776,17 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { ++sequence; lprintf(9, "New sequence is %d. Adding...\n", sequence); icalcomponent_add_property(vtodo, - icalproperty_new_sequence(sequence) - ); + 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 */ @@ -714,7 +798,8 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { 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... */ @@ -723,15 +808,15 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { icalcomponent_free(encaps); } - /* + /** * If the user clicked 'Delete' then explicitly delete the message. */ - if (strlen(bstr("delete_button")) > 0) { + if (havebstr("delete_button")) { delete_existing = 1; } if ( (delete_existing) && (msgnum > 0L) ) { - serv_printf("DELE %ld", atol(bstr("msgnum"))); + serv_printf("DELE %ld", lbstr("msgnum")); serv_getln(buf, sizeof buf); } @@ -739,35 +824,42 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) { 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) - ) { - 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_getln(buf, sizeof buf); if (buf[0] != '1') return; @@ -780,14 +872,19 @@ void display_using_handler(long msgnum, 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) { @@ -796,102 +893,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); + 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); +/** + * \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", - ICAL_VTODO_COMPONENT, - display_individual_cal); +/** + * \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) { - gotoroom(bstr("taskrm")); + + /** Force change the room if we have to */ + 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); + /** 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")); + 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); } } +/** + * \brief 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); } } +/** + * \brief 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); } } @@ -899,13 +1016,15 @@ 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, ' ', sizeof who); if (!strncasecmp(who, "/freebusy/", 10)) { @@ -913,10 +1032,11 @@ void do_freebusy(char *req) { } unescape_input(who); - if ( (!strcasecmp(&who[strlen(who)-4], ".vcf")) - || (!strcasecmp(&who[strlen(who)-4], ".ifb")) - || (!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); @@ -939,4 +1059,16 @@ void do_freebusy(char *req) { -#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); +}