* The previous <div style=\"margin-right:1px\"> has been replaced by a
[citadel.git] / webcit / messages.c
index 991f0f0f23752684deda81e6b1b1c4419534ea5e..8a12605f7b896a10d8f257c4c3223ed2d2c45553 100644 (file)
 #include "webserver.h"
 
 
+/* Address book entry (keep it short and sweet, it's just a quickie lookup
+ * which we can use to get to the real meat and bones later)
+ */
+struct addrbookent {
+       char ab_name[64];
+       long ab_msgnum;
+};
+
+
 /*
  * Look for URL's embedded in a buffer and make them linkable.  We use a
  * target window in order to keep the BBS session in its own window.
@@ -82,23 +91,67 @@ char buf[];
 }
 
 
+/* display_vcard() calls this after parsing the textual vCard into
+ * our 'struct vCard' data object.
+ * This gets called instead of display_parsed_vcard() if we are only looking
+ * to extract the person's name instead of displaying the card.
+ */
+void fetchname_parsed_vcard(struct vCard *v, char *storename) {
+       int i;
+
+       strcpy(storename, "");
+       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+               if (!strcasecmp(v->prop[i].name, "n")) {
+                       strcpy(storename, v->prop[i].value);
+                       if ((strlen(storename)>0) && (storename[0] != ';')) {
+                               while(storename[strlen(storename)-1] == ';') {
+                                       storename[strlen(storename)-1] = 0;
+                               }
+                       }
+               }
+       }
+}
+
+
+
 /* display_vcard() calls this after parsing the textual vCard into
  * our 'struct vCard' data object.
  *
  * Set 'full' to nonzero to display the full card, otherwise it will only
  * show a summary line.
+ *
+ * This code is a bit ugly, so perhaps an explanation is due: we do this
+ * in two passes through the vCard fields.  On the first pass, we process
+ * fields we understand, and then render them in a pretty fashion at the
+ * end.  Then we make a second pass, outputting all the fields we don't
+ * understand in a simple two-column name/value format.
  */
 void display_parsed_vcard(struct vCard *v, int full) {
        int i, j;
        char buf[SIZ];
        char *name;
+       int is_qp = 0;
+       int is_b64 = 0;
+       char *thisname, *thisvalue;
+       char firsttoken[SIZ];
+       int pass;
+
+       char displayname[SIZ];
+       char phone[SIZ];
+       char mailto[SIZ];
+
+       strcpy(displayname, "");
+       strcpy(phone, "");
+       strcpy(mailto, "");
 
        if (!full) {
                wprintf("<TD>");
-               name = vcard_get_prop(v, "n", 1, 0, 0);
+               name = vcard_get_prop(v, "fn", 1, 0, 0);
                if (name != NULL) {
-                       strcpy(buf, name);
-                       escputs(buf);
+                       escputs(name);
+               }
+               else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
+                       escputs(name);
                }
                else {
                        wprintf("&nbsp;");
@@ -108,54 +161,138 @@ 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 ALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
-                       "<TD><FONT SIZE=+1><B>");
-                       escputs(v->prop[i].value);
-                       wprintf("</B></FONT></TD></TR>\n");
-               }
-               else if (!strcasecmp(v->prop[i].name, "email;internet")) {
-                       wprintf("<TR><TD>Internet e-mail:</TD>"
-                               "<TD><A HREF=\"mailto:");
-                       urlescputs(v->prop[i].value);
-                       wprintf("\">");
-                       escputs(v->prop[i].value);
-                       wprintf("</A></TD></TR>\n");
-               }
-               else if (!strcasecmp(v->prop[i].name, "adr")) {
-                       wprintf("<TR><TD>Address:</TD><TD>");
-                       for (j=0; j<num_tokens(v->prop[i].value, ';'); ++j) {
-                               extract_token(buf, v->prop[i].value, j, ';');
-                               if (strlen(buf) > 0) {
-                                       escputs(buf);
-                                       wprintf("<BR>");
+       for (pass=1; pass<=2; ++pass) {
+
+               if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+
+                       thisname = strdup(v->prop[i].name);
+                       extract_token(firsttoken, thisname, 0, ';');
+       
+                       for (j=0; j<num_tokens(thisname, ';'); ++j) {
+                               extract_token(buf, thisname, j, ';');
+                               if (!strcasecmp(buf, "encoding=quoted-printable")) {
+                                       is_qp = 1;
+                                       remove_token(thisname, j, ';');
+                               }
+                               if (!strcasecmp(buf, "encoding=base64")) {
+                                       is_b64 = 1;
+                                       remove_token(thisname, j, ';');
                                }
                        }
-                       wprintf("</TD></TR>\n");
-               }
-               else if (!strncasecmp(v->prop[i].name, "tel;", 4)) {
-                       wprintf("<TR><TD>%s telephone:</TD><TD>",
-                               &v->prop[i].name[4]);
-                       for (j=0; j<num_tokens(v->prop[i].value, ';'); ++j) {
-                               extract_token(buf, v->prop[i].value, j, ';');
-                               if (strlen(buf) > 0) {
-                                       escputs(buf);
-                                       wprintf("<BR>");
+       
+                       if (is_qp) {
+                               thisvalue = malloc(strlen(v->prop[i].value) + 50);
+                               j = CtdlDecodeQuotedPrintable(
+                                       thisvalue, v->prop[i].value,
+                                       strlen(v->prop[i].value) );
+                               thisvalue[j] = 0;
+                       }
+                       else if (is_b64) {
+                               thisvalue = malloc(strlen(v->prop[i].value) + 50);
+                               CtdlDecodeBase64(
+                                       thisvalue, v->prop[i].value,
+                                       strlen(v->prop[i].value) );
+                       }
+                       else {
+                               thisvalue = strdup(v->prop[i].value);
+                       }
+       
+                       /*** Various fields we may encounter ***/
+       
+                       /* N is name, but only if there's no FN already there */
+                       if (!strcasecmp(firsttoken, "n")) {
+                               if (strlen(displayname) == 0) {
+                                       strcpy(displayname, thisvalue);
+                               }
+                       }
+       
+                       /* FN (full name) is a true 'display name' field */
+                       else if (!strcasecmp(firsttoken, "fn")) {
+                               strcpy(displayname, thisvalue);
+                       }
+       
+                       else if (!strcasecmp(firsttoken, "email")) {
+                               if (strlen(mailto) > 0) strcat(mailto, "<br />");
+                               strcat(mailto,
+                                       "<A HREF=\"/display_enter"
+                                       "?force_room=_MAIL_&recp=");
+                               urlesc(&mailto[strlen(mailto)], thisvalue);
+                               strcat(mailto, "\">");
+                               urlesc(&mailto[strlen(mailto)], thisvalue);
+                               strcat(mailto, "</A>");
+                       }
+                       else if (!strcasecmp(firsttoken, "tel")) {
+                               if (strlen(phone) > 0) strcat(phone, "<br />");
+                               strcat(phone, thisvalue);
+                               for (j=0; j<num_tokens(thisname, ';'); ++j) {
+                                       extract_token(buf, thisname, j, ';');
+                                       if (!strcasecmp(buf, "tel"))
+                                               strcat(phone, "");
+                                       else if (!strcasecmp(buf, "work"))
+                                               strcat(phone, " (work)");
+                                       else if (!strcasecmp(buf, "home"))
+                                               strcat(phone, " (home)");
+                                       else if (!strcasecmp(buf, "cell"))
+                                               strcat(phone, " (cell)");
+                                       else {
+                                               strcat(phone, " (");
+                                               strcat(phone, buf);
+                                               strcat(phone, ")");
+                                       }
+                               }
+                       }
+                       else if (!strcasecmp(firsttoken, "adr")) {
+                               if (pass == 2) {
+                                       wprintf("<TR><TD>Address:</TD><TD>");
+                                       for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
+                                               extract_token(buf, thisvalue, j, ';');
+                                               if (strlen(buf) > 0) {
+                                                       escputs(buf);
+                                                       wprintf("<br />");
+                                               }
+                                       }
+                                       wprintf("</TD></TR>\n");
+                               }
+                       }
+                       else if (!strcasecmp(firsttoken, "version")) {
+                               /* ignore */
+                       }
+                       else if (!strcasecmp(firsttoken, "rev")) {
+                               /* ignore */
+                       }
+                       else if (!strcasecmp(firsttoken, "label")) {
+                               /* ignore */
+                       }
+                       else {
+                               if (pass == 2) {
+                                       wprintf("<TR><TD>");
+                                       escputs(thisname);
+                                       wprintf("</TD><TD>");
+                                       escputs(thisvalue);
+                                       wprintf("</TD></TR>\n");
                                }
                        }
-                       wprintf("</TD></TR>\n");
+       
+                       free(thisname);
+                       free(thisvalue);
                }
-               else {
-                       wprintf("<TR><TD>");
-                       escputs(v->prop[i].name);
-                       wprintf("</TD><TD>");
-                       escputs(v->prop[i].value);
-                       wprintf("</TD></TR>\n");
+       
+               if (pass == 1) {
+                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
+                       "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
+                       "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
+                       "<FONT SIZE=+1><B>");
+                       escputs(displayname);
+                       wprintf("</B></FONT></TD></TR>\n");
+               
+                       if (strlen(phone) > 0)
+                               wprintf("<TR><TD>Telephone:</TD><TD>%s</TD></TR>\n", phone);
+                       if (strlen(mailto) > 0)
+                               wprintf("<TR><TD>E-mail:</TD><TD>%s</TD></TR>\n", mailto);
                }
+
        }
+
        wprintf("</TABLE>\n");
 }
 
@@ -164,9 +301,11 @@ void display_parsed_vcard(struct vCard *v, int full) {
 /*
  * Display a textual vCard
  * (Converts to a vCard object and then calls the actual display function)
- * Set 'full' to nonzero to display the whole card instead of a one-liner
+ * Set 'full' to nonzero to display the whole card instead of a one-liner.
+ * Or, if "storename" is non-NULL, just store the person's name in that
+ * buffer instead of displaying the card at all.
  */
-void display_vcard(char *vcard_source, char alpha, int full) {
+void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
        struct vCard *v;
        char *name;
        char buf[SIZ];
@@ -181,12 +320,13 @@ void display_vcard(char *vcard_source, char alpha, int full) {
                this_alpha = buf[0];
        }
 
-       if ( (alpha == 0)
+       if (storename != NULL) {
+               fetchname_parsed_vcard(v, storename);
+       }
+       else if ( (alpha == 0)
           || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
           || ((!isalpha(alpha)) && (!isalpha(this_alpha))) ) {
-
                display_parsed_vcard(v, full);
-
        }
 
        vcard_free(v);
@@ -205,7 +345,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];
@@ -225,25 +365,31 @@ void read_message(long msgnum) {
        strcpy(reply_to, "");
        strcpy(vcard_partnum, "");
        strcpy(cal_partnum, "");
+       strcpy(mime_http, "");
 
        serv_printf("MSG4 %ld", msgnum);
        serv_gets(buf);
        if (buf[0] != '1') {
-               wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
+               wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
                return;
        }
 
+       /* begin everythingamundo table */
+       wprintf("<div id=\"fix_scrollbar_bug\">\n");
+       wprintf("<table width=100%% border=1 cellspacing=0 "
+               "cellpadding=0><TR><TD>\n");
+
+       /* begin message header table */
        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("<I>unexpected end of message</I><br /><br />\n");
+                       wprintf("</SPAN>\n");
                        return;
                }
                if (!strncasecmp(buf, "nhdr=yes", 8))
@@ -277,6 +423,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)))))
@@ -300,21 +447,14 @@ 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\">"
                                        "<IMG SRC=\"/static/attachment.gif\" "
                                        "BORDER=0 ALIGN=MIDDLE>\n"
-                                       "Part %s: %s (%s, %d bytes)</A><BR>\n",
+                                       "Part %s: %s (%s, %d bytes)</A><br />\n",
                                        msgnum, mime_partnum,
                                        msgnum, mime_partnum,
                                        mime_partnum, mime_filename,
@@ -323,15 +463,8 @@ 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);
@@ -357,7 +490,9 @@ void read_message(long msgnum) {
                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);
                }
@@ -370,47 +505,50 @@ void read_message(long msgnum) {
                wprintf("****");
        }
 
-       wprintf("</FONT></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);
-
-       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\">"
-                       "<A HREF=\"/confirm_move_msg"
-                       "&msgid=%ld"
-                       "\"><FONT SIZE=-1>Move</FONT></A>"
-                       "</TD>\n", msgnum);
+       wprintf("</SPAN>");
+       if (strlen(m_subject) > 0) {
+               wprintf("<br />"
+                       "<SPAN CLASS=\"message_subject\">"
+                       "Subject: %s"
+                       "</SPAN>", m_subject
+               );
+       }
+       wprintf("</TD>\n");
 
-               wprintf("<TD BGCOLOR=\"AAAADD\">"
-                       "<A HREF=\"/delete_msg"
-                       "&msgid=%ld\""
-                       "onClick=\"return confirm('Delete this message?');\""
-                       "><FONT SIZE=-1>Del</FONT></A>"
-                       "</TD>\n", msgnum);
+       /* start msg buttons */
+       wprintf("<TD ALIGN=RIGHT>\n");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_one_msg\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%ld\">\n",
+               msgnum);
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
+       escputs(reply_to);
+       wprintf("\">\n");
+
+       if (!strncasecmp(m_subject, "Re:", 2)) {
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"");
+               escputs(m_subject);
+               wprintf("\">\n");
+       }
+       else if (strlen(m_subject) > 0) {
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"Re: ");
+               escputs(m_subject);
+               wprintf("\">\n");
        }
 
-       wprintf("</TR></TABLE>\n"
-               "</TD>\n");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Reply\">\n");
 
-       if (strlen(m_subject) > 0) {
-               wprintf("<TR><TD><FONT COLOR=\"0000FF\">"
-                       "Subject: %s</FONT>"
-                       "</TD><TD>&nbsp;</TD></TR>\n", m_subject);
+       if (WC->is_room_aide)  {
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\"VALUE=\"Move\">\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Delete\""
+                       "onClick=\"return confirm('Delete this message?');\">\n");
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</FORM>\n"
+               "</TD></TR></TABLE>\n");
+
+       /* Begin body */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
+               "CELLPADDING=1 CELLSPACING=0><TR><TD>");
 
        /* 
         * Learn the content type
@@ -418,8 +556,8 @@ void read_message(long msgnum) {
        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;
+                       wprintf("<I>unexpected end of message</I><br /><br />\n");
+                       goto ENDBODY;
                }
                if (!strncasecmp(buf, "Content-type: ", 14)) {
                        safestrncpy(mime_content_type, &buf[14],
@@ -429,7 +567,7 @@ void read_message(long msgnum) {
 
        /* Messages in legacy Citadel variformat get handled thusly... */
        if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-               fmout(NULL);
+               fmout(NULL, "JUSTIFY");
        }
 
        /* Boring old 80-column fixed format text gets handled this way... */
@@ -441,19 +579,19 @@ void read_message(long msgnum) {
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
                        ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<FONT COLOR=\"000044\"><I>");
+                               wprintf("<BLOCKQUOTE>");
                                bq = 1;
                        } else if ((bq == 1) &&
                                (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</FONT></I>");
+                               wprintf("</BLOCKQUOTE>");
                                bq = 0;
                        }
                        wprintf("<TT>");
                        url(buf);
                        escputs(buf);
-                       wprintf("</TT><BR>\n");
+                       wprintf("</TT><br />\n");
                }
-               wprintf("</I><BR>");
+               wprintf("</I><br />");
        }
 
        else /* HTML is fun, but we've got to strip it first */
@@ -463,16 +601,15 @@ void read_message(long msgnum) {
 
        /* Unknown weirdness */
        else {
-               wprintf("I don't know how to display %s<BR>\n",
+               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 (mime_http != NULL) {
+       if (strlen(mime_http) > 0) {
                wprintf("%s", mime_http);
-               free(mime_http);
        }
 
        /* Handler for vCard parts */
@@ -490,7 +627,7 @@ void read_message(long msgnum) {
                        }
 
                        /* In all cases, display the full card */
-                       display_vcard(part_source, 0, 1);
+                       display_vcard(part_source, 0, 1, NULL);
                }
        }
 
@@ -508,10 +645,16 @@ void read_message(long msgnum) {
                part_source = NULL;
        }
 
+ENDBODY:
+       wprintf("</TD></TR></TABLE>\n");
+
+       /* end everythingamundo table */
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n");
 }
 
 
-void summarize_message(long msgnum) {
+void summarize_message(long msgnum, int is_new) {
        char buf[SIZ];
 
        struct {
@@ -525,7 +668,7 @@ void summarize_message(long msgnum) {
        memset(&summ, 0, sizeof(summ));
        strcpy(summ.subj, "(no subject)");
 
-       sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
+       sprintf(buf, "MSG0 %ld|3", msgnum);     /* ask for headers only with no MIME */
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '1') return;
@@ -562,14 +705,22 @@ void summarize_message(long msgnum) {
                }
        }
 
-       wprintf("<TD><A HREF=\"/readfwd?startmsg=%ld"
+       wprintf("<TD>");
+       if (is_new) wprintf("<B>");
+       wprintf("<A HREF=\"/readfwd?startmsg=%ld"
                "&maxmsgs=1&summary=0\">", 
                msgnum);
        escputs(summ.subj);
-       wprintf("</A></TD><TD>");
+       wprintf("</A>");
+       if (is_new) wprintf("</B>");
+       wprintf("</TD><TD>");
+       if (is_new) wprintf("<B>");
        escputs(summ.from);
+       if (is_new) wprintf("</B>");
        wprintf(" </TD><TD>");
+       if (is_new) wprintf("<B>");
        escputs(summ.date);
+       if (is_new) wprintf("</B>");
        wprintf(" </TD>");
        wprintf("<TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
@@ -626,7 +777,7 @@ void display_addressbook(long msgnum, char alpha) {
                if (vcard_source != NULL) {
 
                        /* Display the summary line */
-                       display_vcard(vcard_source, alpha, 0);
+                       display_vcard(vcard_source, alpha, 0, NULL);
 
                        /* If it's my vCard I can edit it */
                        if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
@@ -645,6 +796,204 @@ void display_addressbook(long msgnum, char alpha) {
 
 
 
+/* If it's an old "Firstname Lastname" style record, try to
+ * convert it.
+ */
+void lastfirst_firstlast(char *namebuf) {
+       char firstname[SIZ];
+       char lastname[SIZ];
+       int i;
+
+       if (namebuf == NULL) return;
+       if (strchr(namebuf, ';') != NULL) return;
+
+       i = num_tokens(namebuf, ' ');
+       if (i < 2) return;
+
+       extract_token(lastname, namebuf, i-1, ' ');
+       remove_token(namebuf, i-1, ' ');
+       strcpy(firstname, namebuf);
+       sprintf(namebuf, "%s; %s", lastname, firstname);
+}
+
+
+void fetch_ab_name(long msgnum, char *namebuf) {
+       char buf[SIZ];
+       char mime_partnum[SIZ];
+       char mime_filename[SIZ];
+       char mime_content_type[SIZ];
+       char mime_disposition[SIZ];
+       int mime_length;
+       char vcard_partnum[SIZ];
+       char *vcard_source = NULL;
+       int i;
+
+       struct {
+               char date[SIZ];
+               char from[SIZ];
+               char to[SIZ];
+               char subj[SIZ];
+               int hasattachments;
+       } summ;
+
+       if (namebuf == NULL) return;
+       strcpy(namebuf, "");
+
+       memset(&summ, 0, sizeof(summ));
+       strcpy(summ.subj, "(no subject)");
+
+       sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0] != '1') return;
+
+       while (serv_gets(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);
+                       mime_length = extract_int(&buf[5], 5);
+
+                       if (!strcasecmp(mime_content_type, "text/x-vcard")) {
+                               strcpy(vcard_partnum, mime_partnum);
+                       }
+
+               }
+       }
+
+       if (strlen(vcard_partnum) > 0) {
+               vcard_source = load_mimepart(msgnum, vcard_partnum);
+               if (vcard_source != NULL) {
+
+                       /* Grab the name off the card */
+                       display_vcard(vcard_source, 0, 0, namebuf);
+
+                       free(vcard_source);
+               }
+       }
+
+       lastfirst_firstlast(namebuf);
+       striplt(namebuf);
+       for (i=0; i<strlen(namebuf); ++i) {
+               if (namebuf[i] != ';') return;
+       }
+       strcpy(namebuf, "(no name)");
+}
+
+
+
+/*
+ * Record compare function for sorting address book indices
+ */
+int abcmp(const void *ab1, const void *ab2) {
+       return(strcasecmp(
+               (((const struct addrbookent *)ab1)->ab_name),
+               (((const struct addrbookent *)ab2)->ab_name)
+       ));
+}
+
+
+/*
+ * Helper function for do_addrbook_view()
+ * Converts a name into a three-letter tab label
+ */
+void nametab(char *tabbuf, char *name) {
+       stresc(tabbuf, name, 0, 0);
+       tabbuf[0] = toupper(tabbuf[0]);
+       tabbuf[1] = tolower(tabbuf[1]);
+       tabbuf[2] = tolower(tabbuf[2]);
+       tabbuf[3] = 0;
+}
+
+
+/*
+ * Render the address book using info we gathered during the scan
+ */
+void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
+       int i = 0;
+       int displayed = 0;
+       int bg = 0;
+       static int NAMESPERPAGE = 60;
+       int num_pages = 0;
+       int page = 0;
+       int tabfirst = 0;
+       char tabfirst_label[SIZ];
+       int tablast = 0;
+       char tablast_label[SIZ];
+
+       if (num_ab == 0) {
+               wprintf("<I>This address book is empty.</I>\n");
+               return;
+       }
+
+       if (num_ab > 1) {
+               qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
+       }
+
+       num_pages = num_ab / NAMESPERPAGE;
+
+       page = atoi(bstr("page"));
+
+       wprintf("Page: ");
+       for (i=0; i<=num_pages; ++i) {
+               if (i != page) {
+                       wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+               }
+               else {
+                       wprintf("<B>");
+               }
+               tabfirst = i * NAMESPERPAGE;
+               tablast = tabfirst + NAMESPERPAGE - 1;
+               if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+               nametab(tabfirst_label, addrbook[tabfirst].ab_name);
+               nametab(tablast_label, addrbook[tablast].ab_name);
+               wprintf("[%s&nbsp;-&nbsp;%s]",
+                       tabfirst_label, tablast_label
+               );
+               if (i != page) {
+                       wprintf("</A>\n");
+               }
+               else {
+                       wprintf("</B>\n");
+               }
+       }
+       wprintf("<br />\n");
+
+       wprintf("<TABLE border=0 cellspacing=0 "
+               "cellpadding=3 width=100%%>\n"
+       );
+
+       for (i=0; i<num_ab; ++i) {
+
+               if ((i / NAMESPERPAGE) == page) {
+
+                       if ((displayed % 4) == 0) {
+                               if (displayed > 0) {
+                                       wprintf("</TR>\n");
+                               }
+                               bg = 1 - bg;
+                               wprintf("<TR BGCOLOR=\"#%s\">",
+                                       (bg ? "DDDDDD" : "FFFFFF")
+                               );
+                       }
+       
+                       wprintf("<TD>");
+       
+                       wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+                               addrbook[i].ab_msgnum);
+                       wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
+                       escputs(addrbook[i].ab_name);
+                       wprintf("</A></TD>\n");
+                       ++displayed;
+               }
+       }
+
+       wprintf("</TR></TABLE>\n");
+}
+
+
+
 /* 
  * load message pointers from the server
  */
@@ -652,18 +1001,21 @@ int load_msg_ptrs(char *servcmd)
 {
        char buf[SIZ];
        int nummsgs;
+       int maxload = 0;
 
        nummsgs = 0;
+       maxload = sizeof(WC->msgarr) / sizeof(long) ;
        serv_puts(servcmd);
        serv_gets(buf);
        if (buf[0] != '1') {
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+               wprintf("<EM>%s</EM><br />\n", &buf[4]);
                return (nummsgs);
        }
        while (serv_gets(buf), strcmp(buf, "000")) {
-               WC->msgarr[nummsgs] = atol(buf);
-               /* FIXME check for overflow */
-               ++nummsgs;
+               if (nummsgs < maxload) {
+                       WC->msgarr[nummsgs] = atol(buf);
+                       ++nummsgs;
+               }
        }
        return (nummsgs);
 }
@@ -676,15 +1028,19 @@ void readloop(char *oper)
 {
        char cmd[SIZ];
        char buf[SIZ];
-       int a, b, i;
+       char old_msgs[SIZ];
+       int is_new = 0;
+       int a, b;
        int nummsgs;
        long startmsg;
        int maxmsgs;
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
+       int is_singlecard = 0;
        int is_calendar = 0;
        int is_tasks = 0;
+       int is_notes = 0;
        int remaining_messages;
        int lo, hi;
        int lowest_displayed = (-1);
@@ -693,76 +1049,85 @@ void readloop(char *oper)
        long pn_current = 0L;
        long pn_next = 0L;
        int bg = 0;
-       char alpha = 0;
+       struct addrbookent *addrbook = NULL;
+       int num_ab = 0;
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
        is_summary = atoi(bstr("summary"));
-       if (maxmsgs == 0) maxmsgs = 20;
+       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
 
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
 
+       /* When in summary mode, always show ALL messages instead of just
+        * new or old.  Otherwise, show what the user asked for.
+        */
        if (!strcmp(oper, "readnew")) {
                strcpy(cmd, "MSGS NEW");
-       } else if (!strcmp(oper, "readold")) {
+       }
+       else if (!strcmp(oper, "readold")) {
                strcpy(cmd, "MSGS OLD");
-       } else {
+       }
+       else {
                strcpy(cmd, "MSGS ALL");
        }
 
-       /* FIXME put in the correct constant #defs */
-       if ((WC->wc_view == 1) && (maxmsgs > 1)) {
+       if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
                is_summary = 1;
                strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
        }
-       if ((WC->wc_view == 2) && (maxmsgs > 1)) {
+
+       if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
                is_addressbook = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
-               if (bstr("alpha") == NULL) {
-                       alpha = 'A';
-               }
-               else {
-                       strcpy(buf, bstr("alpha"));
-                       alpha = buf[0];
-               }
+       }
 
-               for (i='A'; i<='Z'; ++i) {
-                       if (i == alpha) wprintf("<FONT SIZE=+2>"
-                                               "%c</FONT>\n", i);
-                       else {
-                               wprintf("<A HREF=\"/readfwd?alpha=%c\">"
-                                       "%c</A>\n", i, i);
-                       }
-                       wprintf("&nbsp;");
+       if (is_summary) {
+               strcpy(cmd, "MSGS ALL");
+       }
+
+       /* Are we doing a summary view?  If so, we need to know old messages
+        * and new messages, so we can do that pretty boldface thing for the
+        * new messages.
+        */
+       strcpy(old_msgs, "");
+       if (is_summary) {
+               serv_puts("GTSN");
+               serv_gets(buf);
+               if (buf[0] == '2') {
+                       strcpy(old_msgs, &buf[4]);
                }
-               if (!isalpha(alpha)) wprintf("<FONT SIZE=+2>(other)</FONT>\n");
-               else wprintf("<A HREF=\"/readfwd?alpha=1\">(other)</A>\n");
-               wprintf("<HR width=100%%>\n");
        }
-       if (WC->wc_view == 3) {         /* calendar */
+
+       is_singlecard = atoi(bstr("is_singlecard"));
+
+       if (WC->wc_view == VIEW_CALENDAR) {             /* calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
-       if (WC->wc_view == 4) {         /* tasks */
+       if (WC->wc_view == VIEW_TASKS) {                /* tasks */
                is_tasks = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
-               wprintf("<UL>");
+       }
+       if (WC->wc_view == VIEW_NOTES) {                /* notes */
+               is_notes = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
        }
 
        nummsgs = load_msg_ptrs(cmd);
        if (nummsgs == 0) {
 
-               if ((!is_tasks) && (!is_calendar)) {
+               if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
                        if (!strcmp(oper, "readnew")) {
-                               wprintf("<EM>No new messages in this room.</EM>\n");
+                               wprintf("<EM>No new messages.</EM>\n");
                        } else if (!strcmp(oper, "readold")) {
-                               wprintf("<EM>No old messages in this room.</EM>\n");
+                               wprintf("<EM>No old messages.</EM>\n");
                        } else {
-                               wprintf("<EM>This room is empty.</EM>\n");
+                               wprintf("<EM>No messages here.</EM>\n");
                        }
                }
 
@@ -778,9 +1143,11 @@ void readloop(char *oper)
                }
        }
 
+       wprintf("<FORM NAME=\"msgomatic\" "
+               "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
        if (is_summary) {
-               wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n"
-                       "<TABLE border=0 cellspacing=0 "
+               wprintf("<div id=\"fix_scrollbar_bug\">"
+                       "<table border=0 cellspacing=0 "
                        "cellpadding=0 width=100%%>\n"
                        "<TR>"
                        "<TD><I>Subject</I></TD>"
@@ -791,34 +1158,45 @@ void readloop(char *oper)
                );
        }
 
-       if (is_addressbook) {
-               wprintf("<TABLE border=0 cellspacing=0 "
-                       "cellpadding=0 width=100%%>\n"
-               );
-       }
-
        for (a = 0; a < nummsgs; ++a) {
                if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
+                       /* Are you a new message, or an old message? */
+                       is_new = 0;
+                       if (is_summary) {
+                               if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
+                                       is_new = 0;
+                               }
+                               else {
+                                       is_new = 1;
+                               }
+                       }
+
                        /* Learn which msgs "Prev" & "Next" buttons go to */
                        pn_current = WC->msgarr[a];
                        if (a > 0) pn_previous = WC->msgarr[a-1];
                        if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1];
 
                        /* If a tabular view, set up the line */
-                       if ( (is_summary) || (is_addressbook) ) {
+                       if (is_summary) {
                                bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=%s>",
+                               wprintf("<TR BGCOLOR=\"#%s\">",
                                        (bg ? "DDDDDD" : "FFFFFF")
                                );
                        }
 
                        /* Display the message */
                        if (is_summary) {
-                               summarize_message(WC->msgarr[a]);
+                               summarize_message(WC->msgarr[a], is_new);
                        }
                        else if (is_addressbook) {
-                               display_addressbook(WC->msgarr[a], alpha);
+                               fetch_ab_name(WC->msgarr[a], buf);
+                               ++num_ab;
+                               addrbook = realloc(addrbook,
+                                       (sizeof(struct addrbookent) * num_ab) );
+                               safestrncpy(addrbook[num_ab-1].ab_name, buf,
+                                       sizeof(addrbook[num_ab-1].ab_name));
+                               addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
                        }
                        else if (is_calendar) {
                                display_calendar(WC->msgarr[a]);
@@ -826,12 +1204,15 @@ void readloop(char *oper)
                        else if (is_tasks) {
                                display_task(WC->msgarr[a]);
                        }
+                       else if (is_notes) {
+                               display_note(WC->msgarr[a]);
+                       }
                        else {
                                read_message(WC->msgarr[a]);
                        }
 
                        /* If a tabular view, finish the line */
-                       if ( (is_summary) || (is_addressbook) ) {
+                       if (is_summary) {
                                wprintf("</TR>\n");
                        }
 
@@ -844,15 +1225,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</TABLE>\n");
-       }
-
-       if (is_addressbook) {
-               wprintf("</TABLE>\n");
-       }
-
-       if (is_tasks) {
-               wprintf("</UL>\n");
+               wprintf("</table></div>\n");
        }
 
        /* Bump these because although we're thinking in zero base, the user
@@ -863,10 +1236,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)) {
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
 
-               wprintf("<CENTER>"
-                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+               wprintf("<div id=\"fix_scrollbar_bug\">"
+                       "<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);
@@ -903,84 +1276,148 @@ void readloop(char *oper)
                        oper,
                        WC->msgarr[0]);
 
-               wprintf("</TD></TR></TABLE></CENTER>\n");
+               wprintf("</td></tr></table></div>\n");
            }
        }
 
-
        /*
         * If we're not currently looking at ALL requested
         * 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>"
-                       "Reading #%d-%d of %d messages.</TD>\n"
-                       "<TD ALIGN=RIGHT><FONT SIZE=+1>",
-                       lowest_displayed, highest_displayed, nummsgs);
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+             && (!is_notes) && (!is_singlecard)) {
 
-               if (is_summary) {
-                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Delete selected\">\n");
-               }
+               wprintf("Reading #", lowest_displayed, highest_displayed);
 
+               wprintf("<SELECT NAME=\"whichones\" SIZE=\"1\" "
+                       "OnChange=\"location.href=msgomatic.whichones.options"
+                       "[selectedIndex].value\">\n");
 
                for (b=0; b<nummsgs; b = b + maxmsgs) {
                lo = b+1;
-               hi = b+maxmsgs+1;
+               hi = b+maxmsgs;
                if (hi > nummsgs) hi = nummsgs;
-                       if (WC->msgarr[b] != startmsg) {
-                               wprintf("<A HREF=\"/%s"
-                                       "?startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&summary=%d\">"
-                                       "%d-%d</A> \n",
-                                               oper,
-                                               WC->msgarr[b],
-                                               maxmsgs,
-                                               is_summary,
-                                               lo, hi);
-                       }
-                       else {
-                               wprintf("%d-%d \n", lo, hi);
-                       }
-
+                       wprintf("<OPTION %s VALUE="
+                               "\"/%s"
+                               "?startmsg=%ld"
+                               "&maxmsgs=%d"
+                               "&summary=%d\">"
+                               "%d-%d</OPTION> \n",
+                               ((WC->msgarr[b] == startmsg) ? "SELECTED" : ""),
+                               oper,
+                               WC->msgarr[b],
+                               maxmsgs,
+                               is_summary,
+                               lo, hi);
                }
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
+               wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=%d\">"
                        "ALL"
-                       "</A> ",
+                       "</OPTION> ",
                        oper,
                        WC->msgarr[0], is_summary);
 
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
+               wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=1\">"
                        "Summary"
-                       "</A>",
+                       "</OPTION>",
                        oper,
                        WC->msgarr[0]);
 
-               wprintf("</TD></TR></TABLE></CENTER>\n");
+               wprintf("</SELECT> of %d messages.", nummsgs);
+
+               if (is_summary) {
+                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Delete selected\">\n");
+               }
+
            }
        }
        if (is_summary) wprintf("</FORM>\n");
 
 DONE:
        if (is_tasks) {
-               wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
-                       "Add new task</A>\n"
-               );
+               do_tasks_view();        /* Render the task list */
        }
 
        if (is_calendar) {
                do_calendar_view();     /* Render the calendar */
        }
 
+       if (is_addressbook) {
+               do_addrbook_view(addrbook, num_ab);     /* Render the address book */
+       }
+
        wDumpContent(1);
+       if (addrbook != NULL) free(addrbook);
 }
 
 
+/*
+ * 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("");
+       serv_puts("<HTML><BODY>\n");
+       text_to_server(bstr("msgtext"), 0);
+       serv_puts("</BODY></HTML>\n");
+       
+
+       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");
+}
 
 
 /*
@@ -998,16 +1435,59 @@ void post_message(void)
 {
        char buf[SIZ];
        static long dont_post = (-1L);
+       struct wc_attachment *att, *aptr;
+
+       if (WC->upload_length > 0) {
+
+               /* There's an attachment.  Save it to this struct... */
+               att = malloc(sizeof(struct wc_attachment));
+               memset(att, 0, sizeof(struct wc_attachment));
+               att->length = WC->upload_length;
+               strcpy(att->content_type, WC->upload_content_type);
+               strcpy(att->filename, WC->upload_filename);
+               att->next = NULL;
+
+               /* And add it to the list. */
+               if (WC->first_attachment == NULL) {
+                       WC->first_attachment = att;
+               }
+               else {
+                       aptr = WC->first_attachment;
+                       while (aptr->next != NULL) aptr = aptr->next;
+                       aptr->next = att;
+               }
+
+               /* 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"), "Cancel")) {
+               sprintf(WC->ImportantMessage, 
+                       "Cancelled.  Message was not posted.");
+       } else if (!strcasecmp(bstr("attach"), "Add")) {
+               display_enter();
+               return;
        } 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|4|%s",
                        bstr("recp"),
@@ -1015,18 +1495,22 @@ void post_message(void)
                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");
-                       wprintf("Message has been posted.<BR>\n");
+                       post_mime_to_server();
+                       if (strlen(bstr("recp")) > 0) {
+                               sprintf(WC->ImportantMessage, "Message has been sent.\n");
+                       }
+                       else {
+                               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");
 }
 
 
@@ -1039,11 +1523,44 @@ void display_enter(void)
 {
        char buf[SIZ];
        long now;
-       struct tm *tm;
+       struct wc_attachment *att;
+
+       if (strlen(bstr("force_room")) > 0) {
+               gotoroom(bstr("force_room"));
+       }
+
+       /* Are we perhaps in an address book view?  If so, then an "enter
+        * message" command really means "add new entry."
+        */
+       if (WC->wc_view == VIEW_ADDRESSBOOK) {
+               do_edit_vcard(-1, "", "");
+               return;
+       }
 
-       output_headers(1);
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       /* Are we perhaps in a calendar view?  If so, then an "enter
+        * message" command really means "add new calendar item."
+        */
+       if (WC->wc_view == VIEW_CALENDAR) {
+               display_edit_event();
+               return;
+       }
+
+       /* Are we perhaps in a tasks view?  If so, then an "enter
+        * message" command really means "add new task."
+        */
+       if (WC->wc_view == VIEW_TASKS) {
+               display_edit_task();
+               return;
+       }
+#endif
 
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
+       /* Otherwise proceed normally.  Do a custom room banner with no navbar... */
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_none);
+       wprintf("</div>\n");
+       wprintf("<div id=\"content\">\n");
 
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
@@ -1051,49 +1568,113 @@ void display_enter(void)
 
        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;
        }
        if (buf[0] != '2') {
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+               wprintf("<EM>%s</EM><br />\n", &buf[4]);
                goto DONE;
        }
 
        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\" "
-               "NAME=\"enterform\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
+       fmt_date(buf, now);
+       strcat(&buf[strlen(buf)], " <I>from</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+       if (strlen(bstr("recp")) > 0) {
+               strcat(&buf[strlen(buf)], " <I>to</I> ");
+               stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
+       }
+       strcat(&buf[strlen(buf)], " <I>in</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
+
+       /* begin message entry screen */
+       wprintf("<div style=\"position:absolute; left:1%%; width:96%%; height:100%%\">\n");
+
+       wprintf("<form enctype=\"multipart/form-data\" "
+               "method=\"POST\" action=\"/post\" "
+               "name=\"enterform\""
+               "onSubmit=\"return submitForm();\""
+               ">\n");
+       wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
                bstr("recp"));
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
+       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
                now);
-       wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
-               "<INPUT TYPE=\"text\" NAME=\"subject\" 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("%s<br>\n", buf);       /* header bar */
+       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\" value=\"");
+       escputs(bstr("subject"));
+       wprintf("\" size=40 maxlength=70>"
+               "&nbsp;"
+       );
+
+       wprintf("<input type=\"submit\" name=\"sc\" value=\"");
+       if (strlen(bstr("recp")) > 0) {
+               wprintf("Send message");
+       } else {
+               wprintf("Post message");
+       }
+       wprintf("\">&nbsp;"
+               "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
+
+       /* begin richedit box */
+       wprintf("<div style=\"position:absolute; left:0%%; width:100%%; "
+               "top:15%; height:75%%\">\n");
+
+       wprintf("<script type=\"text/javascript\" "
+               "src=\"static/richtext.js\"></script>\n"
+               "<script type=\"text/javascript\">\n"
+               "function submitForm() { \n"
+               "  updateRTE('msgtext'); \n"
+               "  return true; \n"
+               "} \n"
+               "  \n"
+               "initRTE(\"static/\", \"static/\", \"\"); \n"
+               "</script> \n"
+               "<noscript>JAVAscript MUST BE ENABLED.</noscript> \n"
+               "<script type=\"text/javascript\"> \n"
+               "writeRichText('msgtext', '");
+       msgescputs(bstr("msgtext"));
+       wprintf("', '100%%', '80%%', true, false); \n"
+               "</script> \n");
+       wprintf("</div>\n");    /* end richedit box */
+
+       /* Here comes the "do attachments" section on the bottom */
+       wprintf("<div style=\"position:absolute; bottom:0px; left:0px; width:100%%\">\n");
+
+       /* Enumerate any attachments which are already in place... */
+       wprintf("<img src=\"/static/attachment.gif\" border=0 "
+               "align=middle height=16 width=16> Attachments: ");
+       wprintf("<select name=\"which_attachment\" size=1>");
+       for (att = WC->first_attachment; att != NULL; att = att->next) {
+               wprintf("<option value=\"");
+               urlescputs(att->filename);
+               wprintf("\">");
+               escputs(att->filename);
+               /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
+               wprintf("</option>\n");
+       }
+       wprintf("</select>");
+
+       /* Now offer the ability to attach additional files... */
+       wprintf("&nbsp;&nbsp;&nbsp;"
+               "Attach file: <input NAME=\"attachfile\" "
+               "SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
+               "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
 
-       wprintf("</FORM></CENTER>\n");
+       wprintf("</div>\n");    /* end attachments section */
+
+       wprintf("</FORM>\n");
+
+       wprintf("</div>\n");
 DONE:  wDumpContent(1);
-       wprintf("</FONT>");
 }
 
 
@@ -1110,12 +1691,12 @@ void delete_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
 
        sprintf(buf, "DELE %ld", msgid);
        serv_puts(buf);
        serv_gets(buf);
-       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+       wprintf("<EM>%s</EM><br />\n", &buf[4]);
 
        wDumpContent(1);
 }
@@ -1134,16 +1715,17 @@ void confirm_move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
 
-       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");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+       wprintf("<font size=+1 color=\"#ffffff\"");
+       wprintf("<b>Confirm move of message</b>\n");
+       wprintf("</font></td></tr></table></div>\n");
 
        wprintf("<CENTER>");
 
-       wprintf("Please select the room to which you would like this message moved:<BR>\n");
+       wprintf("Move this message to:<br />\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
@@ -1162,9 +1744,10 @@ void confirm_move_msg(void)
                }
        }
        wprintf("</SELECT>\n");
-       wprintf("<BR>\n");
+       wprintf("<br />\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
        wprintf("</FORM></CENTER>\n");
 
@@ -1181,22 +1764,51 @@ void move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
 
        if (!strcasecmp(bstr("yesno"), "Move")) {
                sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
                serv_puts(buf);
                serv_gets(buf);
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+               wprintf("<EM>%s</EM><br />\n", &buf[4]);
        } else {
-               wprintf("<EM>Message not moved.</EM><BR>\n");
+               wprintf("<EM>Message not moved.</EM><br />\n");
        }
 
        wDumpContent(1);
 }
 
+/*
+ * This gets called when a user selects Reply/Move/Del etc. on *one* message.
+ */
+void do_stuff_to_one_msg(void) {
+       char *msg_oper;
+
+       msg_oper = bstr("msg_oper");
+
+       if (!strcasecmp(msg_oper, "Delete")) {
+               delete_msg();   /* It's already been confirmed using JS */
+               return;
+       }
+       if (!strcasecmp(msg_oper, "Move")) {
+               confirm_move_msg();
+               return;
+       }
+       if (!strcasecmp(msg_oper, "Reply")) {
+               display_enter();        /* recp and subject already set */
+               return;
+       }
+
+       /* should never get here.  FIXME: display an error */
+
+}
 
 
+/*
+ * This gets called when a user selects multiple messages in a summary
+ * list and then clicks to perform a transformation of some sort on them
+ * (such as deleting them).
+ */
 void do_stuff_to_msgs(void) {
        char buf[SIZ];
        char sc[SIZ];