wprintf("<TABLE bgcolor=#888888>");
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
if (!strcasecmp(v->prop[i].name, "n")) {
- wprintf("<TR BGCOLOR=#AAAAAA>"
- "<TD BGCOLOR=#FFFFFF>"
- "<IMG VALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
+ wprintf("<TR BGCOLOR=\"#AAAAAA\">"
+ "<TD BGCOLOR=\"#FFFFFF\">"
+ "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
"<TD><FONT SIZE=+1><B>");
escputs(v->prop[i].value);
wprintf("</B></FONT></TD></TR>\n");
}
wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
- "CELLPADDING=1 BGCOLOR=CCCCCC><TR><TD>\n");
+ "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
- wprintf("<FONT ");
- wprintf("SIZE=+1 ");
- wprintf("COLOR=\"000000\"> ");
+ wprintf("<SPAN CLASS=\"message_header\">");
strcpy(m_subject, "");
while (serv_gets(buf), strcasecmp(buf, "text")) {
+ if (!strcmp(buf, "000")) {
+ wprintf("<I>unexpected end of message</I><BR><BR>\n");
+ wprintf("</SPAN>\n");
+ return;
+ }
if (!strncasecmp(buf, "nhdr=yes", 8))
nhdr = 1;
if (nhdr == 1)
&& (strcasecmp(&buf[5], serv_info.serv_humannode)))
wprintf("(%s) ", &buf[5]);
if ((!strncasecmp(buf, "room=", 5))
- && (strcasecmp(&buf[5], WC->wc_roomname)))
+ && (strcasecmp(&buf[5], WC->wc_roomname))
+ && (strlen(&buf[5])>0) )
wprintf("in %s> ", &buf[5]);
if (!strncasecmp(buf, "rfca=", 5)) {
strcpy(rfca, &buf[5]);
}
-
/* Generate a reply-to address */
if (strlen(rfca) > 0) {
strcpy(reply_to, rfca);
wprintf("****");
}
- wprintf("</FONT></TD>");
+ wprintf("</SPAN></TD>");
wprintf("<TD ALIGN=RIGHT>\n"
"<TABLE BORDER=0><TR>\n");
- wprintf("<TD BGCOLOR=\"AAAADD\">"
+ wprintf("<TD BGCOLOR=\"#AAAADD\">"
"<A HREF=\"/readfwd?startmsg=%ld", msgnum);
wprintf("&maxmsgs=1&summary=0\">Read</A>"
"</TD>\n", msgnum);
- wprintf("<TD BGCOLOR=\"AAAADD\">"
+ wprintf("<TD BGCOLOR=\"#AAAADD\">"
"<A HREF=\"/display_enter?recp=");
urlescputs(reply_to);
wprintf("\"><FONT SIZE=-1>Reply</FONT></A>"
"</TD>\n", msgnum);
if (WC->is_room_aide) {
- wprintf("<TD BGCOLOR=\"AAAADD\">"
+ wprintf("<TD BGCOLOR=\"#AAAADD\">"
"<A HREF=\"/confirm_move_msg"
"&msgid=%ld"
"\"><FONT SIZE=-1>Move</FONT></A>"
"</TD>\n", msgnum);
- wprintf("<TD BGCOLOR=\"AAAADD\">"
+ wprintf("<TD BGCOLOR=\"#AAAADD\">"
"<A HREF=\"/delete_msg"
"&msgid=%ld\""
"onClick=\"return confirm('Delete this message?');\""
"</TD>\n");
if (strlen(m_subject) > 0) {
- wprintf("<TR><TD><FONT COLOR=\"0000FF\">"
- "Subject: %s</FONT>"
+ wprintf("<TR><TD>"
+ "<SPAN CLASS=\"message_subject\">"
+ "Subject: %s"
+ "</SPAN>"
"</TD><TD> </TD></TR>\n", m_subject);
}
*/
strcpy(mime_content_type, "text/plain");
while (serv_gets(buf), (strlen(buf) > 0)) {
+ if (!strcmp(buf, "000")) {
+ wprintf("<I>unexpected end of message</I><BR><BR>\n");
+ return;
+ }
if (!strncasecmp(buf, "Content-type: ", 14)) {
safestrncpy(mime_content_type, &buf[14],
sizeof(mime_content_type));
/* Boring old 80-column fixed format text gets handled this way... */
else if (!strcasecmp(mime_content_type, "text/plain")) {
while (serv_gets(buf), strcmp(buf, "000")) {
+ if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
+ if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
if ((bq == 0) &&
((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
- wprintf("<FONT COLOR=\"000044\"><I>");
+ wprintf("<SPAN CLASS=\"pull_quote\">");
bq = 1;
} else if ((bq == 1) &&
(strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
- wprintf("</FONT></I>");
+ wprintf("</SPAN>");
bq = 0;
}
wprintf("<TT>");
if (strlen(cal_partnum) > 0) {
part_source = load_mimepart(msgnum, cal_partnum);
if (part_source != NULL) {
- cal_process_attachment(part_source);
+ cal_process_attachment(part_source,
+ msgnum, cal_partnum);
}
}
/*
* load message pointers from the server
*/
-int load_msg_ptrs(servcmd)
-char *servcmd;
+int load_msg_ptrs(char *servcmd)
{
char buf[SIZ];
int nummsgs;
}
while (serv_gets(buf), strcmp(buf, "000")) {
WC->msgarr[nummsgs] = atol(buf);
+ /* FIXME check for overflow */
++nummsgs;
}
return (nummsgs);
nummsgs = load_msg_ptrs(cmd);
if (nummsgs == 0) {
- if (!strcmp(oper, "readnew")) {
- wprintf("<EM>No new messages in this room.</EM>\n");
- } else if (!strcmp(oper, "readold")) {
- wprintf("<EM>No old messages in this room.</EM>\n");
- } else {
- wprintf("<EM>This room is empty.</EM>\n");
+
+ if ((!is_tasks) && (!is_calendar)) {
+ if (!strcmp(oper, "readnew")) {
+ wprintf("<EM>No new messages in this room.</EM>\n");
+ } else if (!strcmp(oper, "readold")) {
+ wprintf("<EM>No old messages in this room.</EM>\n");
+ } else {
+ wprintf("<EM>This room is empty.</EM>\n");
+ }
}
+
goto DONE;
}
/* If a tabular view, set up the line */
if ( (is_summary) || (is_addressbook) ) {
bg = 1 - bg;
- wprintf("<TR BGCOLOR=%s>",
+ wprintf("<TR BGCOLOR=\"#%s\">",
(bg ? "DDDDDD" : "FFFFFF")
);
}
/* If we're only looking at one message, do a prev/next thing */
if (num_displayed == 1) {
+ if ((!is_tasks) && (!is_calendar)) {
wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+ "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
"Reading #%d of %d messages.</TD>\n"
"<TD ALIGN=RIGHT><FONT SIZE=+1>",
lowest_displayed, nummsgs);
WC->msgarr[0]);
wprintf("</TD></TR></TABLE></CENTER>\n");
+ }
}
* messages, then display the selector bar
*/
if (num_displayed > 1) {
+ if ((!is_tasks) && (!is_calendar)) {
wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+ "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
"Reading #%d-%d of %d messages.</TD>\n"
"<TD ALIGN=RIGHT><FONT SIZE=+1>",
lowest_displayed, highest_displayed, nummsgs);
WC->msgarr[0]);
wprintf("</TD></TR></TABLE></CENTER>\n");
+ }
}
if (is_summary) wprintf("</FORM>\n");
-DONE: wDumpContent(1);
+DONE:
+ if (is_tasks) {
+ wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
+ "Add new task</A>\n"
+ );
+ }
+
+ if (is_calendar) {
+ do_calendar_view(); /* Render the calendar */
+ }
+
+ wDumpContent(1);
}
+/*
+ * Back end for post_message() ... this is where the actual message
+ * gets transmitted to the server.
+ */
+void post_mime_to_server(void) {
+ char boundary[SIZ];
+ int is_multipart = 0;
+ static int seq = 0;
+ struct wc_attachment *att;
+ char *encoded;
+ size_t encoded_length;
+
+ /* If there are attachments, we have to do multipart/mixed */
+ if (WC->first_attachment != NULL) {
+ is_multipart = 1;
+ }
+
+ if (is_multipart) {
+ sprintf(boundary, "---Citadel-Multipart-%s-%04x%04x---",
+ serv_info.serv_fqdn,
+ getpid(),
+ ++seq
+ );
+
+ /* Remember, serv_printf() appends an extra newline */
+ serv_printf("Content-type: multipart/mixed; "
+ "boundary=\"%s\"\n", boundary);
+ serv_printf("This is a multipart message in MIME format.\n");
+ serv_printf("--%s", boundary);
+ }
+
+ serv_puts("Content-type: text/html");
+ serv_puts("");
+ text_to_server(bstr("msgtext"), 1);
+
+ if (is_multipart) {
+
+ /* Add in the attachments */
+ for (att = WC->first_attachment; att!=NULL; att=att->next) {
+
+ encoded_length = ((att->length * 150) / 100);
+ encoded = malloc(encoded_length);
+ if (encoded == NULL) break;
+ CtdlEncodeBase64(encoded, att->data, att->length);
+
+ serv_printf("--%s", boundary);
+ serv_printf("Content-type: %s", att->content_type);
+ serv_printf("Content-disposition: attachment; "
+ "filename=\"%s\"", att->filename);
+ serv_puts("Content-transfer-encoding: base64");
+ serv_puts("");
+ serv_write(encoded, strlen(encoded));
+ serv_puts("");
+ serv_puts("");
+ free(encoded);
+ }
+ serv_printf("--%s--", boundary);
+ }
+
+ serv_puts("000");
+}
/*
{
char buf[SIZ];
static long dont_post = (-1L);
+ struct wc_attachment *att;
+
+ if (WC->upload_length > 0) {
+
+ att = malloc(sizeof(struct wc_attachment));
+ memset(att, 0, sizeof(struct wc_attachment));
+ att->next = WC->first_attachment;
+ WC->first_attachment = att;
+ att->length = WC->upload_length;
+ strcpy(att->content_type, WC->upload_content_type);
+ strcpy(att->filename, WC->upload_filename);
+
+ /* Transfer control of this memory from the upload struct
+ * to the attachment struct.
+ */
+ att->data = WC->upload;
+ WC->upload_length = 0;
+ WC->upload = NULL;
+ display_enter();
+ return;
+ }
output_headers(1);
- wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
- strcpy(buf, bstr("sc"));
- if (strcasecmp(buf, "Save message")) {
+ if (strcasecmp(bstr("sc"), "Save message")) {
wprintf("Cancelled. Message was not posted.<BR>\n");
} else if (atol(bstr("postseq")) == dont_post) {
wprintf("Automatically cancelled because you have already "
serv_puts(buf);
serv_gets(buf);
if (buf[0] == '4') {
- serv_puts("Content-type: text/html");
- serv_puts("");
- text_to_server(bstr("msgtext"), 1);
- serv_puts("000");
+ post_mime_to_server();
wprintf("Message has been posted.<BR>\n");
dont_post = atol(bstr("postseq"));
} else {
}
wDumpContent(1);
+ free_attachments(WC);
}
char buf[SIZ];
long now;
struct tm *tm;
+ struct wc_attachment *att;
output_headers(1);
- wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
-
sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
serv_puts(buf);
serv_gets(buf);
strcpy(buf, (char *) asctime(tm));
buf[strlen(buf) - 1] = 0;
strcpy(&buf[16], &buf[19]);
- wprintf("</CENTER><FONT COLOR=\"440000\">\n"
+ wprintf("</CENTER><FONT COLOR=\"#440000\">\n"
"<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \" "
"onLoad=\"document.enterform.msgtext.focus();\" >");
wprintf("<B> %s ", &buf[4]);
wprintf("in %s> ", WC->wc_roomname);
wprintf("</B></FONT><BR><CENTER>\n");
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/post\" "
+ wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
+ "METHOD=\"POST\" ACTION=\"/post\" "
"NAME=\"enterform\">\n");
wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
bstr("recp"));
wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
now);
wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
- "<INPUT TYPE=\"text\" NAME=\"subject\" MAXLENGTH=70>"
+ "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
+ escputs(bstr("subject"));
+ wprintf("\" MAXLENGTH=70>"
" "
"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=30 COLS=80 "
- "WIDTH=80></TEXTAREA><P>\n");
+ "WIDTH=80>");
+ escputs(bstr("msgtext"));
+ wprintf("</TEXTAREA><BR>\n");
+
+ /* Enumerate any attachments which are already in place... */
+ for (att = WC->first_attachment; att != NULL; att = att->next) {
+ wprintf("<IMG SRC=\"/static/attachment.gif\" "
+ "BORDER=0 ALIGN=MIDDLE> Attachment: ");
+ escputs(att->filename);
+ wprintf(" (%s, %d bytes)<BR>\n",
+ att->content_type, att->length);
+ }
+
+ /* Now offer the ability to attach additional files... */
+ wprintf("Attach file: <input NAME=\"attachfile\" "
+ "SIZE=48 TYPE=\"file\">\n "
+ "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
wprintf("</FORM></CENTER>\n");
DONE: wDumpContent(1);
output_headers(1);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
- wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+ wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+ wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
wprintf("<B>Confirm move of message</B>\n");
wprintf("</FONT></TD></TR></TABLE>\n");
projects / citadel.git / blobdiff