/*
* $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
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;
/** Leading HTML for the display of this object */
if (recursion_level == 0) {
- wprintf("<div align=center><table border=0 bgcolor=\"#ffd\">\n");
+ wprintf("<div class=\"mimepart\">\n");
}
/** Look for a method */
the_method = icalproperty_get_method(method);
char *title;
+ wprintf("<div id=\"%s_title\">", divname);
+ 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("</span>");
- wprintf("<tr><td colspan=\"2\">\n");
- wprintf("<div id=\"%s_title\">", divname);
- wprintf("<img align=\"center\" "
- "src=\"static/calarea_48x.gif\">"
- " <b>%s</b></div></td></TD></TR>\n",
- title
- );
+ wprintf(" %s",title);
+ wprintf("</div>");
}
+ wprintf("<dl>");
p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
- wprintf("<TR><TD><B>");
+ wprintf("<dt>");
wprintf(_("Summary:"));
- wprintf("</B></TD><TD>");
+ wprintf("</dt><dd>");
escputs((char *)icalproperty_get_comment(p));
- wprintf("</TD></TR>\n");
+ wprintf("</dd>\n");
}
p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY);
if (p != NULL) {
- wprintf("<TR><TD><B>");
+ wprintf("<dt>");
wprintf(_("Location:"));
- wprintf("</B></TD><TD>");
+ wprintf("</dt><dd>");
escputs((char *)icalproperty_get_comment(p));
- wprintf("</TD></TR>\n");
+ wprintf("</dd>\n");
}
/**
if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) {
p = icalcomponent_get_first_property(cal,
- ICAL_DTSTART_PROPERTY);
+ ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t = icalproperty_get_dtstart(p);
d_tm.tm_mon = t.month - 1;
d_tm.tm_mday = t.day;
wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
- wprintf("<TR><TD><B>");
+ wprintf("<dt>");
wprintf(_("Date:"));
- wprintf("</B></TD><TD>%s</TD></TR>", d_str);
+ wprintf("</dt><dd>%s</dd>", d_str);
}
else {
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 0);
- wprintf("<TR><TD><B>");
+ webcit_fmt_date(buf, tt, 0);
+ wprintf("<dt>");
wprintf(_("Starting date/time:"));
- wprintf("</B></TD><TD>%s</TD></TR>", buf);
+ wprintf("</dt><dd>%s</dd>", buf);
}
}
if (p != NULL) {
t = icalproperty_get_dtend(p);
tt = icaltime_as_timet(t);
- fmt_date(buf, tt, 0);
- wprintf("<TR><TD><B>");
+ webcit_fmt_date(buf, tt, 0);
+ wprintf("<dt>");
wprintf(_("Ending date/time:"));
- wprintf("</B></TD><TD>%s</TD></TR>", buf);
+ wprintf("</dt><dd>%s</dd>", buf);
}
}
p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
- wprintf("<TR><TD><B>");
+ wprintf("<dt>");
wprintf(_("Description:"));
- wprintf("</B></TD><TD>");
+ wprintf("</dt><dd>");
escputs((char *)icalproperty_get_comment(p));
- wprintf("</TD></TR>\n");
+ 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)) {
- wprintf("<TR><TD><B>");
+ 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("</B></TD><TD>");
+ wprintf("</dt><dd>");
safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
if (!strncasecmp(buf, "MAILTO:", 7)) {
partstat_as_string(buf, p);
escputs(buf);
}
- wprintf("</TD></TR>\n");
+ wprintf("</dd>\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);
}
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("<TR><TD><B><I>%s</I></B></TD><td>",
+ wprintf("<dt>%s",
(is_update ?
- _("Update:") :
- _("CONFLICT:")
- )
- );
+ _("Update:") :
+ _("CONFLICT:")
+ )
+ );
+ wprintf("</dt><dd>");
escputs(conflict_message);
- wprintf("</TD></TR>\n");
+ wprintf("</dd>\n");
}
}
lprintf(9, "...done.\n");
+ wprintf("</dl>");
+
/** Display the Accept/Decline buttons */
- wprintf("<tr><td colspan=2>"
- "<div id=\"%s_question\">"
+ wprintf("<p id=\"%s_question\">"
"%s "
- "<font size=+1>"
+ " <span class=\"button_link\"> "
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Accept');\">%s</a>"
- " | "
+ "</span> <span class=\"button_link\">"
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Tentative');\">%s</a>"
- " | "
+ "</span> <span class=\"button_link\">"
"<a href=\"javascript:RespondToInvitation('%s_question','%s_title','%ld','%s','Decline');\">%s</a>"
- "</font>"
- "</div>"
- "</td></tr>\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")
- );
+ );
}
/** \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_getln(buf, sizeof buf);
- }
- ***********/
+ serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum);
+ serv_getln(buf, sizeof buf);
+ }
+ ***********/
/** Display the update buttons */
- wprintf("<tr><td colspan=2>"
- "<div id=\"%s_question\">"
- "%s"
- "<font size=+1>"
+ 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 class=\"button_link\">"
"<a href=\"javascript:HandleRSVP('%s_question','%s_title','%ld','%s','Ignore');\">%s</a>"
- "</font>"
- "</div>"
- "</td></tr>\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 */
if (recursion_level == 0) {
- wprintf("</tr></table></div>\n");
+ 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();
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<table border=0 cellpadding=0><tr><td>");
- wprintf("<td><img align=\"center\" src=\"static/calarea_48x.gif\"></td><td><b><i>");
+ wprintf("<img src=\"static/calarea_48x.gif\"><span>");
if (!strcasecmp(bstr("sc"), "accept")) {
wprintf(_("You have accepted this meeting invitation. "
"It has been entered into your calendar.")
);
} 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."));
- wprintf("</i></b></td></tr></table>");
+ wprintf("</span>");
} else {
- wprintf("<img align=\"center\" src=\"static/error.gif\"> <b><i>");
+ wprintf("<img align=\"center\" src=\"static/error.gif\"><span>");
wprintf("%s\n", &buf[4]);
+ wprintf("</span>");
}
end_ajax_response();
/**
* \brief Handle an incoming RSVP
*/
-void handle_rsvp(void) {
+void handle_rsvp(void)
+{
char buf[1024];
begin_ajax_response();
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<table border=0 cellpadding=0><tr><td>");
- wprintf("<td><img align=\"center\" src=\"static/calarea_48x.gif\"></td><td><b><i>");
+ wprintf("<img src=\"static/calarea_48x.gif\"><span>");
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 <b>not</b> been updated.")
- );
+ "Your calendar has <b>not</b> been updated.")
+ );
}
- wprintf("</i></b></td></tr></table>");
+ wprintf("</span>");
} else {
- wprintf("<img src=\"static/error.gif\" align=center> %s\n", &buf[4]);
+ wprintf("<img src=\"static/error.gif\"><span> %s\n", &buf[4]);
+ wprintf("</span>");
}
end_ajax_response();
-
}
* \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;
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"
- "<TABLE class=\"calendar_banner\"><TR>"
- "<TD><img src=\"static/taskmanag_48x.gif\"></TD>"
- "<td><SPAN CLASS=\"titlebar\">");
+
+ // 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("</SPAN>"
- "</TD></TR></TABLE>\n"
- "</div>\n<div id=\"content\">\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("<div style=\"display: none;\">\n ");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\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);
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodtstart\" ID=\"nodtstart\" VALUE=\"NODTSTART\" ");
+ if (p == NULL) {
+ wprintf("CHECKED=\"CHECKED\"");
+ }
+ wprintf(">");
+ wprintf(_("No date"));
+
+ wprintf(" ");
+ wprintf(_("or"));
+ wprintf(" ");
if (p != NULL) {
t = icalproperty_get_dtstart(p);
}
- else {
- t = icaltime_from_timet(now, 0);
- }
display_icaltimetype_as_webform(&t, "dtstart");
wprintf("</TD></TR>\n");
wprintf(_("Due date:"));
wprintf("</TD><TD>");
p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
+ wprintf("<INPUT TYPE=\"CHECKBOX\" NAME=\"nodue\" ID=\"nodue\" VALUE=\"NODUE\"");
+ if (p == NULL) {
+ wprintf("CHECKED=\"CHECKED\"");
+ }
+ wprintf(">");
+ wprintf(_("No date"));
+ wprintf(" ");
+ wprintf(_("or"));
+ wprintf(" ");
if (p != NULL) {
t = icalproperty_get_due(p);
}
- else {
- t = icaltime_from_timet(now, 0);
- }
display_icaltimetype_as_webform(&t, "due");
+
wprintf("</TD></TR>\n");
+ icalproperty_status 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 (strlen(bstr("save_button")) > 0) {
+ 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);
}
- 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 (!IsEmptyStr(bstr("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 (!IsEmptyStr(bstr("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 (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);
}
* \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];
char *relevant_source = NULL;
icalcomponent *cal, *c;
- sprintf(buf, "MSG0 %ld|0", msgnum); /* unfortunately we need the mime headers */
+ 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;
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) {
/** 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);
+ 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
*/
-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
*/
-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);
}
/**
*/
void display_edit_task(void) {
long msgnum = 0L;
-
+
/** Force change the room if we have to */
- if (strlen(bstr("taskrm")) > 0) {
- gotoroom(bstr("taskrm"));
+ if (havebstr("taskrm")) {
+ gotoroom((char *)bstr("taskrm"));
}
- msgnum = atol(bstr("msgnum"));
+ msgnum = lbstr("msgnum");
if (msgnum > 0L) {
/** existing task */
- display_using_handler(msgnum, "text/calendar",
- ICAL_VTODO_COMPONENT,
- display_edit_individual_task);
+ display_using_handler(msgnum, 0,
+ ICAL_VTODO_COMPONENT,
+ display_edit_individual_task);
}
else {
/** new task */
- display_edit_individual_task(NULL, 0L);
+ display_edit_individual_task(NULL, 0L, "", 0);
}
}
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);
}
}
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);
}
}
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);
}
}
char who[SIZ];
char buf[SIZ];
char *fb;
+ int len;
extract_token(who, req, 1, ' ', sizeof who);
if (!strncasecmp(who, "/freebusy/", 10)) {
}
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);
free(fb);
}
-
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-
-/*@}*/