" 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 */
/* Check for conflicts */
lprintf(9, "Checking server calendar for conflicts...\n");
serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
- extract(conflict_name, buf, 3);
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ extract_token(conflict_name, buf, 3, '|', sizeof conflict_name);
is_update = extract_int(buf, 4);
wprintf("<TR><TD><B><I>%s</I></B></TD>"
"<TD>"
* In the future, if we want to validate this object before
* continuing, we can do it this way:
serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
}
***********/
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("<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"),
bstr("cal_partnum"),
bstr("sc")
);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
wprintf("<TABLE BORDER=0><TR><TD>"
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("<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|",
bstr("cal_partnum"),
bstr("sc")
);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
wprintf("<TABLE BORDER=0><TR><TD>"
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);
}
created_new_vtodo = 1;
}
- output_headers(3);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><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"
);
-
- do_template("beginbox_nt");
+ wprintf("<div id=\"fix_scrollbar_bug\">"
+ "<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("</FORM>\n");
- do_template("endbox");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
if (created_new_vtodo) {
char buf[SIZ];
int delete_existing = 0;
icalproperty *prop;
- icalcomponent *vtodo;
+ icalcomponent *vtodo, *encaps;
int created_new_vtodo = 0;
int i;
int sequence = 0;
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_new_uid(buf);
+ generate_uuid(buf);
icalcomponent_add_property(vtodo,
icalproperty_new_uid(buf)
);
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);
+ serv_getln(buf, sizeof 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);
}
/*
if ( (delete_existing) && (msgnum > 0L) ) {
serv_printf("DELE %ld", atol(bstr("msgnum")));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
}
if (created_new_vtodo) {
sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_content_type, "text/calendar")) {
/* Force change the room if we have to */
if (strlen(bstr("taskrm")) > 0) {
- gotoroom(bstr("taskrm"), 0);
+ gotoroom(bstr("taskrm"));
}
msgnum = atol(bstr("msgnum"));
char buf[SIZ];
char *fb;
- extract_token(who, req, 1, ' ');
+ extract_token(who, req, 1, ' ', sizeof who);
if (!strncasecmp(who, "/freebusy/", 10)) {
strcpy(who, &who[10]);
}
lprintf(9, "freebusy requested for <%s>\n", who);
serv_printf("ICAL freebusy|%s", who);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
+ output_headers(0, 0, 0, 0, 0, 0, 0);
+ wprintf("Content-Type: text/plain\r\n");
+ wprintf("\r\n");
wprintf("%s\n", &buf[4]);
return;
}
projects / citadel.git / blobdiff