* When converting "anything that looks like a URL" to a real link, first
[citadel.git] / webcit / messages.c
index 2c398b8e0cb71c9d88fc2da6ce2184ac0107402c..67ee5a07f8ffefcb8cae22d794ae3602460d642b 100644 (file)
@@ -1,15 +1,32 @@
+/*
+ * $Id$
+ *
+ * Functions which deal with the fetching and displaying of messages.
+ *
+ */
+
+#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include <limits.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include <string.h>
+#include <pwd.h>
 #include <errno.h>
-#include <time.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
-#include "child.h"
+#include "vcard.h"
+#include "webserver.h"
 
-char reply_to[512];
-long msgarr[1024];
 
 /*
  * Look for URL's embedded in a buffer and make them linkable.  We use a
@@ -22,8 +39,8 @@ char buf[];
        int pos;
        int start, end;
        char ench;
-       char urlbuf[256];
-       char outbuf[256];
+       char urlbuf[SIZ];
+       char outbuf[1024];
 
        start = (-1);
        end = strlen(buf);
@@ -56,41 +73,179 @@ 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);
        strcat(outbuf, &buf[end]);
-       strcpy(buf, outbuf);
+       if ( strlen(outbuf) < 250 )
+               strcpy(buf, outbuf);
 }
 
 
-void read_message(msgnum, oper)
-long msgnum;
-char *oper;
-{
-       char buf[256];
-       char m_subject[256];
-       char from[256];
-       long now;
-       struct tm *tm;
+/* 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 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>");
+                               }
+                       }
+                       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);
+}
+
+
+
+
+/*
+ * 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[SIZ];
+       char m_subject[SIZ];
+       char from[SIZ];
+       char node[SIZ];
+       char rfca[SIZ];
+       char reply_to[512];
+       char now[SIZ];
        int format_type = 0;
        int nhdr = 0;
        int bq = 0;
-
-       sprintf(buf, "MSG0 %ld", msgnum);
-       serv_puts(buf);
+       char vcard_partnum[SIZ];
+       char cal_partnum[SIZ];
+       char *part_source = NULL;
+
+       strcpy(from, "");
+       strcpy(node, "");
+       strcpy(rfca, "");
+       strcpy(reply_to, "");
+       strcpy(vcard_partnum, "");
+       strcpy(cal_partnum, "");
+       strcpy(mime_http, "");
+
+       serv_printf("MSG4 %ld", msgnum);
        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=0 BGCOLOR=000077><TR><TD>\n");
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+1 COLOR=\"FFFF00\"> ");
+
+       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
+               "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
+
+       wprintf("<SPAN CLASS=\"message_header\">");
        strcpy(m_subject, "");
 
-       strcpy(reply_to, "nobody...xxxxx");
-       while (serv_gets(buf), strncasecmp(buf, "text", 4)) {
+       while (serv_gets(buf), strcasecmp(buf, "text")) {
+               if (!strcmp(buf, "000")) {
+                       wprintf("<I>unexpected end of message</I><BR><BR>\n");
+                       wprintf("</SPAN>\n");
+                       return;
+               }
                if (!strncasecmp(buf, "nhdr=yes", 8))
                        nhdr = 1;
                if (nhdr == 1)
@@ -98,82 +253,197 @@ char *oper;
                if (!strncasecmp(buf, "type=", 5))
                        format_type = atoi(&buf[5]);
                if (!strncasecmp(buf, "from=", 5)) {
-                       wprintf("from %s ", &buf[5]);
                        strcpy(from, &buf[5]);
+                       wprintf("from <A HREF=\"/showuser&who=");
+                       urlescputs(from);
+                       wprintf("\">");
+                       escputs(from);
+                       wprintf("</A> ");
                }
-               if (!strncasecmp(buf, "path=", 5))
-                       strcpy(reply_to, &buf[5]);
                if (!strncasecmp(buf, "subj=", 5))
                        strcpy(m_subject, &buf[5]);
                if ((!strncasecmp(buf, "hnod=", 5))
                    && (strcasecmp(&buf[5], serv_info.serv_humannode)))
                        wprintf("(%s) ", &buf[5]);
                if ((!strncasecmp(buf, "room=", 5))
-                   && (strcasecmp(&buf[5], wc_roomname)))
+                   && (strcasecmp(&buf[5], WC->wc_roomname))
+                   && (strlen(&buf[5])>0) )
                        wprintf("in %s> ", &buf[5]);
+               if (!strncasecmp(buf, "rfca=", 5)) {
+                       strcpy(rfca, &buf[5]);
+                       wprintf("&lt;");
+                       escputs(rfca);
+                       wprintf("&gt; ");
+               }
 
                if (!strncasecmp(buf, "node=", 5)) {
-                       if ((room_flags & QR_NETWORK)
+                       strcpy(node, &buf[5]);
+                       if ( ((WC->room_flags & QR_NETWORK)
                        || ((strcasecmp(&buf[5], serv_info.serv_nodename)
-                       && (strcasecmp(&buf[5], serv_info.serv_fqdn))))) {
+                       && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
+                       && (strlen(rfca)==0)
+                       ) {
                                wprintf("@%s ", &buf[5]);
                        }
-                       if ((!strcasecmp(&buf[5], serv_info.serv_nodename))
-                       || (!strcasecmp(&buf[5], serv_info.serv_fqdn))) {
-                               strcpy(reply_to, from);
-                       } else if (haschar(&buf[5], '.') == 0) {
-                               sprintf(reply_to, "%s @ %s", from, &buf[5]);
-                       }
                }
                if (!strncasecmp(buf, "rcpt=", 5))
                        wprintf("to %s ", &buf[5]);
                if (!strncasecmp(buf, "time=", 5)) {
-                       now = atol(&buf[5]);
-                       tm = (struct tm *) localtime(&now);
-                       strcpy(buf, (char *) asctime(tm));
-                       buf[strlen(buf) - 1] = 0;
-                       strcpy(&buf[16], &buf[19]);
-                       wprintf("%s ", &buf[4]);
+                       fmt_date(now, atol(&buf[5]));
+                       wprintf("%s ", now);
+               }
+
+               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_disposition, "attachment")) {
+                               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",
+                                       msgnum, mime_partnum,
+                                       msgnum, mime_partnum,
+                                       mime_partnum, mime_filename,
+                                       mime_content_type, mime_length);
+                       }
+
+                       if ((!strcasecmp(mime_disposition, "inline"))
+                          && (!strncasecmp(mime_content_type, "image/", 6)) ){
+                               snprintf(&mime_http[strlen(mime_http)],
+                                       (sizeof(mime_http) - strlen(mime_http) - 1),
+                                       "<IMG SRC=\"/output_mimepart?"
+                                       "msgnum=%ld&partnum=%s\">",
+                                       msgnum, mime_partnum);
+                       }
+
+                       /*** begin handler prep ***/
+                       if (!strcasecmp(mime_content_type, "text/x-vcard")) {
+                               strcpy(vcard_partnum, mime_partnum);
+                       }
+
+                       if (!strcasecmp(mime_content_type, "text/calendar")) {
+                               strcpy(cal_partnum, mime_partnum);
+                       }
+
+                       /*** end handler prep ***/
+
+               }
+
+       }
+
+       /* Generate a reply-to address */
+       if (strlen(rfca) > 0) {
+               strcpy(reply_to, rfca);
+       }
+       else {
+               if ( (strlen(node) > 0)
+                  && (strcasecmp(node, serv_info.serv_nodename))
+                  && (strcasecmp(node, serv_info.serv_humannode)) ) {
+                       snprintf(reply_to, sizeof(reply_to), "%s @ %s",
+                               from, node);
+               }
+               else {
+                       snprintf(reply_to, sizeof(reply_to), "%s", from);
                }
        }
 
-       if (nhdr == 1)
+       if (nhdr == 1) {
                wprintf("****");
-       wprintf("</FONT></TD>");
+       }
 
-       if (is_room_aide) {
-               wprintf("<TD ALIGN=RIGHT NOWRAP><FONT FACE=\"Arial,Helvetica,sans-serif\" COLOR=\"FFFF00\"><B>");
+       wprintf("</SPAN></TD>");
+
+       wprintf("<TD ALIGN=RIGHT>\n"
+               "<TABLE BORDER=0><TR>\n");
+
+       /***  "Read" button is now superfluous
+        ***
+        ***wprintf("<TD BGCOLOR=\"#AAAADD\">"
+        ***    "<A HREF=\"/readfwd?startmsg=%ld", msgnum);
+        ***wprintf("&maxmsgs=1&summary=0\">Read</A>"
+        ***    "</TD>\n", msgnum);
+        ***/
+
+       wprintf("<TD BGCOLOR=\"#AAAADD\">"
+               "<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("<TD BGCOLOR=\"#AAAADD\">"
+                       "<A HREF=\"/delete_msg"
+                       "&msgid=%ld\""
+                       "onClick=\"return confirm('Delete this message?');\""
+                       "><FONT SIZE=-1>Del</FONT></A>"
+                       "</TD>\n", msgnum);
+       }
 
-               wprintf("<A HREF=\"/confirm_move_msg");
-               wprintf("&msgid=%ld", msgnum);
-               wprintf("\">Move</A>");
+       wprintf("</TR></TABLE>\n"
+               "</TD>\n");
 
-               wprintf("&nbsp;&nbsp;");
+       if (strlen(m_subject) > 0) {
+               wprintf("<TR><TD>"
+                       "<SPAN CLASS=\"message_subject\">"
+                       "Subject: %s"
+                       "</SPAN>"
+                       "</TD><TD>&nbsp;</TD></TR>\n", m_subject);
+       }
 
-               wprintf("<A HREF=\"/confirm_delete_msg");
-               wprintf("&msgid=%ld", msgnum);
-               wprintf("\">Del</A>");
+       wprintf("</TR></TABLE>\n");
 
-               wprintf("</B></FONT></TD>");
+       /* Begin body */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
+               "CELLPADDING=0 CELLSPACING=0><TR><TD>");
+
+       /* 
+        * Learn the content type
+        */
+       strcpy(mime_content_type, "text/plain");
+       while (serv_gets(buf), (strlen(buf) > 0)) {
+               if (!strcmp(buf, "000")) {
+                       wprintf("<I>unexpected end of message</I><BR><BR>\n");
+                       goto ENDBODY;
+               }
+               if (!strncasecmp(buf, "Content-type: ", 14)) {
+                       safestrncpy(mime_content_type, &buf[14],
+                               sizeof(mime_content_type));
+               }
        }
-       wprintf("</TR></TABLE>\n");
 
-       if (strlen(m_subject) > 0) {
-               wprintf("Subject: %s<BR>\n", m_subject);
+       /* Messages in legacy Citadel variformat get handled thusly... */
+       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
+               fmout(NULL, "JUSTIFY");
        }
-       if (format_type == 0) {
-               fmout(NULL);
-       } else {
+
+       /* Boring old 80-column fixed format text gets handled this way... */
+       else if (!strcasecmp(mime_content_type, "text/plain")) {
                while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
+                       if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
                        while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
-                           ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" COLOR=\"000044\"><I>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
+                               wprintf("<SPAN CLASS=\"pull_quote\">");
                                bq = 1;
                        } else if ((bq == 1) &&
-                                  (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</FONT></I>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
+                               wprintf("</SPAN>");
                                bq = 0;
                        }
                        wprintf("<TT>");
@@ -181,8 +451,195 @@ char *oper;
                        escputs(buf);
                        wprintf("</TT><BR>\n");
                }
+               wprintf("</I><BR>");
+       }
+
+       else /* HTML is fun, but we've got to strip it first */
+       if (!strcasecmp(mime_content_type, "text/html")) {
+               output_html();
+       }
+
+       /* Unknown weirdness */
+       else {
+               wprintf("I don't know how to display %s<BR>\n",
+                       mime_content_type);
+               while (serv_gets(buf), strcmp(buf, "000")) { }
+       }
+
+
+       /* Afterwards, offer links to download attachments 'n' such */
+       if (strlen(mime_http) > 0) {
+               wprintf("%s", mime_http);
+       }
+
+       /* Handler for vCard parts */
+       if (strlen(vcard_partnum) > 0) {
+               part_source = load_mimepart(msgnum, vcard_partnum);
+               if (part_source != NULL) {
+
+                       /* If it's my vCard I can edit it */
+                       if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
+                          || (!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(part_source, 0, 1);
+               }
+       }
+
+       /* Handler for calendar parts */
+       if (strlen(cal_partnum) > 0) {
+               part_source = load_mimepart(msgnum, cal_partnum);
+               if (part_source != NULL) {
+                       cal_process_attachment(part_source,
+                                               msgnum, cal_partnum);
+               }
        }
-       wprintf("</I><BR>");
+
+       if (part_source) {
+               free(part_source);
+               part_source = NULL;
+       }
+
+ENDBODY:
+       wprintf("</TD></TR></TABLE>\n");
+}
+
+
+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);
+               }
+       }
+
 }
 
 
@@ -190,10 +647,9 @@ char *oper;
 /* 
  * load message pointers from the server
  */
-int load_msg_ptrs(servcmd)
-char *servcmd;
+int load_msg_ptrs(char *servcmd)
 {
-       char buf[256];
+       char buf[SIZ];
        int nummsgs;
 
        nummsgs = 0;
@@ -204,7 +660,8 @@ char *servcmd;
                return (nummsgs);
        }
        while (serv_gets(buf), strcmp(buf, "000")) {
-               msgarr[nummsgs] = atol(buf);
+               WC->msgarr[nummsgs] = atol(buf);
+               /* FIXME check for overflow */
                ++nummsgs;
        }
        return (nummsgs);
@@ -216,45 +673,374 @@ char *servcmd;
  */
 void readloop(char *oper)
 {
-       char cmd[256];
-       int a;
+       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 is_calendar = 0;
+       int is_tasks = 0;
+       int remaining_messages;
+       int lo, hi;
+       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"));
+       is_summary = atoi(bstr("summary"));
+       if (maxmsgs == 0) maxmsgs = 20;
 
-       printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\"><CENTER><B>%s - ", wc_roomname);
        if (!strcmp(oper, "readnew")) {
                strcpy(cmd, "MSGS NEW");
-               wprintf("new messages");
        } else if (!strcmp(oper, "readold")) {
                strcpy(cmd, "MSGS OLD");
-               wprintf("old messages");
        } else {
                strcpy(cmd, "MSGS ALL");
-               wprintf("all messages");
        }
-       wprintf("</B></CENTER><BR>\n");
+
+       /* 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");
+       }
+       if (WC->wc_view == 3) {         /* calendar */
+               is_calendar = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+       }
+       if (WC->wc_view == 4) {         /* tasks */
+               is_tasks = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+               wprintf("<UL>");
+       }
 
        nummsgs = load_msg_ptrs(cmd);
        if (nummsgs == 0) {
-               if (!strcmp(oper, "readnew")) {
-                       wprintf("<EM>No new messages in this room.</EM>\n");
-               } else if (!strcmp(oper, "readold")) {
-                       wprintf("<EM>No old messages in this room.</EM>\n");
-               } else {
-                       wprintf("<EM>This room is empty.</EM>\n");
+
+               if ((!is_tasks) && (!is_calendar)) {
+                       if (!strcmp(oper, "readnew")) {
+                               wprintf("<EM>No new messages in this room.</EM>\n");
+                       } else if (!strcmp(oper, "readold")) {
+                               wprintf("<EM>No old messages in this room.</EM>\n");
+                       } else {
+                               wprintf("<EM>This room is empty.</EM>\n");
+                       }
                }
+
                goto DONE;
        }
+
+       if (startmsg == 0L) startmsg = WC->msgarr[0];
+       remaining_messages = 0;
+
+       for (a = 0; a < nummsgs; ++a) {
+               if (WC->msgarr[a] >= startmsg) {
+                       ++remaining_messages;
+               }
+       }
+
+       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) {
-               read_message(msgarr[a], oper);
+               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")
+                               );
+                       }
+
+                       /* Display the message */
+                       if (is_summary) {
+                               summarize_message(WC->msgarr[a]);
+                       }
+                       else if (is_addressbook) {
+                               display_addressbook(WC->msgarr[a], alpha);
+                       }
+                       else if (is_calendar) {
+                               display_calendar(WC->msgarr[a]);
+                       }
+                       else if (is_tasks) {
+                               display_task(WC->msgarr[a]);
+                       }
+                       else {
+                               read_message(WC->msgarr[a]);
+                       }
+
+                       /* 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;
+
+                       ++num_displayed;
+                       --remaining_messages;
+               }
+       }
+
+       if (is_summary) {
+               wprintf("</TABLE>\n");
+       }
+
+       if (is_addressbook) {
+               wprintf("</TABLE>\n");
+       }
+
+       if (is_tasks) {
+               wprintf("</UL>\n");
+       }
+
+       /* Bump these because although we're thinking in zero base, the user
+        * is a drooling idiot and is thinking in one base.
+        */
+       ++lowest_displayed;
+       ++highest_displayed;
+
+       /* If we're only looking at one message, do a prev/next thing */
+       if (num_displayed == 1) {
+          if ((!is_tasks) && (!is_calendar)) {
+
+               wprintf("<CENTER>"
+                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
+                       "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 > 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_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;
+               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("<A HREF=\"/%s?startmsg=%ld"
+                       "&maxmsgs=999999&summary=%d\">"
+                       "ALL"
+                       "</A> ",
+                       oper,
+                       WC->msgarr[0], is_summary);
+
+               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:
+       if (is_tasks) {
+               wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
+                       "Add new task</A>\n"
+               );
        }
 
-      DONE:wDumpContent(1);
+       if (is_calendar) {
+               do_calendar_view();     /* Render the calendar */
+       }
+
+       wDumpContent(1);
 }
 
 
+/*
+ * Back end for post_message() ... this is where the actual message
+ * gets transmitted to the server.
+ */
+void post_mime_to_server(void) {
+       char boundary[SIZ];
+       int is_multipart = 0;
+       static int seq = 0;
+       struct wc_attachment *att;
+       char *encoded;
+       size_t encoded_length;
+       
+       /* If there are attachments, we have to do multipart/mixed */
+       if (WC->first_attachment != NULL) {
+               is_multipart = 1;
+       }
+
+       if (is_multipart) {
+               sprintf(boundary, "---Citadel-Multipart-%s-%04x%04x---",
+                       serv_info.serv_fqdn,
+                       getpid(),
+                       ++seq
+               );
+
+               /* Remember, serv_printf() appends an extra newline */
+               serv_printf("Content-type: multipart/mixed; "
+                       "boundary=\"%s\"\n", boundary);
+               serv_printf("This is a multipart message in MIME format.\n");
+               serv_printf("--%s", boundary);
+       }
+
+       serv_puts("Content-type: text/html");
+       serv_puts("");
+       text_to_server(bstr("msgtext"), 1);
+
+       if (is_multipart) {
+
+               /* Add in the attachments */
+               for (att = WC->first_attachment; att!=NULL; att=att->next) {
+
+                       encoded_length = ((att->length * 150) / 100);
+                       encoded = malloc(encoded_length);
+                       if (encoded == NULL) break;
+                       CtdlEncodeBase64(encoded, att->data, att->length);
+
+                       serv_printf("--%s", boundary);
+                       serv_printf("Content-type: %s", att->content_type);
+                       serv_printf("Content-disposition: attachment; "
+                               "filename=\"%s\"", att->filename);
+                       serv_puts("Content-transfer-encoding: base64");
+                       serv_puts("");
+                       serv_write(encoded, strlen(encoded));
+                       serv_puts("");
+                       serv_puts("");
+                       free(encoded);
+               }
+               serv_printf("--%s--", boundary);
+       }
+
+       serv_puts("000");
+}
 
 
 /*
@@ -270,125 +1056,159 @@ void readloop(char *oper)
  */
 void post_message(void)
 {
-       char buf[256];
+       char buf[SIZ];
        static long dont_post = (-1L);
+       struct wc_attachment *att;
+
+       if (WC->upload_length > 0) {
+
+               att = malloc(sizeof(struct wc_attachment));
+               memset(att, 0, sizeof(struct wc_attachment));
+               att->next = WC->first_attachment;
+               WC->first_attachment = att;
+               att->length = WC->upload_length;
+               strcpy(att->content_type, WC->upload_content_type);
+               strcpy(att->filename, WC->upload_filename);
+
+               /* Netscape sends a simple filename, which is what we want,
+                * but Satan's browser sends an entire pathname.  Reduce
+                * the path to just a filename if we need to.
+                */
+               while (num_tokens(att->filename, '/') > 1) {
+                       remove_token(att->filename, 0, '/');
+               }
+               while (num_tokens(att->filename, '\\') > 1) {
+                       remove_token(att->filename, 0, '\\');
+               }
 
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+               /* Transfer control of this memory from the upload struct
+                * to the attachment struct.
+                */
+               att->data = WC->upload;
+               WC->upload_length = 0;
+               WC->upload = NULL;
+               display_enter();
+               return;
+       }
 
-       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
-       strcpy(buf, bstr("sc"));
-       if (strcasecmp(buf, "Save message")) {
-               wprintf("Cancelled.  Message was not posted.<BR>\n");
+       if (strcasecmp(bstr("sc"), "Save message")) {
+               sprintf(WC->ImportantMessage, 
+                       "Cancelled.  Message was not posted.");
        } else if (atol(bstr("postseq")) == dont_post) {
-               wprintf("Automatically cancelled because you have already "
-                       "saved this message.<BR>\n");
+               sprintf(WC->ImportantMessage, 
+                       "Automatically cancelled because you have already "
+                       "saved this message.");
        } else {
-               sprintf(buf, "ENT0 1|%s|0|0", 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("000");
-                       wprintf("Message has been posted.<BR>\n");
+                       post_mime_to_server();
+                       sprintf(WC->ImportantMessage, 
+                               "Message has been posted.\n");
                        dont_post = atol(bstr("postseq"));
                } else {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+                       sprintf(WC->ImportantMessage, 
+                               "%s", &buf[4]);
                }
        }
 
-       wDumpContent(1);
+       free_attachments(WC);
+       readloop("readnew");
 }
 
 
 
 
-
-
-
-
-/*
- * 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;
-
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       struct wc_attachment *att;
 
-       wprintf("<FACE=\"Arial,Helvetica,sans-serif\">");
+       if (strlen(bstr("force_room")) > 0) {
+               gotoroom(bstr("force_room"), 0);
+       }
 
+       output_headers(1);
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
        serv_gets(buf);
 
        if (!strncmp(buf, "570", 3)) {
                if (strlen(bstr("recp")) > 0) {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+                       svprintf("RECPERROR", WCS_STRING,
+                               "<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+                               &buf[4]
+                       );
                }
-               prompt_for_recipient();
+               do_template("prompt_for_recipient");
                goto DONE;
        }
        if (buf[0] != '2') {
                wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                goto DONE;
        }
-       wprintf("<CENTER>Enter message below.  Messages are formatted to\n");
-       wprintf("the <EM>reader's</EM> screen width.  To defeat the\n");
-       wprintf("formatting, indent a line at least one space.  \n");
-       wprintf("<BR>");
 
        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\"><B> %s ", &buf[4]);
-       wprintf("from %s ", wc_username);
-       if (strlen(bstr("recp")) > 0)
-               wprintf("to %s ", bstr("recp"));
-       wprintf("in %s&gt; ", wc_roomname);
-       wprintf("</B></FONT><BR><CENTER>\n");
-
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/post\">\n");
+       fmt_date(buf, now);
+       strcat(&buf[strlen(buf)], " <I>from</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_username, 1);
+       if (strlen(bstr("recp")) > 0) {
+               strcat(&buf[strlen(buf)], " <I>to</I> ");
+               stresc(&buf[strlen(buf)], bstr("recp"), 1);
+       }
+       strcat(&buf[strlen(buf)], " <I>in</I> ");
+       stresc(&buf[strlen(buf)], WC->wc_roomname, 1);
+       svprintf("BOXTITLE", WCS_STRING, buf);
+       do_template("beginbox");
+
+       wprintf("<CENTER>\n");
+
+       wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
+               "METHOD=\"POST\" ACTION=\"/post\" "
+               "NAME=\"enterform\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
                bstr("recp"));
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
                now);
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+       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("\" MAXLENGTH=70>"
+               "&nbsp;&nbsp;&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
-       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=30 COLS=80 "
-               "WIDTH=80></TEXTAREA><P>\n");
+       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
+               "WIDTH=80>");
+       escputs(bstr("msgtext"));
+       wprintf("</TEXTAREA><BR>\n");
+
+       /* Enumerate any attachments which are already in place... */
+       for (att = WC->first_attachment; att != NULL; att = att->next) {
+               wprintf("<IMG SRC=\"/static/attachment.gif\" "
+                       "BORDER=0 ALIGN=MIDDLE> Attachment: ");
+               escputs(att->filename);
+               wprintf(" (%s, %d bytes)<BR>\n",
+                       att->content_type, att->length);
+       }
+
+       /* Now offer the ability to attach additional files... */
+       wprintf("Attach file: <input NAME=\"attachfile\" "
+               "SIZE=48 TYPE=\"file\">\n&nbsp;&nbsp;"
+               "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
 
        wprintf("</FORM></CENTER>\n");
+       do_template("endbox");
 DONE:  wDumpContent(1);
-       wprintf("</FONT>");
 }
 
 
@@ -398,58 +1218,19 @@ DONE:    wDumpContent(1);
 
 
 
-/*
- * Confirm deletion of a message
- */
-void confirm_delete_msg(void)
-{
-       long msgid;
-
-       msgid = atol(bstr("msgid"));
-
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
-
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm deletion of message</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-
-       wprintf("Are you sure you want to delete this message? <BR>\n");
-
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/delete_msg\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
-               bstr("msgid"));
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Yes\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"No\">");
-       wprintf("</FORM></CENTER>\n");
-
-       wprintf("</CENTER>\n");
-       wDumpContent(1);
-}
-
-
-
 void delete_msg(void)
 {
        long msgid;
-       char buf[256];
+       char buf[SIZ];
 
        msgid = atol(bstr("msgid"));
 
-       printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
-       if (!strcasecmp(bstr("yesno"), "Yes")) {
-               sprintf(buf, "DELE %ld", msgid);
-               serv_puts(buf);
-               serv_gets(buf);
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
-       } else {
-               wprintf("<EM>Message not deleted.</EM><BR>\n");
-       }
+       sprintf(buf, "DELE %ld", msgid);
+       serv_puts(buf);
+       serv_gets(buf);
+       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
 
        wDumpContent(1);
 }
@@ -463,16 +1244,15 @@ 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"));
 
-       printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
        wprintf("<B>Confirm move of message</B>\n");
        wprintf("</FONT></TD></TR></TABLE>\n");
 
@@ -512,11 +1292,10 @@ void confirm_move_msg(void)
 void move_msg(void)
 {
        long msgid;
-       char buf[256];
+       char buf[SIZ];
 
        msgid = atol(bstr("msgid"));
 
-       printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
        if (!strcasecmp(bstr("yesno"), "Move")) {
@@ -525,8 +1304,55 @@ 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);
 }
+
+
+
+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");
+}