]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* Display HTML messages as HTML. (Wow!)
[citadel.git] / webcit / messages.c
index ebb9e8ffca125c531e255748abcf5cdf65f45752..8e7c1237f66107050948d1ad1a044d8facdb15ec 100644 (file)
@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include "webcit.h"
+#include "vcard.h"
 
 
 /*
@@ -37,7 +38,7 @@ char buf[];
        int pos;
        int start, end;
        char ench;
-       char urlbuf[256];
+       char urlbuf[SIZ];
        char outbuf[1024];
 
        start = (-1);
@@ -71,7 +72,6 @@ char buf[];
        strncpy(urlbuf, &buf[start], end - start);
        urlbuf[end - start] = 0;
 
-
        strncpy(outbuf, buf, start);
        sprintf(&outbuf[start], "%cA HREF=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
                LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
@@ -81,43 +81,257 @@ char buf[];
 }
 
 
-void read_message(long msgnum, int is_summary) {
-       char buf[256];
-       char mime_partnum[256];
-       char mime_filename[256];
-       char mime_content_type[256];
-       char mime_disposition[256];
+/* 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.
+ */
+void display_parsed_vcard(struct vCard *v, int full) {
+       int i, j;
+       char buf[SIZ];
+       char *name;
+
+       if (!full) {
+               wprintf("<TD>");
+               name = vcard_get_prop(v, "n", 1, 0, 0);
+               if (name != NULL) {
+                       strcpy(buf, name);
+                       escputs(buf);
+               }
+               else {
+                       wprintf("&nbsp;");
+               }
+               wprintf("</TD>");
+               return;
+       }
+
+       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>"
+                       "<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>");
+                               }
+                       }
+                       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>");
+                               }
+                       }
+                       wprintf("</TD></TR>\n");
+               }
+               else {
+                       wprintf("<TR><TD>");
+                       escputs(v->prop[i].name);
+                       wprintf("</TD><TD>");
+                       escputs(v->prop[i].value);
+                       wprintf("</TD></TR>\n");
+               }
+       }
+       wprintf("</TABLE>\n");
+}
+
+
+
+/*
+ * 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
+ */
+void display_vcard(char *vcard_source, char alpha, int full) {
+       struct vCard *v;
+       char *name;
+       char buf[SIZ];
+       char this_alpha = 0;
+
+       v = vcard_load(vcard_source);
+       if (v == NULL) return;
+
+       name = vcard_get_prop(v, "n", 1, 0, 0);
+       if (name != NULL) {
+               strcpy(buf, name);
+               this_alpha = buf[0];
+       }
+
+       if ( (alpha == 0)
+          || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
+          || ((!isalpha(alpha)) && (!isalpha(this_alpha))) ) {
+
+               display_parsed_vcard(v, full);
+
+       }
+
+       vcard_free(v);
+}
+
+
+
+
+void output_text_plain(char *partbuf, int total_length) {
+       wprintf("<PRE>\n");
+       write(WC->http_sock, partbuf, total_length);
+       wprintf("</PRE><BR>\n");
+}
+
+
+
+
+/*
+ * Output the chosen part of a MIME message.  This might be chosen from
+ * a multipart/alternative or it might be chosen because it's the only one
+ * present.  We care not why it was chosen; it is our job to be a servile
+ * little function and do what we are told.
+ */
+void output_chosen_part(long msgnum, char *multipart_chosen) {
+       char buf[SIZ];
+       char *partbuf;
+       int total_length = 0;
+       int downloaded_length = 0;
+       int block_length = 0;
+       char content_type[SIZ];
+
+       serv_printf("OPNA %ld|%s", msgnum, multipart_chosen);
+       serv_gets(buf);
+       if (buf[0] != '2') {
+               wprintf("<I>Error reading msg %ld part %s</I><BR><BR>",
+                       msgnum, multipart_chosen);
+               return;
+       }
+
+       total_length = extract_int(&buf[4], 0);
+       extract(content_type, &buf[4], 3);
+
+       if ( (strlen(content_type) ==0)
+          ||(!strcasecmp(content_type, "text"))
+          ||(!strcasecmp(content_type, "text/english"))
+          ) {
+               strcpy(content_type, "text/plain");
+       }
+
+       partbuf = malloc(total_length + 1);
+       if (partbuf == NULL) {
+               wprintf("<I>Memory allocation error</I><BR><BR>");
+               return;
+       }
+
+       partbuf[total_length] = 0;      /* Give it a nice null terminator */
+
+       /* FIXME ... add something to make this die if we
+        *           lose the server connection.
+        */
+       while (downloaded_length < total_length) {
+               if ((total_length - downloaded_length) < 4096) {
+                       block_length = total_length - downloaded_length;
+               }
+               else {
+                       block_length = 4096;
+               }
+               serv_printf("READ %d|%d", downloaded_length, block_length);
+               serv_gets(buf);
+               if (buf[0] == '6') {
+                       block_length = extract_int(&buf[4], 0);
+                       serv_read(partbuf, block_length);
+                       downloaded_length += block_length;
+               }
+       }
+
+       serv_puts("CLOS");
+       serv_gets(buf);
+
+       if (!strcasecmp(content_type, "text/plain")) {
+               output_text_plain(partbuf, total_length);
+       }
+       if (!strcasecmp(content_type, "text/html")) {
+               output_text_html(partbuf, total_length);
+       }
+       else {
+               wprintf("<I>Unknown content type %s</I><BR><BR>\n",
+                       content_type);
+       }
+
+       free(partbuf);
+}
+
+
+
+
+
+/*
+ * I wanna SEE that message!
+ */
+void read_message(long msgnum) {
+       char buf[SIZ];
+       char mime_partnum[SIZ];
+       char mime_filename[SIZ];
+       char mime_content_type[SIZ];
+       char mime_disposition[SIZ];
        int mime_length;
        char *mime_http = NULL;
-       char m_subject[256];
-       char from[256];
-       char node[256];
-       char rfca[256];
+       char m_subject[SIZ];
+       char from[SIZ];
+       char node[SIZ];
+       char rfca[SIZ];
        char reply_to[512];
-       char now[256];
+       char now[SIZ];
        int format_type = 0;
        int nhdr = 0;
        int bq = 0;
+       char vcard_partnum[SIZ];
+       char *vcard_source = NULL;
+       int multipart_hunting = 0;
+       char multipart_chosen[SIZ];
+       char multipart_prefix[SIZ];
 
        strcpy(from, "");
        strcpy(node, "");
        strcpy(rfca, "");
        strcpy(reply_to, "");
+       strcpy(vcard_partnum, "");
+       strcpy(multipart_chosen, "1");
 
-       sprintf(buf, "MSG0 %ld", msgnum);
-       serv_puts(buf);
+       serv_printf("MSG0 %ld|1", msgnum);      /* ask for headers only */
        serv_gets(buf);
        if (buf[0] != '1') {
                wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
                return;
        }
-       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 CELLPADDING=1 BGCOLOR=CCCCCC><TR><TD>\n");
+
+       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
+               "CELLPADDING=1 BGCOLOR=CCCCCC><TR><TD>\n");
+
        wprintf("<FONT ");
-       if (!is_summary) wprintf("SIZE=+1 ");
+       wprintf("SIZE=+1 ");
        wprintf("COLOR=\"000000\"> ");
        strcpy(m_subject, "");
 
-       while (serv_gets(buf), strncasecmp(buf, "text", 4)) {
+       while (serv_gets(buf), strcasecmp(buf, "000")) {
                if (!strncasecmp(buf, "nhdr=yes", 8))
                        nhdr = 1;
                if (nhdr == 1)
@@ -163,6 +377,36 @@ void read_message(long msgnum, int is_summary) {
                        wprintf("%s ", now);
                }
 
+               if (format_type == 4) {
+                       if (!strncasecmp(buf, "pref=", 5)) {
+                               extract(multipart_prefix, &buf[5], 1);
+                               if (!strcasecmp(multipart_prefix,
+                                  "multipart/alternative")) {
+                                       ++multipart_hunting;
+                               }
+                       }
+                       if (!strncasecmp(buf, "suff=", 5)) {
+                               extract(multipart_prefix, &buf[5], 1);
+                               if (!strcasecmp(multipart_prefix,
+                                  "multipart/alternative")) {
+                                       --multipart_hunting;
+                               }
+                       }
+                       if (!strncasecmp(buf, "part=", 5)) {
+                               if (multipart_hunting > 0) {
+                                       extract(mime_partnum, &buf[5], 2);
+                                       extract(mime_content_type, &buf[5], 4);
+                                       if ( (!strcasecmp(mime_content_type,
+                                               "text/plain"))
+                                         || (!strcasecmp(mime_content_type,
+                                               "text/html")) ) {
+                                               strcpy(multipart_chosen,
+                                                       mime_partnum);
+                                       }
+                               }
+                       }
+               }
+
                if (!strncasecmp(buf, "part=", 5)) {
                        extract(mime_filename, &buf[5], 1);
                        extract(mime_partnum, &buf[5], 2);
@@ -171,7 +415,6 @@ void read_message(long msgnum, int is_summary) {
                        mime_length = extract_int(&buf[5], 5);
 
                        if (!strcasecmp(mime_disposition, "attachment")) {
-
                                if (mime_http == NULL) {
                                        mime_http = malloc(512);
                                        strcpy(mime_http, "");
@@ -180,7 +423,6 @@ void read_message(long msgnum, int is_summary) {
                                        mime_http = realloc(mime_http,
                                                strlen(mime_http) + 512);
                                }
-       
                                sprintf(&mime_http[strlen(mime_http)],
                                        "<A HREF=\"/output_mimepart?"
                                        "msgnum=%ld&partnum=%s\" "
@@ -193,6 +435,27 @@ void read_message(long msgnum, int is_summary) {
                                        mime_partnum, mime_filename,
                                        mime_content_type, mime_length);
                        }
+
+                       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)],
+                                       "<IMG SRC=\"/output_mimepart?"
+                                       "msgnum=%ld&partnum=%s\">",
+                                       msgnum, mime_partnum);
+                       }
+
+                       if (!strcasecmp(mime_content_type, "text/x-vcard")) {
+                               strcpy(vcard_partnum, mime_partnum);
+                       }
+
                }
 
        }
@@ -212,20 +475,19 @@ void read_message(long msgnum, int is_summary) {
                }
        }
 
-       if (nhdr == 1)
+       if (nhdr == 1) {
                wprintf("****");
+       }
+
        wprintf("</FONT></TD>");
 
-       /* begin right-hand toolbar */
        wprintf("<TD ALIGN=RIGHT>\n"
                "<TABLE BORDER=0><TR>\n");
 
-       if (is_summary) {
-               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=\"/readfwd?startmsg=%ld", msgnum);
+       wprintf("&maxmsgs=1&summary=0\">Read</A>"
+               "</TD>\n", msgnum);
 
        wprintf("<TD BGCOLOR=\"AAAADD\">"
                "<A HREF=\"/display_enter?recp=");
@@ -251,49 +513,215 @@ void read_message(long msgnum, int is_summary) {
        wprintf("</TR></TABLE>\n"
                "</TD>\n");
 
-       /* end right-hand toolbar */
-
-
        if (strlen(m_subject) > 0) {
-               wprintf("<TR><TD><FONT COLOR=\"FFFFFF\">"
+               wprintf("<TR><TD><FONT COLOR=\"0000FF\">"
                        "Subject: %s</FONT>"
                        "</TD><TD>&nbsp;</TD></TR>\n", m_subject);
        }
 
        wprintf("</TR></TABLE>\n");
 
-       if (is_summary) {
-               while (serv_gets(buf), strcmp(buf, "000")) ;
-               return;
-       }
 
+       /* Messages in legacy Citadel variformat get handled thusly... */
        if (format_type == 0) {
-               fmout(NULL);
-       } else {
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       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>");
-                               bq = 1;
-                       } else if ((bq == 1) &&
-                                  (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</FONT></I>");
-                               bq = 0;
+               serv_printf("MSG0 %ld", msgnum);
+               serv_gets(buf);
+               if (buf[0] == '1') {
+                       while (serv_gets(buf), strncasecmp(buf, "text", 4)) { }
+                       fmout(NULL);
+               }
+       }
+
+       /* Boring old 80-column fixed format text gets handled this way... */
+       if (format_type == 1)  {
+               serv_printf("MSG0 %ld", msgnum);
+               serv_gets(buf);
+               if (buf[0] == '1') {
+                       while (serv_gets(buf), strncasecmp(buf, "text", 4)) { }
+                       while (serv_gets(buf), strcmp(buf, "000")) {
+                               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>");
+                                       bq = 1;
+                               } else if ((bq == 1) &&
+                                       (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
+                                       wprintf("</FONT></I>");
+                                       bq = 0;
+                               }
+                               wprintf("<TT>");
+                               url(buf);
+                               escputs(buf);
+                               wprintf("</TT><BR>\n");
                        }
-                       wprintf("<TT>");
-                       url(buf);
-                       escputs(buf);
-                       wprintf("</TT><BR>\n");
                }
+               wprintf("</I><BR>");
        }
-       wprintf("</I><BR>");
 
+       /* MIME!  Rock on!! */
+       if (format_type == 4) {
+               output_chosen_part(msgnum, multipart_chosen);
+       }
+
+       /* Afterwards, offer links to download attachments 'n' such */
        if (mime_http != NULL) {
                wprintf("%s", mime_http);
                free(mime_http);
        }
+
+       if (strlen(vcard_partnum) > 0) {
+               vcard_source = load_mimepart(msgnum, vcard_partnum);
+               if (vcard_source != NULL) {
+
+                       /* If it's my vCard I can edit it */
+                       if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
+                          || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))) {
+                               wprintf("<A HREF=\"/edit_vcard?"
+                                       "msgnum=%ld&partnum=%s\">",
+                                       msgnum, vcard_partnum);
+                               wprintf("(edit)</A>");
+                       }
+
+                       /* In all cases, display the full card */
+                       display_vcard(vcard_source, 0, 1);
+                       free(vcard_source);
+               }
+       }
+
+}
+
+
+void summarize_message(long msgnum) {
+       char buf[SIZ];
+
+       struct {
+               char date[SIZ];
+               char from[SIZ];
+               char to[SIZ];
+               char subj[SIZ];
+               int hasattachments;
+       } summ;
+
+       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, "from=", 5)) {
+                       strcpy(summ.from, &buf[5]);
+               }
+               if (!strncasecmp(buf, "subj=", 5)) {
+                       strcpy(summ.subj, &buf[5]);
+               }
+               if (!strncasecmp(buf, "rfca=", 5)) {
+                       strcat(summ.from, " <");
+                       strcat(summ.from, &buf[5]);
+                       strcat(summ.from, ">");
+               }
+
+               if (!strncasecmp(buf, "node=", 5)) {
+                       if ( ((WC->room_flags & QR_NETWORK)
+                       || ((strcasecmp(&buf[5], serv_info.serv_nodename)
+                       && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
+                       ) {
+                               strcat(summ.from, " @ ");
+                               strcat(summ.from, &buf[5]);
+                       }
+               }
+
+               if (!strncasecmp(buf, "rcpt=", 5)) {
+                       strcpy(summ.to, &buf[5]);
+               }
+
+               if (!strncasecmp(buf, "time=", 5)) {
+                       fmt_date(summ.date, atol(&buf[5]));
+               }
+       }
+
+       wprintf("<TD><A HREF=\"/readfwd?startmsg=%ld"
+               "&maxmsgs=1&summary=0\">", 
+               msgnum);
+       escputs(summ.subj);
+       wprintf("</A></TD><TD>");
+       escputs(summ.from);
+       wprintf(" </TD><TD>");
+       escputs(summ.date);
+       wprintf(" </TD>");
+       wprintf("<TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
+               "</TD>\n");
+
+       return;
+}
+
+
+
+void display_addressbook(long msgnum, char alpha) {
+       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;
+
+       struct {
+               char date[SIZ];
+               char from[SIZ];
+               char to[SIZ];
+               char subj[SIZ];
+               int hasattachments;
+       } summ;
+
+       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) {
+
+                       /* Display the summary line */
+                       display_vcard(vcard_source, alpha, 0);
+
+                       /* If it's my vCard I can edit it */
+                       if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
+                          || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))) {
+                               wprintf("<A HREF=\"/edit_vcard?"
+                                       "msgnum=%ld&partnum=%s\">",
+                                       msgnum, vcard_partnum);
+                               wprintf("(edit)</A>");
+                       }
+
+                       free(vcard_source);
+               }
+       }
+
 }
 
 
@@ -304,7 +732,7 @@ void read_message(long msgnum, int is_summary) {
 int load_msg_ptrs(servcmd)
 char *servcmd;
 {
-       char buf[256];
+       char buf[SIZ];
        int nummsgs;
 
        nummsgs = 0;
@@ -327,17 +755,24 @@ char *servcmd;
  */
 void readloop(char *oper)
 {
-       char cmd[256];
-       int a, b;
+       char cmd[SIZ];
+       char buf[SIZ];
+       int a, b, i;
        int nummsgs;
        long startmsg;
        int maxmsgs;
        int num_displayed = 0;
        int is_summary = 0;
+       int is_addressbook = 0;
        int remaining_messages;
        int lo, hi;
-       int lowest_displayed = 0;
+       int lowest_displayed = (-1);
        int highest_displayed = 0;
+       long pn_previous = 0L;
+       long pn_current = 0L;
+       long pn_next = 0L;
+       int bg = 0;
+       char alpha = 0;
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
@@ -354,6 +789,38 @@ void readloop(char *oper)
                strcpy(cmd, "MSGS ALL");
        }
 
+       /* FIXME put in the correct constant #defs */
+       if ((WC->wc_view == 1) && (maxmsgs > 1)) {
+               is_summary = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+       }
+       if ((WC->wc_view == 2) && (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 (!isalpha(alpha)) wprintf("<FONT SIZE=+2>(other)</FONT>\n");
+               else wprintf("<A HREF=\"/readfwd?alpha=1\">(other)</A>\n");
+               wprintf("<HR width=100%%>\n");
+       }
+
        nummsgs = load_msg_ptrs(cmd);
        if (nummsgs == 0) {
                if (!strcmp(oper, "readnew")) {
@@ -375,37 +842,141 @@ void readloop(char *oper)
                }
        }
 
-       for (a = 0; ( (a < nummsgs) && (num_displayed < maxmsgs) ) ; ++a) {
-               if (WC->msgarr[a] >= startmsg) {
+       if (is_summary) {
+               wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n"
+                       "<TABLE border=0 cellspacing=0 "
+                       "cellpadding=0 width=100%%>\n"
+                       "<TR>"
+                       "<TD><I>Subject</I></TD>"
+                       "<TD><I>Sender</I></TD>"
+                       "<TD><I>Date</I></TD>"
+                       "<TD></TD>"
+                       "</TR>\n"
+               );
+       }
+
+       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)) {
+
+                       /* 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) ) {
+                               bg = 1 - bg;
+                               wprintf("<TR BGCOLOR=%s>",
+                                       (bg ? "DDDDDD" : "FFFFFF")
+                               );
+                       }
 
-                       read_message(WC->msgarr[a], is_summary);
-                       if (lowest_displayed == 0) lowest_displayed = a;
+                       /* Display the message */
+                       if (is_summary) {
+                               summarize_message(WC->msgarr[a]);
+                       }
+                       else if (is_addressbook) {
+                               display_addressbook(WC->msgarr[a], alpha);
+                       }
+                       else {
+                               read_message(WC->msgarr[a]);
+                       }
+
+                       /* If a tabular view, finish the line */
+                       if ( (is_summary) || (is_addressbook) ) {
+                               wprintf("</TR>\n");
+                       }
+
+                       if (lowest_displayed < 0) lowest_displayed = a;
                        highest_displayed = a;
-                       if (is_summary) wprintf("<BR>");
 
                        ++num_displayed;
                        --remaining_messages;
                }
        }
 
+       if (is_summary) {
+               wprintf("</TABLE>\n");
+       }
+
+       if (is_addressbook) {
+               wprintf("</TABLE>\n");
+       }
+
        /* Bump these because although we're thinking in zero base, the user
         * is a drooling idiot and is thinking in one base.
         */
        ++lowest_displayed;
        ++highest_displayed;
 
+       /* If we're only looking at one message, do a prev/next thing */
+       if (num_displayed == 1) {
+
+               wprintf("<CENTER>"
+                       "<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);
+
+               if (is_summary) {
+                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Delete selected\">\n");
+               }
+
+               if (pn_previous > 0L) {
+                       wprintf("<A HREF=\"/%s"
+                               "?startmsg=%ld"
+                               "&maxmsgs=1"
+                               "&summary=0\">"
+                               "Previous</A> \n",
+                                       oper,
+                                       pn_previous );
+               }
+
+               if (pn_next > 0L) {
+                       wprintf("<A HREF=\"/%s"
+                               "?startmsg=%ld"
+                               "&maxmsgs=1"
+                               "&summary=0\">"
+                               "Next</A> \n",
+                                       oper,
+                                       pn_next );
+               }
+
+               wprintf("<A HREF=\"/%s?startmsg=%ld"
+                       "&maxmsgs=999999&summary=1\">"
+                       "Summary"
+                       "</A>",
+                       oper,
+                       WC->msgarr[0]);
+
+               wprintf("</TD></TR></TABLE></CENTER>\n");
+       }
+
+
        /*
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (num_displayed < nummsgs) {
-
+       if (num_displayed > 1) {
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
-                       "You are reading #%d-%d of %d messages.</TD>\n"
+                       "Reading #%d-%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
                        lowest_displayed, highest_displayed, nummsgs);
 
+               if (is_summary) {
+                       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Delete selected\">\n");
+               }
+
+
                for (b=0; b<nummsgs; b = b + maxmsgs) {
                lo = b+1;
                hi = b+maxmsgs+1;
@@ -430,11 +1001,20 @@ void readloop(char *oper)
                wprintf("<A HREF=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=%d\">"
                        "ALL"
-                       "</A>&nbsp;&nbsp;&nbsp;",
+                       "</A> ",
                        oper,
                        WC->msgarr[0], is_summary);
-               wprintf("</TD></TR></TABLE></CENTER><HR>\n");
+
+               wprintf("<A HREF=\"/%s?startmsg=%ld"
+                       "&maxmsgs=999999&summary=1\">"
+                       "Summary"
+                       "</A>",
+                       oper,
+                       WC->msgarr[0]);
+
+               wprintf("</TD></TR></TABLE></CENTER>\n");
        }
+       if (is_summary) wprintf("</FORM>\n");
 
 DONE:  wDumpContent(1);
 }
@@ -455,7 +1035,7 @@ DONE:      wDumpContent(1);
  */
 void post_message(void)
 {
-       char buf[256];
+       char buf[SIZ];
        static long dont_post = (-1L);
 
        output_headers(1);
@@ -468,11 +1048,15 @@ void post_message(void)
                wprintf("Automatically cancelled because you have already "
                        "saved this message.<BR>\n");
        } else {
-               sprintf(buf, "ENT0 1|%s|0|0", bstr("recp"));
+               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("Content-type: text/html");
+                       serv_puts("");
+                       text_to_server(bstr("msgtext"), 1);
                        serv_puts("000");
                        wprintf("Message has been posted.<BR>\n");
                        dont_post = atol(bstr("postseq"));
@@ -487,44 +1071,18 @@ void post_message(void)
 
 
 
-
-
-
-
-/*
- * prompt for a recipient (to be called from display_enter() only)
- */
-void prompt_for_recipient()
-{
-
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Send private e-mail</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/display_enter\">\n");
-       wprintf("Enter recipient: ");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"recp\" MAXLENGTH=\"64\"><BR>\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Enter message\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-       wprintf("</FORM></CENTER>\n");
-}
-
-
-
 /*
  * display the message entry screen
  */
 void display_enter(void)
 {
-       char buf[256];
+       char buf[SIZ];
        long now;
        struct tm *tm;
 
        output_headers(1);
 
-       wprintf("<FACE=\"Arial,Helvetica,sans-serif\">");
+       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
 
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
@@ -534,7 +1092,7 @@ void display_enter(void)
                if (strlen(bstr("recp")) > 0) {
                        wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                }
-               prompt_for_recipient();
+               do_template("prompt_for_recipient");
                goto DONE;
        }
        if (buf[0] != '2') {
@@ -547,19 +1105,26 @@ void display_enter(void)
        strcpy(buf, (char *) asctime(tm));
        buf[strlen(buf) - 1] = 0;
        strcpy(&buf[16], &buf[19]);
-       wprintf("</CENTER><FONT COLOR=\"440000\"><B> %s ", &buf[4]);
+       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\">\n");
+       wprintf("<FORM 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("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+       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 "
@@ -580,7 +1145,7 @@ DONE:      wDumpContent(1);
 void delete_msg(void)
 {
        long msgid;
-       char buf[256];
+       char buf[SIZ];
 
        msgid = atol(bstr("msgid"));
 
@@ -603,8 +1168,8 @@ void delete_msg(void)
 void confirm_move_msg(void)
 {
        long msgid;
-       char buf[256];
-       char targ[256];
+       char buf[SIZ];
+       char targ[SIZ];
 
        msgid = atol(bstr("msgid"));
 
@@ -651,7 +1216,7 @@ void confirm_move_msg(void)
 void move_msg(void)
 {
        long msgid;
-       char buf[256];
+       char buf[SIZ];
 
        msgid = atol(bstr("msgid"));
 
@@ -663,7 +1228,7 @@ void move_msg(void)
                serv_gets(buf);
                wprintf("<EM>%s</EM><BR>\n", &buf[4]);
        } else {
-               wprintf("<EM>Message not deleted.</EM><BR>\n");
+               wprintf("<EM>Message not moved.</EM><BR>\n");
        }
 
        wDumpContent(1);
@@ -671,3 +1236,47 @@ void move_msg(void)
 
 
 
+void do_stuff_to_msgs(void) {
+       char buf[SIZ];
+       char sc[SIZ];
+
+       struct stuff_t {
+               struct stuff_t *next;
+               long msgnum;
+       };
+
+       struct stuff_t *stuff = NULL;
+       struct stuff_t *ptr;
+
+
+       serv_puts("MSGS ALL");
+       serv_gets(buf);
+
+       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+               ptr = malloc(sizeof(struct stuff_t));
+               ptr->msgnum = atol(buf);
+               ptr->next = stuff;
+               stuff = ptr;
+       }
+
+       strcpy(sc, bstr("sc"));
+
+       while (stuff != NULL) {
+
+               sprintf(buf, "msg_%ld", stuff->msgnum);
+               if (!strcasecmp(bstr(buf), "yes")) {
+
+                       if (!strcasecmp(sc, "Delete selected")) {
+                               serv_printf("DELE %ld", stuff->msgnum);
+                               serv_gets(buf);
+                       }
+
+               }
+
+               ptr = stuff->next;
+               free(stuff);
+               stuff = ptr;
+       }
+
+       readloop("readfwd");
+}