/*
* $Id$
+ *
+ * Functions which handle calendar objects and their processing/display.
*/
-/**
- * \defgroup calav Functions which handle calendar objects and their processing/display.
- * \ingroup Calendaring
- */
-/* @{ */
#include "webcit.h"
#include "webserver.h"
-#ifndef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
- * \brief get around non existing types
- * Handler stubs for builds with no calendar library available
- * \param part_source dummy pointer to the source
- * \param msgnum number of the mesage in the db
- * \param cal_partnum number of the calendar part
- */
-void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
-
- wprintf(_("<I>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.</I><br />\n")
- );
-
-}
-
-/**
- * \brief say we can't display calendar items
- * \param msgnum number of the mesage in our db
- */
-void display_calendar(long msgnum) {
- wprintf(_("<i>"
- "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."
- "</i><br />\n"));
-}
-
-/**
- * \brief say we can't display task items
- * \param msgnum number of the mesage in our db
- */
-void display_task(long msgnum) {
- wprintf(_("<i>"
- "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."
- "</i><br />\n"));
-}
-/** ok, we have calendaring available */
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-
-/****** End of handler stubs. Everything below this line is real. ******/
-
-
-
-/**
- * \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 ????
+/*
+ * 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;
sprintf(divname, "rsvp%04x", ++divcount);
- /** Leading HTML for the display of this object */
+ /* Leading HTML for the display of this object */
if (recursion_level == 0) {
wprintf("<div class=\"mimepart\">\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("<img src=\"static/calarea_48x.gif\">");
wprintf("<span>");
switch(the_method) {
- case ICAL_METHOD_REQUEST:
+ case ICAL_METHOD_REQUEST:
title = _("Meeting invitation");
break;
- case ICAL_METHOD_REPLY:
+ case ICAL_METHOD_REPLY:
title = _("Attendee's reply to your invitation");
break;
- case ICAL_METHOD_PUBLISH:
+ case ICAL_METHOD_PUBLISH:
title = _("Published event");
break;
- default:
+ default:
title = _("This is an unknown type of calendar item.");
break;
}
wprintf("</dd>\n");
}
- /**
+ /*
* Only show start/end times if we're actually looking at the VEVENT
* component. Otherwise it shows bogus dates for things like timezone.
*/
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);
}
else {
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 0);
+ webcit_fmt_date(buf, tt, 0);
wprintf("<dt>");
wprintf(_("Starting date/time:"));
wprintf("</dt><dd>%s</dd>", buf);
if (p != NULL) {
t = icalproperty_get_dtend(p);
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 0);
+ webcit_fmt_date(buf, tt, 0);
wprintf("<dt>");
wprintf(_("Ending date/time:"));
wprintf("</dt><dd>%s</dd>", buf);
wprintf("</dd>\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)) {
+ /* 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("<dt>");
wprintf(_("Attendee:"));
wprintf("</dt><dd>");
wprintf("</dd>\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)) {
+ (c != 0);
+ c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
/* Recursively process subcomponent */
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 */
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("<dt>%s",
(is_update ?
- _("Update:") :
- _("CONFLICT:")
- )
- );
+ _("Update:") :
+ _("CONFLICT:")
+ )
+ );
wprintf("</dt><dd>");
escputs(conflict_message);
wprintf("</dd>\n");
wprintf("</dl>");
- /** Display the Accept/Decline buttons */
- wprintf("<p id=\"%s_question\" class=\"buttons\">"
+ /* Display the Accept/Decline buttons */
+ wprintf("<p id=\"%s_question\">"
"%s "
+ " <span class=\"button_link\"> "
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Accept');\">%s</a>"
- "<span> | </span>"
+ "</span> <span class=\"button_link\">"
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Tentative');\">%s</a>"
- "<span> | </span>"
+ "</span> <span class=\"button_link\">"
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Decline');\">%s</a>"
- "</p>\n",
+ "</span></p>\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) {
- /** \todo 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("<p id=\"%s_question\" class=\"buttons\">"
- "%s"
+ /* Display the update buttons */
+ wprintf("<p id=\"%s_question\" >"
+ "%s "
+ " <span class=\"button_link\"> "
"<a href=\"javascript:HandleRSVP('%s_question','%s_title','%ld','%s','Update');\">%s</a>"
- "<span> | </span>"
+ "</span> <span class=\"button_link\">"
"<a href=\"javascript:HandleRSVP('%s_question','%s_title','%ld','%s','Ignore');\">%s</a>"
- "</p>\n",
+ "</span></p>\n",
divname,
_("Click <i>Update</i> 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("<p> </p></div>\n");
}
* \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);
* \brief accept/decline meeting
* Respond to a meeting request
*/
-void respond_to_request(void) {
+void respond_to_request(void)
+{
char buf[1024];
begin_ajax_response();
);
} else if (!strcasecmp(bstr("sc"), "decline")) {
wprintf(_("You have declined this meeting invitation. "
- "It has <b>not</b> been entered into your calendar.")
- );
+ "It has <b>not</b> been entered into your calendar.")
+ );
}
wprintf(" ");
wprintf(_("A reply has been sent to the meeting organizer."));
/**
* \brief Handle an incoming RSVP
*/
-void handle_rsvp(void) {
+void handle_rsvp(void)
+{
char buf[1024];
begin_ajax_response();
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 <b>not</b> been updated.")
- );
+ "Your calendar has <b>not</b> been updated.")
+ );
}
wprintf("</span>");
} else {
}
end_ajax_response();
-
}
/*@{*/
+int Flathash(const char *str, long len)
+{
+ if (len != sizeof (int))
+ return 0;
+ else return *(int*)str;
+}
+
/**
- * \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
+ * \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)
{
- struct wcsession *WCC = WC; /* stack this for faster access (WC is a function) */
+ disp_cal *Cal = (disp_cal*) vCal;
+ icalcomponent_free(Cal->cal);
+ free(Cal->from);
+ free(Cal);
+}
+
+/*
+ * 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 dtstart, dtend;
+ struct icaldurationtype dur;
+ struct wcsession *WCC = WC;
+ disp_cal *Cal;
+ size_t len;
+
+ /* 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);
+ }
+
+ /* 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);
+ }
+
+ /* Store it in the hash list. */
+ Put(WCC->disp_cal_items,
+ (char*) &Cal->event_start,
+ sizeof(Cal->event_start),
+ Cal,
+ delete_cal);
+
+#ifdef TECH_PREVIEW
+
+ /* 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);
+ }
+
+ /*
+ * 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).
+ */
+
+ 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;
+
+ /* 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);
+ }
+
+ ps = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+ if (ps != NULL) {
+ icalcomponent_remove_property(Cal->cal, ps);
+ /* FIXME now set the dtend property and stuff it somewhere */
+ }
+
+ Put(WCC->disp_cal_items,
+ (char*) &Cal->event_start,
+ sizeof(Cal->event_start),
+ Cal,
+ delete_cal);
+ }
+ time_t tt = icaltime_as_timet(next);
+ lprintf(9, "Performed %d recurrences; final one is %s", num_recur, ctime(&tt));
+
+#endif /* TECH_PREVIEW */
- 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);
- 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;
+ struct icaltimetype IcalTime;
time_t now;
int created_new_vtodo = 0;
+ icalproperty_status todoStatus;
now = time(NULL);
display_edit_individual_task(
icalcomponent_get_first_component(
vtodo, ICAL_VTODO_COMPONENT
- ), msgnum
- );
+ ),
+ msgnum,
+ from, unread
+ );
return;
}
}
vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
created_new_vtodo = 1;
}
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n");
- wprintf("<img src=\"static/taskmanag_48x.gif\">");
- wprintf("<h1>");
+
+ // TODO: Can we take all this and move it into a template?
+ output_headers(1, 1, 1, 0, 0, 0);
+ wprintf("<!-- start task edit form -->");
+ p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
+ // Get summary early for title
+ wprintf("<div class=\"box\">\n");
+ wprintf("<div class=\"boxlabel\">");
wprintf(_("Edit task"));
- wprintf("</h1>");
- wprintf("</div>\n");
-
- wprintf("<div id=\"content\" class=\"service\">\n");
-
- wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table class=\"calendar_background\"><tr><td>");
+ wprintf("- ");
+ if (p != NULL) {
+ escputs((char *)icalproperty_get_comment(p));
+ }
+ wprintf("</div>");
+ wprintf("<div class=\"boxcontent\">\n");
wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<div style=\"display: none;\">\n ");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
msgnum);
-
- wprintf("<TABLE border=0>\n");
+ wprintf("</div>");
+ wprintf("<table class=\"calendar_background\"><tr><td>");
+ wprintf("<TABLE STYLE=\"border: none;\">\n");
wprintf("<TR><TD>");
wprintf(_("Summary:"));
wprintf(_("Start date:"));
wprintf("</TD><TD>");
p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY);
- if (p != NULL) {
- t = icalproperty_get_dtstart(p);
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodtstart\" ID=\"nodtstart\" VALUE=\"NODTSTART\" ");
+ if (p == NULL) {
+ wprintf("CHECKED=\"CHECKED\"");
}
- else {
- t = icaltime_from_timet(now, 0);
+ 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("</TD></TR>\n");
wprintf("<TR><TD>");
wprintf(_("Due date:"));
wprintf("</TD><TD>");
p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
- if (p != NULL) {
- t = icalproperty_get_due(p);
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodue\" ID=\"nodue\" VALUE=\"NODUE\"");
+ if (p == NULL) {
+ wprintf("CHECKED=\"CHECKED\"");
}
- else {
- t = icaltime_from_timet(now, 0);
+ 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("</TD></TR>\n");
+ todoStatus = icalcomponent_get_status(vtodo);
+ wprintf("<TR><TD>\n");
+ wprintf(_("Completed:"));
+ wprintf("</TD><TD>");
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"status\" VALUE=\"COMPLETED\"");
+ if (todoStatus == ICAL_STATUS_COMPLETED) {
+ wprintf(" CHECKED=\"CHECKED\"");
+ }
+ wprintf(" >");
+ wprintf("</TD></TR>");
+ // start category field
+ p = icalcomponent_get_first_property(vtodo, ICAL_CATEGORIES_PROPERTY);
+ wprintf("<TR><TD>");
+ wprintf(_("Category:"));
+ wprintf("</TD><TD>");
+ wprintf("<INPUT TYPE=\"text\" NAME=\"category\" MAXLENGTH=\"32\" SIZE=\"32\" VALUE=\"");
+ if (p != NULL) {
+ escputs((char *)icalproperty_get_categories(p));
+ }
+ wprintf("\">");
+ wprintf("</TD></TR>\n ");
+ // end category field
wprintf("<TR><TD>");
wprintf(_("Description:"));
wprintf("</TD><TD>");
- wprintf("<TEXTAREA NAME=\"description\" wrap=soft "
- "ROWS=10 COLS=80 WIDTH=80>\n"
- );
+ wprintf("<TEXTAREA NAME=\"description\" "
+ "ROWS=\"10\" COLS=\"80\">\n"
+ );
p = icalcomponent_get_first_property(vtodo, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
wprintf("</TEXTAREA></TD></TR></TABLE>\n");
- wprintf("<CENTER>"
+ wprintf("<SPAN STYLE=\"text-align: center;\">"
"<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
" "
"<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
" "
"<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
- "</CENTER>\n",
+ "</SPAN>\n",
_("Save"),
_("Delete"),
_("Cancel")
- );
-
+ );
+ wprintf("</td></tr></table>");
wprintf("</FORM>\n");
-
- wprintf("</td></tr></table></div>\n");
+ wprintf("</div></div></div>\n");
+ wprintf("<!-- end task edit form -->");
wDumpContent(1);
if (created_new_vtodo) {
* \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;
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;
}
}
created_new_vtodo = 1;
}
- if (!IsEmptyStr(bstr("save_button"))) {
+ if (havebstr("save_button")) {
/** 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);
}
- if (!IsEmptyStr(bstr("summary"))) {
-
- icalcomponent_add_property(vtodo,
- icalproperty_new_summary(bstr("summary")));
- } else {
- icalcomponent_add_property(vtodo,
- icalproperty_new_summary("Untitled Task"));
- }
+ 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)
- );
-
+ 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 */
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;
++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,
/**
* If the user clicked 'Delete' then explicitly delete the message.
*/
- if (!IsEmptyStr(bstr("delete_button"))) {
+ 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);
}
-/**
- * \brief generic item handler
- * 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.
- * \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[1024];
+ char from[128] = "";
char mime_partnum[256];
char mime_filename[256];
char mime_content_type[256];
icalcomponent *cal, *c;
relevant_partnum[0] = '\0';
- sprintf(buf, "MSG0 %ld|0", msgnum); /* unfortunately we need the mime headers */
+ sprintf(buf, "MSG4 %ld", msgnum); /* we need the mime headers */
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
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")) {
- strcpy(relevant_partnum, mime_partnum);
- }
- else if (!strcasecmp(mime_content_type, "text/vtodo")) {
+ 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));
}
}
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 */
- for (c = icalcomponent_get_first_component(cal,
- which_kind);
- (c != 0);
- c = icalcomponent_get_next_component(cal,
- which_kind)) {
- callback(c, msgnum);
+ /* 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, from, unread);
}
icalcomponent_free(cal);
}
free(relevant_source);
}
}
-
+ icalmemory_free_ring();
}
-/**
- * \brief display whole calendar
- * \param msgnum number of the mesage in our db
+/*
+ * Display a calendar item
*/
-void display_calendar(long msgnum) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VEVENT_COMPONENT,
- display_individual_cal);
+void display_calendar(long msgnum, int unread) {
+ display_using_handler(msgnum, unread, ICAL_VEVENT_COMPONENT, display_individual_cal);
}
-/**
- * \brief display whole taksview
- * \param msgnum number of the mesage in our db
+/*
+ * Display task view
*/
-void display_task(long msgnum) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VTODO_COMPONENT,
- display_individual_cal);
+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
+/*
+ * Display the editor component for a task
*/
void display_edit_task(void) {
long msgnum = 0L;
-
- /** Force change the room if we have to */
- if (!IsEmptyStr(bstr("taskrm"))) {
- 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
+/*
+ * 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
+/*
+ * 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
+/*
+ * 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);
}
}
-/**
- * \brief freebusy display (for client software)
- * \param req dunno. ?????
+/*
+ * Anonymous request of freebusy data for a user
*/
void do_freebusy(char *req) {
char who[SIZ];
char buf[SIZ];
- char *fb;
int len;
+ long lines;
extract_token(who, req, 1, ' ', sizeof who);
if (!strncasecmp(who, "/freebusy/", 10)) {
len = strlen(who);
if ( (!strcasecmp(&who[len-4], ".vcf"))
- || (!strcasecmp(&who[len-4], ".ifb"))
- || (!strcasecmp(&who[len-4], ".vfb")) ) {
+ || (!strcasecmp(&who[len-4], ".ifb"))
+ || (!strcasecmp(&who[len-4], ".vfb")) ) {
who[len-4] = 0;
}
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("HTTP/1.1 404 %s\n", &buf[4]);
+ hprintf("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");
+ hprintf("Content-Type: text/plain\r\n");
wprintf("%s\n", &buf[4]);
+ end_burst();
return;
}
- fb = read_server_text();
- http_transmit_thing(fb, strlen(fb), "text/calendar", 0);
- free(fb);
+ 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);
+}