" 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"
+ "calendaring enabled.</I><br />\n"
);
}
"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");
+ "</i><br />\n");
}
void display_task(long msgnum) {
"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");
+ "</i><br />\n");
}
#else /* WEBCIT_WITH_CALENDAR_SERVICE */
* Process a calendar object
* ...at this point it's already been deserialized by cal_process_attachment()
*
- * ok for complete vcalendar objects
- *
*/
void cal_process_object(icalcomponent *cal,
int recursion_level,
"<IMG ALIGN=CENTER "
"SRC=\"/static/vcalendar.gif\">"
" "
- "<B>Meeting invitation</B>
- </TD></TR>\n"
+ "<B>Meeting invitation</B>"
+ "</TD></TR>\n"
);
break;
case ICAL_METHOD_REPLY:
"<IMG ALIGN=CENTER "
"SRC=\"/static/vcalendar.gif\">"
" "
- "<B>Attendee's reply to your invitation</B>
- </TD></TR>\n"
+ "<B>Attendee's reply to your invitation</B>"
+ "</TD></TR>\n"
);
break;
case ICAL_METHOD_PUBLISH:
"<IMG ALIGN=CENTER "
"SRC=\"/static/vcalendar.gif\">"
" "
- "<B>Published event</B>
- </TD></TR>\n"
+ "<B>Published event</B>"
+ "</TD></TR>\n"
);
break;
default:
/*
* Deserialize a calendar object in a message so it can be processed.
* (This is the main entry point for these things)
- * ok for complete vcalendar objects
*/
void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
icalcomponent *cal;
cal = icalcomponent_new_from_string(part_source);
if (cal == NULL) {
- wprintf("Error parsing calendar object<BR>\n");
+ wprintf("Error parsing calendar object<br />\n");
return;
}
void respond_to_request(void) {
char buf[SIZ];
- output_headers(3);
+ output_headers(1, 1, 2, 0, 0, 0, 0);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
"<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
- "</TD></TR></TABLE><BR>\n"
+ "</TD></TR></TABLE>\n"
);
+ wprintf("</div>\n<div id=\"content\">\n");
serv_printf("ICAL respond|%s|%s|%s|",
bstr("msgnum"),
wprintf("<A HREF=\"/dotskip?room=");
urlescputs(WC->wc_roomname);
- wprintf("\"><BR>Return to messages</A><BR>\n");
+ wprintf("\"><br />Return to messages</A><br />\n");
wDumpContent(1);
}
void handle_rsvp(void) {
char buf[SIZ];
- output_headers(3);
+ output_headers(1, 1, 2, 0, 0, 0, 0);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
"<SPAN CLASS=\"titlebar\">"
"Update your calendar with this RSVP</SPAN>"
- "</TD></TR></TABLE><BR>\n"
+ "</TD></TR></TABLE>\n"
+ "</div>\n<div id=\"content\">\n"
);
serv_printf("ICAL handle_rsvp|%s|%s|%s|",
wprintf("<A HREF=\"/dotskip?room=");
urlescputs(WC->wc_roomname);
- wprintf("\"><BR>Return to messages</A><BR>\n");
+ wprintf("\"><br />Return to messages</A><br />\n");
wDumpContent(1);
}
WC->num_cal += 1;
WC->disp_cal = realloc(WC->disp_cal,
- (sizeof(icalcomponent *) * WC->num_cal) );
- WC->disp_cal[WC->num_cal - 1] = icalcomponent_new_clone(cal);
+ (sizeof(struct disp_cal) * WC->num_cal) );
+ WC->disp_cal[WC->num_cal - 1].cal = icalcomponent_new_clone(cal);
- WC->cal_msgnum = realloc(WC->cal_msgnum,
- (sizeof(long) * WC->num_cal) );
- WC->cal_msgnum[WC->num_cal - 1] = msgnum;
+ WC->disp_cal[WC->num_cal - 1].cal_msgnum = msgnum;
}
-/*
- * Display a task in the task list
- */
-void display_individual_task(icalcomponent *vtodo, long msgnum) {
- icalproperty *p;
-
- p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
- wprintf("<A HREF=\"/display_edit_task?msgnum=%ld&taskrm=", msgnum);
- urlescputs(WC->wc_roomname);
- wprintf("\">");
- if (p != NULL) {
- escputs((char *)icalproperty_get_comment(p));
- }
- wprintf("</A><BR>\n");
-}
-
-
/*
* Display a task by itself (for editing)
*
- * ok for complete vcalendar objects
*/
void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
icalcomponent *vtodo;
created_new_vtodo = 1;
}
- output_headers(3);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+ output_headers(1, 1, 2, 0, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n"
+ "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
"<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
- "</TD></TR></TABLE><BR>\n"
+ "</TD></TR></TABLE>\n"
+ "</div>\n<div id=\"content\">\n"
);
+ wprintf("<div style=\"margin-right:1px\">"
+ "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+
wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
msgnum);
- wprintf("Summary: "
+ wprintf("<TABLE border=0>\n");
+
+ wprintf("<TR><TD>Summary:</TD><TD>"
"<INPUT TYPE=\"text\" NAME=\"summary\" "
"MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wprintf("\"><BR>\n");
+ wprintf("\"></TD></TR>\n");
- wprintf("Start date: ");
+ wprintf("<TR><TD>Start date:</TD><TD>");
p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t = icalproperty_get_dtstart(p);
t = icaltime_from_timet(now, 0);
}
display_icaltimetype_as_webform(&t, "dtstart");
- wprintf("<BR>\n");
+ wprintf("</TD></TR>\n");
- wprintf("Due date: ");
+ wprintf("<TR><TD>Due date:</TD><TD>");
p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
if (p != NULL) {
t = icalproperty_get_due(p);
t = icaltime_from_timet(now, 0);
}
display_icaltimetype_as_webform(&t, "due");
- wprintf("<BR>\n");
-
- wprintf("<CENTER><TEXTAREA NAME=\"description\" wrap=soft "
+ wprintf("</TD></TR>\n");
+ wprintf("<TR><TD>Description:</TD><TD>");
+ wprintf("<TEXTAREA NAME=\"description\" wrap=soft "
"ROWS=10 COLS=80 WIDTH=80>\n"
);
p = icalcomponent_get_first_property(vtodo, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wprintf("</TEXTAREA><BR>\n");
+ wprintf("</TEXTAREA></TD></TR></TABLE>\n");
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+ wprintf("<CENTER>"
+ "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
" "
"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
" "
wprintf("</FORM>\n");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
if (created_new_vtodo) {
/*
* Save an edited task
*
- * ok
*/
void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
char buf[SIZ];
int delete_existing = 0;
icalproperty *prop;
- icalcomponent *vtodo;
+ icalcomponent *vtodo, *encaps;
int created_new_vtodo = 0;
+ int i;
+ int sequence = 0;
if (supplied_vtodo != NULL) {
vtodo = supplied_vtodo;
icaltime_from_webform("due")
)
);
-
+
+ /* Give this task a UID if it doesn't have one. */
+ lprintf(9, "Give this task a UID if it doesn't have one.\n");
+ if (icalcomponent_get_first_property(vtodo,
+ ICAL_UID_PROPERTY) == NULL) {
+ generate_uuid(buf);
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_uid(buf)
+ );
+ }
+
+ /* Increment the sequence ID */
+ lprintf(9, "Increment the sequence ID\n");
+ while (prop = icalcomponent_get_first_property(vtodo,
+ ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+ i = icalproperty_get_sequence(prop);
+ lprintf(9, "Sequence was %d\n", i);
+ if (i > sequence) sequence = i;
+ icalcomponent_remove_property(vtodo, prop);
+ icalproperty_free(prop);
+ }
+ ++sequence;
+ lprintf(9, "New sequence is %d. Adding...\n", sequence);
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_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");
+ encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vtodo));
+
/* Serialize it and save it to the message base */
serv_puts("ENT0 1|||4");
serv_gets(buf);
if (buf[0] == '4') {
serv_puts("Content-type: text/calendar");
serv_puts("");
- serv_puts(icalcomponent_as_ical_string(vtodo));
+ serv_puts(icalcomponent_as_ical_string(encaps));
serv_puts("000");
/* Probably not necessary; the server will see the UID
*/
delete_existing = 1;
}
+ icalcomponent_free(encaps);
}
/*
* the relevant part, deserialize it into a libical component, filter it for
* the requested object type, and feed it to the specified handler.
*
- * ok
*/
void display_using_handler(long msgnum,
char *mimetype,
void display_task(long msgnum) {
display_using_handler(msgnum, "text/calendar",
ICAL_VTODO_COMPONENT,
- display_individual_task);
+ display_individual_cal);
}
void display_edit_task(void) {
/* Force change the room if we have to */
if (strlen(bstr("taskrm")) > 0) {
- gotoroom(bstr("taskrm"), 0);
+ gotoroom(bstr("taskrm"));
}
msgnum = atol(bstr("msgnum"));
unescape_input(who);
if ( (!strcasecmp(&who[strlen(who)-4], ".vcf"))
- || (!strcasecmp(&who[strlen(who)-4], ".vcf")) ) {
+ || (!strcasecmp(&who[strlen(who)-4], ".vfb")) ) {
who[strlen(who)-4] = 0;
}
if (buf[0] != '1') {
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0);
+ output_headers(0, 0, 0, 0, 0, 0, 0);
wprintf("Content-Type: text/plain\n");
wprintf("\n");
wprintf("%s\n", &buf[4]);
projects / citadel.git / blobdiff