* When converting "anything that looks like a URL" to a real link, first
[citadel.git] / webcit / messages.c
index 6f1dfacbf5785bec3266ac33af398e51bbc684d7..67ee5a07f8ffefcb8cae22d794ae3602460d642b 100644 (file)
@@ -25,6 +25,7 @@
 #include <signal.h>
 #include "webcit.h"
 #include "vcard.h"
+#include "webserver.h"
 
 
 /*
@@ -109,9 +110,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
        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");
@@ -194,8 +195,9 @@ void display_vcard(char *vcard_source, char alpha, int full) {
 
 
 
-
-
+/*
+ * I wanna SEE that message!
+ */
 void read_message(long msgnum) {
        char buf[SIZ];
        char mime_partnum[SIZ];
@@ -203,7 +205,7 @@ void read_message(long msgnum) {
        char mime_content_type[SIZ];
        char mime_disposition[SIZ];
        int mime_length;
-       char *mime_http = NULL;
+       char mime_http[SIZ];
        char m_subject[SIZ];
        char from[SIZ];
        char node[SIZ];
@@ -214,16 +216,18 @@ void read_message(long msgnum) {
        int nhdr = 0;
        int bq = 0;
        char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
+       char cal_partnum[SIZ];
+       char *part_source = NULL;
 
        strcpy(from, "");
        strcpy(node, "");
        strcpy(rfca, "");
        strcpy(reply_to, "");
        strcpy(vcard_partnum, "");
+       strcpy(cal_partnum, "");
+       strcpy(mime_http, "");
 
-       sprintf(buf, "MSG0 %ld", msgnum);
-       serv_puts(buf);
+       serv_printf("MSG4 %ld", msgnum);
        serv_gets(buf);
        if (buf[0] != '1') {
                wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
@@ -231,14 +235,17 @@ void read_message(long msgnum) {
        }
 
        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), strncasecmp(buf, "text", 4)) {
+       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)
@@ -259,7 +266,8 @@ void read_message(long msgnum) {
                    && (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]);
@@ -269,6 +277,7 @@ void read_message(long msgnum) {
                }
 
                if (!strncasecmp(buf, "node=", 5)) {
+                       strcpy(node, &buf[5]);
                        if ( ((WC->room_flags & QR_NETWORK)
                        || ((strcasecmp(&buf[5], serv_info.serv_nodename)
                        && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
@@ -292,15 +301,8 @@ void read_message(long msgnum) {
                        mime_length = extract_int(&buf[5], 5);
 
                        if (!strcasecmp(mime_disposition, "attachment")) {
-                               if (mime_http == NULL) {
-                                       mime_http = malloc(512);
-                                       strcpy(mime_http, "");
-                               }
-                               else {
-                                       mime_http = realloc(mime_http,
-                                               strlen(mime_http) + 512);
-                               }
-                               sprintf(&mime_http[strlen(mime_http)],
+                               snprintf(&mime_http[strlen(mime_http)],
+                                       (sizeof(mime_http) - strlen(mime_http) - 1),
                                        "<A HREF=\"/output_mimepart?"
                                        "msgnum=%ld&partnum=%s\" "
                                        "TARGET=\"wc.%ld.%s\">"
@@ -315,35 +317,36 @@ void read_message(long msgnum) {
 
                        if ((!strcasecmp(mime_disposition, "inline"))
                           && (!strncasecmp(mime_content_type, "image/", 6)) ){
-                               if (mime_http == NULL) {
-                                       mime_http = malloc(512);
-                                       strcpy(mime_http, "");
-                               }
-                               else {
-                                       mime_http = realloc(mime_http,
-                                               strlen(mime_http) + 512);
-                               }
-                               sprintf(&mime_http[strlen(mime_http)],
+                               snprintf(&mime_http[strlen(mime_http)],
+                                       (sizeof(mime_http) - strlen(mime_http) - 1),
                                        "<IMG SRC=\"/output_mimepart?"
                                        "msgnum=%ld&partnum=%s\">",
                                        msgnum, mime_partnum);
                        }
 
+                       /*** begin handler prep ***/
                        if (!strcasecmp(mime_content_type, "text/x-vcard")) {
                                strcpy(vcard_partnum, mime_partnum);
                        }
 
+                       if (!strcasecmp(mime_content_type, "text/calendar")) {
+                               strcpy(cal_partnum, mime_partnum);
+                       }
+
+                       /*** end handler prep ***/
+
                }
 
        }
 
-
        /* Generate a reply-to address */
        if (strlen(rfca) > 0) {
                strcpy(reply_to, rfca);
        }
        else {
-               if (strlen(node) > 0) {
+               if ( (strlen(node) > 0)
+                  && (strcasecmp(node, serv_info.serv_nodename))
+                  && (strcasecmp(node, serv_info.serv_humannode)) ) {
                        snprintf(reply_to, sizeof(reply_to), "%s @ %s",
                                from, node);
                }
@@ -356,30 +359,33 @@ void read_message(long msgnum) {
                wprintf("****");
        }
 
-       wprintf("</FONT></TD>");
+       wprintf("</SPAN></TD>");
 
        wprintf("<TD ALIGN=RIGHT>\n"
                "<TABLE BORDER=0><TR>\n");
 
-       wprintf("<TD BGCOLOR=\"AAAADD\">"
-               "<A HREF=\"/readfwd?startmsg=%ld", msgnum);
-       wprintf("&maxmsgs=1&summary=0\">Read</A>"
-               "</TD>\n", msgnum);
+       /***  "Read" button is now superfluous
+        ***
+        ***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?');\""
@@ -391,26 +397,53 @@ void read_message(long msgnum) {
                "</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>&nbsp;</TD></TR>\n", m_subject);
        }
 
        wprintf("</TR></TABLE>\n");
 
-       if (format_type == 0) {
-               fmout(NULL);
-       } else {
+       /* Begin body */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
+               "CELLPADDING=0 CELLSPACING=0><TR><TD>");
+
+       /* 
+        * Learn the content type
+        */
+       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");
+                       goto ENDBODY;
+               }
+               if (!strncasecmp(buf, "Content-type: ", 14)) {
+                       safestrncpy(mime_content_type, &buf[14],
+                               sizeof(mime_content_type));
+               }
+       }
+
+       /* Messages in legacy Citadel variformat get handled thusly... */
+       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
+               fmout(NULL, "JUSTIFY");
+       }
+
+       /* 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>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
+                               wprintf("<SPAN CLASS=\"pull_quote\">");
                                bq = 1;
                        } else if ((bq == 1) &&
-                                  (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</FONT></I>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
+                               wprintf("</SPAN>");
                                bq = 0;
                        }
                        wprintf("<TT>");
@@ -418,17 +451,31 @@ void read_message(long msgnum) {
                        escputs(buf);
                        wprintf("</TT><BR>\n");
                }
+               wprintf("</I><BR>");
+       }
+
+       else /* HTML is fun, but we've got to strip it first */
+       if (!strcasecmp(mime_content_type, "text/html")) {
+               output_html();
        }
-       wprintf("</I><BR>");
 
-       if (mime_http != NULL) {
+       /* Unknown weirdness */
+       else {
+               wprintf("I don't know how to display %s<BR>\n",
+                       mime_content_type);
+               while (serv_gets(buf), strcmp(buf, "000")) { }
+       }
+
+
+       /* Afterwards, offer links to download attachments 'n' such */
+       if (strlen(mime_http) > 0) {
                wprintf("%s", mime_http);
-               free(mime_http);
        }
 
+       /* Handler for vCard parts */
        if (strlen(vcard_partnum) > 0) {
-               vcard_source = load_mimepart(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
+               part_source = load_mimepart(msgnum, vcard_partnum);
+               if (part_source != NULL) {
 
                        /* If it's my vCard I can edit it */
                        if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
@@ -440,11 +487,26 @@ void read_message(long msgnum) {
                        }
 
                        /* In all cases, display the full card */
-                       display_vcard(vcard_source, 0, 1);
-                       free(vcard_source);
+                       display_vcard(part_source, 0, 1);
                }
        }
 
+       /* Handler for calendar parts */
+       if (strlen(cal_partnum) > 0) {
+               part_source = load_mimepart(msgnum, cal_partnum);
+               if (part_source != NULL) {
+                       cal_process_attachment(part_source,
+                                               msgnum, cal_partnum);
+               }
+       }
+
+       if (part_source) {
+               free(part_source);
+               part_source = NULL;
+       }
+
+ENDBODY:
+       wprintf("</TD></TR></TABLE>\n");
 }
 
 
@@ -585,8 +647,7 @@ void display_addressbook(long msgnum, char alpha) {
 /* 
  * load message pointers from the server
  */
-int load_msg_ptrs(servcmd)
-char *servcmd;
+int load_msg_ptrs(char *servcmd)
 {
        char buf[SIZ];
        int nummsgs;
@@ -600,6 +661,7 @@ char *servcmd;
        }
        while (serv_gets(buf), strcmp(buf, "000")) {
                WC->msgarr[nummsgs] = atol(buf);
+               /* FIXME check for overflow */
                ++nummsgs;
        }
        return (nummsgs);
@@ -620,6 +682,8 @@ void readloop(char *oper)
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
+       int is_calendar = 0;
+       int is_tasks = 0;
        int remaining_messages;
        int lo, hi;
        int lowest_displayed = (-1);
@@ -676,16 +740,31 @@ void readloop(char *oper)
                else wprintf("<A HREF=\"/readfwd?alpha=1\">(other)</A>\n");
                wprintf("<HR width=100%%>\n");
        }
+       if (WC->wc_view == 3) {         /* calendar */
+               is_calendar = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+       }
+       if (WC->wc_view == 4) {         /* tasks */
+               is_tasks = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+               wprintf("<UL>");
+       }
 
        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;
        }
 
@@ -728,7 +807,7 @@ void readloop(char *oper)
                        /* 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")
                                );
                        }
@@ -740,6 +819,12 @@ void readloop(char *oper)
                        else if (is_addressbook) {
                                display_addressbook(WC->msgarr[a], alpha);
                        }
+                       else if (is_calendar) {
+                               display_calendar(WC->msgarr[a]);
+                       }
+                       else if (is_tasks) {
+                               display_task(WC->msgarr[a]);
+                       }
                        else {
                                read_message(WC->msgarr[a]);
                        }
@@ -765,6 +850,10 @@ void readloop(char *oper)
                wprintf("</TABLE>\n");
        }
 
+       if (is_tasks) {
+               wprintf("</UL>\n");
+       }
+
        /* Bump these because although we're thinking in zero base, the user
         * is a drooling idiot and is thinking in one base.
         */
@@ -773,9 +862,10 @@ void readloop(char *oper)
 
        /* 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);
@@ -813,6 +903,7 @@ void readloop(char *oper)
                        WC->msgarr[0]);
 
                wprintf("</TD></TR></TABLE></CENTER>\n");
+           }
        }
 
 
@@ -821,8 +912,9 @@ void readloop(char *oper)
         * 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);
@@ -869,13 +961,86 @@ void readloop(char *oper)
                        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");
+}
 
 
 /*
@@ -893,33 +1058,65 @@ void post_message(void)
 {
        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);
+
+               /* Netscape sends a simple filename, which is what we want,
+                * but Satan's browser sends an entire pathname.  Reduce
+                * the path to just a filename if we need to.
+                */
+               while (num_tokens(att->filename, '/') > 1) {
+                       remove_token(att->filename, 0, '/');
+               }
+               while (num_tokens(att->filename, '\\') > 1) {
+                       remove_token(att->filename, 0, '\\');
+               }
 
-       output_headers(1);
+               /* 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;
+       }
 
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
-       strcpy(buf, bstr("sc"));
-       if (strcasecmp(buf, "Save message")) {
-               wprintf("Cancelled.  Message was not posted.<BR>\n");
+       if (strcasecmp(bstr("sc"), "Save message")) {
+               sprintf(WC->ImportantMessage, 
+                       "Cancelled.  Message was not posted.");
        } else if (atol(bstr("postseq")) == dont_post) {
-               wprintf("Automatically cancelled because you have already "
-                       "saved this message.<BR>\n");
+               sprintf(WC->ImportantMessage, 
+                       "Automatically cancelled because you have already "
+                       "saved this message.");
        } else {
-               sprintf(buf, "ENT0 1|%s|0|0|%s",
+               sprintf(buf, "ENT0 1|%s|0|4|%s",
                        bstr("recp"),
                        bstr("subject") );
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] == '4') {
-                       text_to_server(bstr("msgtext"));
-                       serv_puts("000");
-                       wprintf("Message has been posted.<BR>\n");
+                       post_mime_to_server();
+                       sprintf(WC->ImportantMessage, 
+                               "Message has been posted.\n");
                        dont_post = atol(bstr("postseq"));
                } else {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+                       sprintf(WC->ImportantMessage, 
+                               "%s", &buf[4]);
                }
        }
 
-       wDumpContent(1);
+       free_attachments(WC);
+       readloop("readnew");
 }
 
 
@@ -932,19 +1129,23 @@ void display_enter(void)
 {
        char buf[SIZ];
        long now;
-       struct tm *tm;
+       struct wc_attachment *att;
 
-       output_headers(1);
-
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
+       if (strlen(bstr("force_room")) > 0) {
+               gotoroom(bstr("force_room"), 0);
+       }
 
+       output_headers(1);
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
        serv_gets(buf);
 
        if (!strncmp(buf, "570", 3)) {
                if (strlen(bstr("recp")) > 0) {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+                       svprintf("RECPERROR", WCS_STRING,
+                               "<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+                               &buf[4]
+                       );
                }
                do_template("prompt_for_recipient");
                goto DONE;
@@ -955,38 +1156,59 @@ void display_enter(void)
        }
 
        now = time(NULL);
-       tm = (struct tm *) localtime(&now);
-       strcpy(buf, (char *) asctime(tm));
-       buf[strlen(buf) - 1] = 0;
-       strcpy(&buf[16], &buf[19]);
-       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("from %s ", WC->wc_username);
-       if (strlen(bstr("recp")) > 0)
-               wprintf("to %s ", bstr("recp"));
-       wprintf("in %s&gt; ", WC->wc_roomname);
-       wprintf("</B></FONT><BR><CENTER>\n");
-
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/post\" "
+       fmt_date(buf, now);
+       strcat(&buf[strlen(buf)], " <I>from</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_username, 1);
+       if (strlen(bstr("recp")) > 0) {
+               strcat(&buf[strlen(buf)], " <I>to</I> ");
+               stresc(&buf[strlen(buf)], bstr("recp"), 1);
+       }
+       strcat(&buf[strlen(buf)], " <I>in</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_roomname, 1);
+       svprintf("BOXTITLE", WCS_STRING, buf);
+       do_template("beginbox");
+
+       wprintf("<CENTER>\n");
+
+       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("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \" "
+               "onLoad=\"document.enterform.msgtext.focus();\" >");
        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>"
                "&nbsp;&nbsp;&nbsp;"
                "<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");
+       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
+               "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&nbsp;&nbsp;"
+               "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
 
        wprintf("</FORM></CENTER>\n");
+       do_template("endbox");
 DONE:  wDumpContent(1);
-       wprintf("</FONT>");
 }
 
 
@@ -1029,8 +1251,8 @@ void confirm_move_msg(void)
 
        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");