* Removed all of the absolute URL's.
[citadel.git] / webcit / messages.c
index 340a4ca74f722eec47c6e8ee9c99576427a5630a..190f6061e4d4772689aa7173dfd996c6191bc2a1 100644 (file)
@@ -8,6 +8,7 @@
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 
 /* Address book entry (keep it short and sweet, it's just a quickie lookup
@@ -31,12 +32,13 @@ void utf8ify_rfc822_string(char *buf) {
        char encoding[16];
        char istr[1024];
        iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                   /* Buffer of characters to be converted */
-       char *obuf;                   /* Buffer for converted characters      */
-       size_t ibuflen;               /* Length of input buffer               */
-       size_t obuflen;               /* Length of output buffer              */
-       char *isav;                   /* Saved pointer to input buffer        */
-       char *osav;                   /* Saved pointer to output buffer       */
+       char *ibuf;                /* Buffer of characters to be converted */
+       char *obuf;                /* Buffer for converted characters      */
+       size_t ibuflen;        /* Length of input buffer               */
+       size_t obuflen;        /* Length of output buffer             */
+       char *isav;                /* Saved pointer to input buffer     */
+       char *osav;                /* Saved pointer to output buffer       */
+       int passes = 0;
 
        while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
                ((start != NULL) && (end != NULL) && (end > start)) )
@@ -86,11 +88,28 @@ void utf8ify_rfc822_string(char *buf) {
                        iconv_close(ic);
                }
                else {
+                       end = start;
+                       end++;
+                       strcpy(start, "");
+                       remove_token(end, 0, '?');
+                       remove_token(end, 0, '?');
+                       remove_token(end, 0, '?');
+                       remove_token(end, 0, '?');
+                       strcpy(end, &end[1]);
+
                        snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
                        strcpy(buf, newbuf);
                }
 
                free(isav);
+
+               /* Since spammers will go to all sorts of absurd lengths to get their
+                * messages through, there are LOTS of corrupt headers out there.
+                * So, prevent a really badly formed RFC2047 header from throwing
+                * this function into an infinite loop.
+                */
+               ++passes;
+               if (passes > 20) return;
        }
 
 }
@@ -143,7 +162,7 @@ char buf[];
        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",
+       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]);
        if ( strlen(outbuf) < 250 )
@@ -323,11 +342,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        else if (!strcasecmp(firsttoken, "email")) {
                                if (strlen(mailto) > 0) strcat(mailto, "<br />");
                                strcat(mailto,
-                                       "<A HREF=\"/display_enter"
+                                       "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
+
+                               urlesc(&mailto[strlen(mailto)], displayname);
+                               urlesc(&mailto[strlen(mailto)], " <");
                                urlesc(&mailto[strlen(mailto)], thisvalue);
+                               urlesc(&mailto[strlen(mailto)], ">");
+
                                strcat(mailto, "\">");
-                               urlesc(&mailto[strlen(mailto)], thisvalue);
+                               stresc(&mailto[strlen(mailto)], thisvalue, 1, 1);
                                strcat(mailto, "</A>");
                        }
                        else if (!strcasecmp(firsttoken, "tel")) {
@@ -395,7 +419,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                if (pass == 1) {
                        wprintf("<TR BGCOLOR=\"#AAAAAA\">"
                        "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER SRC=\"/static/viewcontacts_48x.gif\">"
+                       "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
                        "<FONT SIZE=+1><B>");
                        escputs(displayname);
                        wprintf("</B></FONT>");
@@ -411,14 +435,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        }
                        wprintf("</TD></TR>\n");
                
-                       if (strlen(phone) > 0)
-                               wprintf("<TR><TD>");
+                       if (strlen(phone) > 0) {
+                               wprintf("<tr><td>");
                                wprintf(_("Telephone:"));
-                               wprintf("</TD><TD>%s</TD></TR>\n", phone);
-                       if (strlen(mailto) > 0)
-                               wprintf("<TR><TD>");
+                               wprintf("</td><td>%s</td></tr>\n", phone);
+                       }
+                       if (strlen(mailto) > 0) {
+                               wprintf("<tr><td>");
                                wprintf(_("E-mail:"));
-                               wprintf("</TD><TD>%s</TD></TR>\n", mailto);
+                               wprintf("</td><td>%s</td></tr>\n", mailto);
+                       }
                }
 
        }
@@ -465,9 +491,9 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 
 
 /*
- * I wanna SEE that message!
+ * I wanna SEE that message!  (Optional 'section' for encapsulated message/rfc822 submessage)
  */
-void read_message(long msgnum, int suppress_buttons) {
+void read_message(long msgnum, int printable_view, char *section) {
        char buf[SIZ];
        char mime_partnum[256];
        char mime_filename[256];
@@ -476,12 +502,15 @@ void read_message(long msgnum, int suppress_buttons) {
        char mime_disposition[256];
        int mime_length;
        char mime_http[SIZ];
+       char mime_submessages[256];
        char m_subject[256];
+       char m_cc[1024];
        char from[256];
        char node[256];
        char rfca[256];
        char reply_to[512];
-       char now[256];
+       char reply_all[4096];
+       char now[64];
        int format_type = 0;
        int nhdr = 0;
        int bq = 0;
@@ -491,24 +520,26 @@ void read_message(long msgnum, int suppress_buttons) {
        char *part_source = NULL;
 #ifdef HAVE_ICONV
        iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                   /* Buffer of characters to be converted */
-       char *obuf;                   /* Buffer for converted characters      */
-       size_t ibuflen;               /* Length of input buffer               */
-       size_t obuflen;               /* Length of output buffer              */
-       char *osav;                   /* Saved pointer to output buffer       */
+       char *ibuf;                /* Buffer of characters to be converted */
+       char *obuf;                /* Buffer for converted characters      */
+       size_t ibuflen;        /* Length of input buffer               */
+       size_t obuflen;        /* Length of output buffer             */
+       char *osav;                /* Saved pointer to output buffer       */
 #endif
 
        strcpy(from, "");
        strcpy(node, "");
        strcpy(rfca, "");
        strcpy(reply_to, "");
+       strcpy(reply_all, "");
        strcpy(vcard_partnum, "");
        strcpy(cal_partnum, "");
        strcpy(mime_http, "");
        strcpy(mime_content_type, "text/plain");
        strcpy(mime_charset, "us-ascii");
+       strcpy(mime_submessages, "");
 
-       serv_printf("MSG4 %ld", msgnum);
+       serv_printf("MSG4 %ld|%s", msgnum, section);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("<STRONG>");
@@ -518,9 +549,11 @@ void read_message(long msgnum, int suppress_buttons) {
        }
 
        /* begin everythingamundo table */
-       wprintf("<div id=\"fix_scrollbar_bug\">\n");
-       wprintf("<table width=100%% border=1 cellspacing=0 "
-               "cellpadding=0><TR><TD>\n");
+       if (!printable_view) {
+               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 "
@@ -528,6 +561,7 @@ void read_message(long msgnum, int suppress_buttons) {
 
        wprintf("<SPAN CLASS=\"message_header\">");
        strcpy(m_subject, "");
+       strcpy(m_cc, "");
 
        while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
                if (!strcmp(buf, "000")) {
@@ -546,7 +580,7 @@ void read_message(long msgnum, int suppress_buttons) {
                if (!strncasecmp(buf, "from=", 5)) {
                        strcpy(from, &buf[5]);
                        wprintf(_("from "));
-                       wprintf("<A HREF=\"/showuser?who=");
+                       wprintf("<a href=\"showuser?who=");
 #ifdef HAVE_ICONV
                        utf8ify_rfc822_string(from);
 #endif
@@ -556,7 +590,15 @@ void read_message(long msgnum, int suppress_buttons) {
                        wprintf("</A> ");
                }
                if (!strncasecmp(buf, "subj=", 5)) {
-                       strcpy(m_subject, &buf[5]);
+                       safestrncpy(m_subject, &buf[5], sizeof m_subject);
+               }
+               if (!strncasecmp(buf, "cccc=", 5)) {
+                       safestrncpy(m_cc, &buf[5], sizeof m_cc);
+                       if (strlen(reply_all) > 0) {
+                               strcat(reply_all, ", ");
+                       }
+                       safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+                               (sizeof reply_all - strlen(reply_all)) );
                }
                if ((!strncasecmp(buf, "hnod=", 5))
                    && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
@@ -587,7 +629,13 @@ void read_message(long msgnum, int suppress_buttons) {
                }
                if (!strncasecmp(buf, "rcpt=", 5)) {
                        wprintf(_("to "));
-                       wprintf("%s ", &buf[5]);
+                       escputs(&buf[5]);
+                       wprintf(" ");
+                       if (strlen(reply_all) > 0) {
+                               strcat(reply_all, ", ");
+                       }
+                       safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+                               (sizeof reply_all - strlen(reply_all)) );
                }
                if (!strncasecmp(buf, "time=", 5)) {
                        fmt_date(now, atol(&buf[5]), 0);
@@ -601,28 +649,33 @@ void read_message(long msgnum, int suppress_buttons) {
                        extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
                        mime_length = extract_int(&buf[5], 5);
 
-                       if (!strcasecmp(mime_disposition, "attachment")) {
+                       if (!strcasecmp(mime_content_type, "message/rfc822")) {
+                               if (strlen(mime_submessages) > 0) {
+                                       strcat(mime_submessages, "|");
+                               }
+                               strcat(mime_submessages, mime_partnum);
+                       }
+                       else if ((!strcasecmp(mime_disposition, "inline"))
+                          && (!strncasecmp(mime_content_type, "image/", 6)) ){
                                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/diskette_24x.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);
+                                       "<img src=\"mimepart/%ld/%s/%s\">",
+                                       msgnum, mime_partnum, mime_filename);
                        }
-
-                       if ((!strcasecmp(mime_disposition, "inline"))
-                          && (!strncasecmp(mime_content_type, "image/", 6)) ){
+                       else if ( (!strcasecmp(mime_disposition, "attachment")) 
+                            || (!strcasecmp(mime_disposition, "inline")) ) {
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<IMG SRC=\"/output_mimepart?"
-                                       "msgnum=%ld?partnum=%s\">",
-                                       msgnum, mime_partnum);
+                                       "<a href=\"mimepart/%ld/%s/%s\" "
+                                       "TARGET=\"wc.%ld.%s\">"
+                                       "<img src=\"static/diskette_24x.gif\" "
+                                       "BORDER=0 ALIGN=MIDDLE>\n"
+                                       "%s (%s, %d bytes)</A><br />\n",
+                                       msgnum, mime_partnum, mime_filename,
+                                       msgnum, mime_partnum,
+                                       mime_filename,
+                                       mime_content_type, mime_length
+                               );
                        }
 
                        /*** begin handler prep ***/
@@ -662,51 +715,98 @@ void read_message(long msgnum, int suppress_buttons) {
 
        wprintf("</SPAN>");
 #ifdef HAVE_ICONV
+       utf8ify_rfc822_string(m_cc);
        utf8ify_rfc822_string(m_subject);
 #endif
+       if (strlen(m_cc) > 0) {
+               wprintf("<br />"
+                       "<SPAN CLASS=\"message_subject\">");
+               wprintf(_("CC:"));
+               wprintf(" ");
+               escputs(m_cc);
+               wprintf("</SPAN>");
+       }
        if (strlen(m_subject) > 0) {
                wprintf("<br />"
                        "<SPAN CLASS=\"message_subject\">");
                wprintf(_("Subject:"));
-               wprintf(" %s</SPAN>", m_subject
-               );
+               wprintf(" ");
+               escputs(m_subject);
+               wprintf("</SPAN>");
        }
        wprintf("</TD>\n");
 
        /* start msg buttons */
-       if (!suppress_buttons) {
+       if (!printable_view) {
                wprintf("<td align=right>\n");
 
                /* Reply */
-               wprintf("<a href=\"/display_enter?recp=");
-               urlescputs(reply_to);
-               wprintf("?subject=");
-               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
-               urlescputs(m_subject);
-               wprintf("\">[%s]</a> ", _("Reply"));
+               if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+                       wprintf("<a href=\"display_enter");
+                       if (WC->is_mailbox) {
+                               wprintf("?replyquote=%ld", msgnum);
+                       }
+                       wprintf("?recp=");
+                       urlescputs(reply_to);
+                       wprintf("?subject=");
+                       if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                       urlescputs(m_subject);
+                       wprintf("\">[%s]</a> ", _("Reply"));
+               }
+
+               /* ReplyQuoted */
+               if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+                       if (!WC->is_mailbox) {
+                               wprintf("<a href=\"display_enter");
+                               wprintf("?replyquote=%ld", msgnum);
+                               wprintf("?recp=");
+                               urlescputs(reply_to);
+                               wprintf("?subject=");
+                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                               urlescputs(m_subject);
+                               wprintf("\">[%s]</a> ", _("ReplyQuoted"));
+                       }
+               }
+
+               /* ReplyAll */
+               if (WC->wc_view == VIEW_MAILBOX) {
+                       wprintf("<a href=\"display_enter");
+                       wprintf("?replyquote=%ld", msgnum);
+                       wprintf("?recp=");
+                       urlescputs(reply_to);
+                       wprintf("?cc=");
+                       urlescputs(reply_all);
+                       if (strlen(m_subject) > 0) {
+                               wprintf("?subject=");
+                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                               urlescputs(m_subject);
+                       }
+                       wprintf("\">[%s]</a> ", _("ReplyAll"));
+               }
 
                /* Forward */
                if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"/display_enter?pullquote=%ld?subject=", msgnum);
+                       wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
                        if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
                        urlescputs(m_subject);
                        wprintf("\">[%s]</a> ", _("Forward"));
                }
 
-               if (WC->is_room_aide)  {
+               /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+               if ( (WC->is_room_aide) || (WC->is_mailbox) ) {
                        /* Move */
-                       wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
+                       wprintf("<a href=\"confirm_move_msg?msgid=%ld\">[%s]</a> ",
                                msgnum, _("Move"));
        
                        /* Delete */
-                       wprintf("<a href=\"/delete_msg?msgid=%ld\" "
+                       wprintf("<a href=\"delete_msg?msgid=%ld\" "
                                "onClick=\"return confirm('%s');\">"
                                "[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
                        );
                }
 
-               wprintf("<a href=\"/msg?msgnum=%ld?sourceiframe=msgloader1?print_it=yes\" target=\"msgloader1\">"
-                       "[%s]</a>", msgnum, _("Print"));
+               wprintf("<a href=\"#\" onClick=\"window.open('/printmsg/%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
+                       "[%s]</a>", msgnum, msgnum, _("Print"));
 
                wprintf("</td>");
        }
@@ -747,11 +847,15 @@ void read_message(long msgnum, int suppress_buttons) {
 
        /* Set up a character set conversion if we need to (and if we can) */
 #ifdef HAVE_ICONV
+       if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
        if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8")) ) {
+          && (strcasecmp(mime_charset, "UTF-8"))
+          && (strcasecmp(mime_charset, ""))
+       ) {
                ic = iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+                       lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+                               __FILE__, __LINE__, mime_charset, strerror(errno));
                }
        }
 #endif
@@ -763,7 +867,7 @@ void read_message(long msgnum, int suppress_buttons) {
 
        /* Boring old 80-column fixed format text gets handled this way... */
        else if ( (!strcasecmp(mime_content_type, "text/plain"))
-               || (!strcasecmp(mime_content_type, "text")) ) {
+               || (!strcasecmp(mime_content_type, "text")) ) {
                while (serv_getln(buf, sizeof 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;
@@ -813,8 +917,20 @@ void read_message(long msgnum, int suppress_buttons) {
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
        }
 
+       /* If there are attached submessages, display them now... */
+       if ( (strlen(mime_submessages) > 0) && (!section[0]) ) {
+               for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
+                       extract_token(buf, mime_submessages, i, '|', sizeof buf);
+                       /* use printable_view to suppress buttons */
+                       wprintf("<blockquote>");
+                       read_message(msgnum, 1, buf);
+                       wprintf("</blockquote>");
+               }
+       }
+
+
        /* Afterwards, offer links to download attachments 'n' such */
-       if (strlen(mime_http) > 0) {
+       if ( (strlen(mime_http) > 0) && (!section[0]) ) {
                wprintf("%s", mime_http);
        }
 
@@ -828,7 +944,7 @@ void read_message(long msgnum, int suppress_buttons) {
                                || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
                                || (WC->wc_view == VIEW_ADDRESSBOOK)
                        ) {
-                               wprintf("<A HREF=\"/edit_vcard?"
+                               wprintf("<a href=\"edit_vcard?"
                                        "msgnum=%ld?partnum=%s\">",
                                        msgnum, vcard_partnum);
                                wprintf("[%s]</A>", _("edit"));
@@ -857,8 +973,10 @@ ENDBODY:
        wprintf("</TD></TR></TABLE>\n");
 
        /* end everythingamundo table */
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><br />\n");
+       if (!printable_view) {
+               wprintf("</TD></TR></TABLE>\n");
+               wprintf("</div><br />\n");
+       }
 
 #ifdef HAVE_ICONV
        if (ic != (iconv_t)(-1) ) {
@@ -873,65 +991,44 @@ ENDBODY:
  * Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
  */
-void embed_message(void) {
+void embed_message(char *msgnum_as_string) {
        long msgnum = 0L;
-       char *sourceiframe;
-       char *targetdiv;
-       char *print_it;
 
-       msgnum = atol(bstr("msgnum"));
-       sourceiframe = bstr("sourceiframe");
-       targetdiv = bstr("targetdiv");
-       print_it = bstr("print_it");
+       msgnum = atol(msgnum_as_string);
+       begin_ajax_response();
+       read_message(msgnum, 0, "");
+       end_ajax_response();
+}
 
-       output_headers(1, 0, 0, 0, 0, 1, 0);
-       begin_burst();
 
-       wprintf("<html><head>");
+/*
+ * Printable view of a message
+ */
+void print_message(char *msgnum_as_string) {
+       long msgnum = 0L;
+
+       msgnum = atol(msgnum_as_string);
+       output_headers(0, 0, 0, 0, 0, 0);
 
-       /* If we're loading into a hidden iframe, chances are the caller told us
-        * about a target div somewhere that we need to copy into when we're done.
-        */
-       if (strlen(targetdiv) > 0) wprintf(
-"                                                                      \n"
-" <script type=\"text/javascript\">                                    \n"
-"      function loaded_now_copy_it() {                                 \n"
-"              parent.document.getElementById(\"%s\").innerHTML = parent.frames['%s'].document.body.innerHTML; \n"
-"      }                                                               \n"
-"</script>\n",
-               targetdiv,
-               sourceiframe
-       );
+       wprintf("Content-type: text/html\r\n"
+               "Server: %s\r\n"
+               "Connection: close\r\n",
+               SERVER);
+       begin_burst();
 
-       if (!strcasecmp(print_it, "yes")) wprintf(
-"                                                                      \n"
-" <script type=\"text/javascript\">                                    \n"
-"      function loaded_now_print_it() {                                \n"
-"              parent.frames['%s'].focus();                            \n"
-"              parent.frames['%s'].print();                            \n"
-"      }                                                               \n"
-"</script>\n",
-               sourceiframe,
-               sourceiframe
+       wprintf("\r\n\r\n<html>\n"
+               "<head><title>Printable view</title></head>\n"
+               "<body onLoad=\" window.print(); window.close(); \">\n"
        );
+       
+       read_message(msgnum, 1, "");
 
-       wprintf("</head>");
-       wprintf("<body");
-       if (strlen(targetdiv) > 0) {
-               wprintf(" onLoad='loaded_now_copy_it();'");
-       }
-       if (!strcasecmp(print_it, "yes")) {
-               wprintf(" onLoad='loaded_now_print_it();'");
-       }
-       wprintf(">\n");
-       read_message(msgnum, (!strcasecmp(print_it, "yes") ? 1 : 0) );
-       wprintf("</body></html>\n");
+       wprintf("\n</body></html>\n\n");
        wDumpContent(0);
 }
 
 
 
-
 /*
  * Read message in simple, JavaScript-embeddable form for 'forward'
  * or 'reply quoted' operations.
@@ -964,11 +1061,11 @@ void pullquote_message(long msgnum, int forward_attachments) {
        int i = 0;
 #ifdef HAVE_ICONV
        iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                   /* Buffer of characters to be converted */
-       char *obuf;                   /* Buffer for converted characters      */
-       size_t ibuflen;               /* Length of input buffer               */
-       size_t obuflen;               /* Length of output buffer              */
-       char *osav;                   /* Saved pointer to output buffer       */
+       char *ibuf;                /* Buffer of characters to be converted */
+       char *obuf;                /* Buffer for converted characters      */
+       size_t ibuflen;        /* Length of input buffer               */
+       size_t obuflen;        /* Length of output buffer             */
+       char *osav;                /* Saved pointer to output buffer       */
 #endif
 
        strcpy(from, "");
@@ -1106,10 +1203,13 @@ void pullquote_message(long msgnum, int forward_attachments) {
        /* Set up a character set conversion if we need to (and if we can) */
 #ifdef HAVE_ICONV
        if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8")) ) {
+          && (strcasecmp(mime_charset, "UTF-8"))
+          && (strcasecmp(mime_charset, ""))
+       ) {
                ic = iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+                       lprintf(5, "%s:%d iconv_open() failed: %s\n",
+                               __FILE__, __LINE__, strerror(errno));
                }
        }
 #endif
@@ -1177,14 +1277,14 @@ ENDBODY:
         * If there were attachments, we have to download them and insert them
         * into the attachment chain for the forwarded message we are composing.
         */
-       if (num_attachments) {
+       if ( (forward_attachments) && (num_attachments) ) {
                for (i=0; i<num_attachments; ++i) {
                        extract_token(buf, attachments, i, '\n', sizeof buf);
-                        extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
-                        extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
-                        extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
-                        extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
-                        mime_length = extract_int(buf, 5);
+                       extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
+                       extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
+                       extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
+                       extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
+                       mime_length = extract_int(buf, 5);
 
                        /*
                         * tracing  ... uncomment if necessary
@@ -1231,35 +1331,35 @@ ENDBODY:
 }
 
 
-
-
-
-
 void display_summarized(int num) {
        char datebuf[64];
 
-       wprintf("<TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
-       wprintf("<A HREF=\"/msg?msgnum=%ld?sourceiframe=msgloader1?targetdiv=preview_pane\" target=\"msgloader1\">",
-               WC->summ[num].msgnum);
+       wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#fff\" "
+               "onClick=\"CtdlSingleClickMsg(%ld)\">",
+               WC->summ[num].msgnum,
+               (WC->summ[num].is_new ? "bold" : "normal"),
+               WC->summ[num].msgnum
+       );
+
+       wprintf("<td>");
        escputs(WC->summ[num].subj);
-       wprintf("</A>");
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf("</TD><TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
+       wprintf("</td>");
+
+       wprintf("<td>");
        escputs(WC->summ[num].from);
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf(" </TD><TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
+       wprintf("</td>");
+
+       wprintf("<td>");
        fmt_date(datebuf, WC->summ[num].date, 1);       /* brief */
        escputs(datebuf);
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf(" </TD>");
-       wprintf("<TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
-               "</TD>\n",
+       wprintf("</td>");
+
+       wprintf("<td><input type=\"checkbox\" name=\"msg_%ld\" value=\"yes\">",
                WC->summ[num].msgnum
        );
+       wprintf("</td>");
+
+       wprintf("</tr>\n");
 }
 
 
@@ -1312,7 +1412,7 @@ void display_addressbook(long msgnum, char alpha) {
                                || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
                                || (WC->wc_view == VIEW_ADDRESSBOOK)
                        ) {
-                               wprintf("<A HREF=\"/edit_vcard?"
+                               wprintf("<a href=\"edit_vcard?"
                                        "msgnum=%ld?partnum=%s\">",
                                        msgnum, vcard_partnum);
                                wprintf("[%s]</A>", _("edit"));
@@ -1446,9 +1546,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        char tablast_label[SIZ];
 
        if (num_ab == 0) {
-               wprintf("<I>");
+               wprintf("<br /><br /><br /><div align=\"center\"><i>");
                wprintf(_("This address book is empty."));
-               wprintf("</I>\n");
+               wprintf("</i></div>\n");
                return;
        }
 
@@ -1463,7 +1563,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        wprintf("Page: ");
        for (i=0; i<=num_pages; ++i) {
                if (i != page) {
-                       wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+                       wprintf("<a href=\"readfwd?page=%d\">", i);
                }
                else {
                        wprintf("<B>");
@@ -1505,7 +1605,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        
                        wprintf("<TD>");
        
-                       wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+                       wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
                                addrbook[i].ab_msgnum);
                        wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha"));
                        vcard_n_prettyize(addrbook[i].ab_name);
@@ -1614,6 +1714,18 @@ int load_msg_ptrs(char *servcmd, int with_headers)
        return (nummsgs);
 }
 
+int longcmp_r(const void *s1, const void *s2) {
+       long l1;
+       long l2;
+
+       l1 = *(long *)s1;
+       l2 = *(long *)s2;
+
+       if (l1 > l2) return(-1);
+       if (l1 < l2) return(+1);
+       return(0);
+}
+
  
 int summcmp_subj(const void *s1, const void *s2) {
        struct message_summary *summ1;
@@ -1687,6 +1799,7 @@ void readloop(char *oper)
        int nummsgs;
        long startmsg;
        int maxmsgs;
+       long *displayed_msgs = NULL;
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
@@ -1694,14 +1807,9 @@ void readloop(char *oper)
        int is_calendar = 0;
        int is_tasks = 0;
        int is_notes = 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;
        struct addrbookent *addrbook = NULL;
        int num_ab = 0;
        char *sortby = NULL;
@@ -1710,6 +1818,7 @@ void readloop(char *oper)
        char *subjsort_button;
        char *sendsort_button;
        char *datesort_button;
+       int bbs_reverse = 0;    /* FIXME we need to set/reset this option now.  It works. */
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
@@ -1724,9 +1833,19 @@ void readloop(char *oper)
                set_preference(sortpref_name, sortby, 1);
        }
        if (strlen(sortby) == 0) sortby = sortpref_value;
-       if (strlen(sortby) == 0) sortby = "msgid";
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       /* mailbox sort */
+       if (strlen(sortby) == 0) sortby = "rdate";
+
+       /* message board sort */
+       if (!strcasecmp(sortby, "reverse")) {
+               bbs_reverse = 1;
+       }
+       else {
+               bbs_reverse = 0;
+       }
+
+       output_headers(1, 1, 1, 0, 0, 0);
 
        /* When in summary mode, always show ALL messages instead of just
         * new or old.  Otherwise, show what the user asked for.
@@ -1792,7 +1911,7 @@ void readloop(char *oper)
        nummsgs = load_msg_ptrs(cmd, is_summary);
        if (nummsgs == 0) {
 
-               if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
+               if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
                        wprintf("<em>");
                        if (!strcmp(oper, "readnew")) {
                                wprintf(_("No new messages."));
@@ -1821,12 +1940,12 @@ void readloop(char *oper)
                }
        }
 
-       if (startmsg == 0L) startmsg = WC->msgarr[0];
-       remaining_messages = 0;
-
-       for (a = 0; a < nummsgs; ++a) {
-               if (WC->msgarr[a] >= startmsg) {
-                       ++remaining_messages;
+       if (startmsg == 0L) {
+               if (bbs_reverse) {
+                       startmsg = WC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
+               }
+               else {
+                       startmsg = WC->msgarr[0];
                }
        }
 
@@ -1858,33 +1977,33 @@ void readloop(char *oper)
        }
 
        if (!strcasecmp(sortby, "subject")) {
-               subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
        }
        else if (!strcasecmp(sortby, "rsubject")) {
-               subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (!strcasecmp(sortby, "sender")) {
-               sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
        }
        else if (!strcasecmp(sortby, "rsender")) {
-               sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (!strcasecmp(sortby, "date")) {
-               datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
        }
        else if (!strcasecmp(sortby, "rdate")) {
-               datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (is_summary) {
@@ -1895,19 +2014,15 @@ void readloop(char *oper)
                        "<div id=\"fix_scrollbar_bug\">\n"
 
                        "<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n"
-
-                       "<table border=0 cellspacing=0 "
-                       "cellpadding=0 width=100%%>\n"
-                       "<TR>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD><INPUT TYPE=\"submit\" NAME=\"delete_button\" "
-                       "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
-                       " font-size: 6pt;\" "
-                       "VALUE=\"%s\"></TD>"
-                       "</TR>\n"
+                       "method=\"POST\" action=\"do_stuff_to_msgs\">\n"
+
+                       "<span class=\"mailbox_summary\">"
+                       "<table id=\"summary_headers\" rules=rows cellspacing=0 style=\"width:100%%\"><tr>"
+                       "<td><b><i>%s</i></b> %s</td>"
+                       "<td><b><i>%s</i></b> %s</td>"
+                       "<td><b><i>%s</i></b> %s</td>"
+                       "<td><input type=\"submit\" name=\"delete_button\" style=\"font-size:6pt\" value=\"%s\"></td>"
+                       "</tr>\n"
                        ,
                        _("Subject"),   subjsort_button,
                        _("Sender"),    sendsort_button,
@@ -1919,19 +2034,6 @@ void readloop(char *oper)
        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) {
-                               bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=\"#%s\">",
-                                       (bg ? "DDDDDD" : "FFFFFF")
-                               );
-                       }
-
                        /* Display the message */
                        if (is_summary) {
                                display_summarized(a);
@@ -1955,30 +2057,50 @@ void readloop(char *oper)
                                display_note(WC->msgarr[a]);
                        }
                        else {
-                               read_message(WC->msgarr[a], 0);
-                       }
-
-                       /* If a tabular view, finish the line */
-                       if (is_summary) {
-                               wprintf("</TR>\n");
+                               if (displayed_msgs == NULL) {
+                                       displayed_msgs = malloc(sizeof(long) *
+                                                               (maxmsgs<nummsgs ? maxmsgs : nummsgs));
+                               }
+                               displayed_msgs[num_displayed] = WC->msgarr[a];
                        }
 
                        if (lowest_displayed < 0) lowest_displayed = a;
                        highest_displayed = a;
 
                        ++num_displayed;
-                       --remaining_messages;
                }
        }
 
+       if (displayed_msgs != NULL) {
+               if (bbs_reverse) {
+                       qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
+               }
+
+               for (a=0; a<num_displayed; ++a) {
+                       read_message(displayed_msgs[a], 0, "");
+               }
+               free(displayed_msgs);
+               displayed_msgs = NULL;
+       }
+
        if (is_summary) {
-               wprintf("</table></form>"
+               wprintf("</table></span></form>"
                        "</div>\n");                    /* end of 'fix_scrollbar_bug' div */
                wprintf("</div>");                      /* end of 'message_list' div */
 
-               wprintf("<div id=\"ml_slider\"></div>");        /* slider */
-
                wprintf("<div id=\"preview_pane\">");   /* The preview pane will initially be empty */
+
+               /* Now register each message (whose element ID is "m9999",
+                * where "9999" is the message number) as draggable.
+                * (NOTE: uses script.aculo.us draggables, which will probably not be
+                * adequate for this purpose.)
+               wprintf("<script type=\"text/javascript\">\n");
+               for (a = 0; a < nummsgs; ++a) {
+                       wprintf("new Draggable('m%ld',{revert:true});\n",
+                               WC->summ[a].msgnum);
+               }
+               wprintf("</script>\n");
+                */
        }
 
        /* Bump these because although we're thinking in zero base, the user
@@ -1987,51 +2109,6 @@ void readloop(char *oper)
        ++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) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
-
-               wprintf("<div id=\"fix_scrollbar_bug\">"
-                       "<table border=0 width=100%% bgcolor=\"#dddddd\"><tr><td>");
-               wprintf(_("Reading #%d of %d messages."), lowest_displayed, nummsgs);
-               wprintf("</TD><TD ALIGN=RIGHT><FONT SIZE=+1>");
-
-               if (pn_previous > 0L) {
-                       wprintf("<A HREF=\"/%s"
-                               "?startmsg=%ld"
-                               "?maxmsgs=1"
-                               "?summary=0\">"
-                               "%s</A> \n",
-                                       oper,
-                                       pn_previous,
-                                       _("Previous"));
-               }
-
-               if (pn_next > 0L) {
-                       wprintf("<A HREF=\"/%s"
-                               "?startmsg=%ld"
-                               "?maxmsgs=1"
-                               "?summary=0\">"
-                               "%s</A> \n",
-                                       oper,
-                                       pn_next,
-                                       _("Next"));
-               }
-
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
-                       "?maxmsgs=%d?summary=1\">"
-                       "%s"
-                       "</A>",
-                       oper,
-                       WC->msgarr[0],
-                       DEFAULT_MAXMSGS,
-                       _("Summary")
-               );
-
-               wprintf("</td></tr></table></div>\n");
-           }
-       }
-
        /*
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
@@ -2041,7 +2118,7 @@ void readloop(char *oper)
              && (!is_notes) && (!is_singlecard) && (!is_summary)) {
 
                wprintf("<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
+                       "method=\"POST\" action=\"do_stuff_to_msgs\">\n");
 
                wprintf(_("Reading #"), lowest_displayed, highest_displayed);
 
@@ -2049,23 +2126,45 @@ void readloop(char *oper)
                        "OnChange=\"location.href=msgomatic.whichones.options"
                        "[selectedIndex].value\">\n");
 
-               for (b=0; b<nummsgs; b = b + maxmsgs) {
-               lo = b+1;
-               hi = b+maxmsgs;
-               if (hi > nummsgs) hi = nummsgs;
-                       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);
+               if (bbs_reverse) {
+                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
+                               hi = b + 1;
+                               lo = b - maxmsgs + 2;
+                               if (lo < 1) lo = 1;
+                               wprintf("<option %s value="
+                                       "\"/%s"
+                                       "?startmsg=%ld"
+                                       "?maxmsgs=%d"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->msgarr[lo-1],
+                                       maxmsgs,
+                                       is_summary,
+                                       hi, lo);
+                       }
                }
+               else {
+                       for (b=0; b<nummsgs; b = b + maxmsgs) {
+                               lo = b + 1;
+                               hi = b + maxmsgs + 1;
+                               if (hi > nummsgs) hi = nummsgs;
+                               wprintf("<option %s value="
+                                       "\"/%s"
+                                       "?startmsg=%ld"
+                                       "?maxmsgs=%d"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->msgarr[lo-1],
+                                       maxmsgs,
+                                       is_summary,
+                                       lo, hi);
+                       }
+               }
+
                wprintf("<option value=\"/%s?startmsg=%ld"
                        "?maxmsgs=9999999?summary=%d\">"
                        "ALL"
@@ -2075,6 +2174,25 @@ void readloop(char *oper)
 
                wprintf("</select> ");
                wprintf(_("of %d messages."), nummsgs);
+
+               /* forward/reverse */
+               wprintf("&nbsp;<select name=\"direction\" size=\"1\" "
+                       "OnChange=\"location.href=msgomatic.direction.options"
+                       "[selectedIndex].value\">\n"
+               );
+
+               wprintf("<option %s value=\"/%s&sortby=forward\">oldest to newest</option>\n",
+                       (bbs_reverse ? "" : "selected"),
+                       oper
+               );
+       
+               wprintf("<option %s value=\"/%s&sortby=reverse\">newest to oldest</option>\n",
+                       (bbs_reverse ? "selected" : ""),
+                       oper
+               );
+       
+               wprintf("</select>");
+
                wprintf("</form>\n");
            }
        }
@@ -2107,15 +2225,6 @@ DONE:
                WC->num_summ = 0;
                free(WC->summ);
        }
-
-       /* If we got here via a mailbox view and are reading a single
-        * message, mark it as "seen." We do this after rendering the web page
-        * so it doesn't keep the user waiting.
-        */
-       if ( (maxmsgs == 1) && (WC->wc_view == VIEW_MAILBOX) ) {
-               serv_printf("SEEN %ld|1", startmsg);
-               serv_getln(buf, sizeof buf);
-       }
 }
 
 
@@ -2257,14 +2366,20 @@ void post_message(void)
                        _("Automatically cancelled because you have already "
                        "saved this message."));
        } else {
-               sprintf(buf, "ENT0 1|%s|0|4|%s",
+               sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
                        bstr("recp"),
-                       bstr("subject") );
+                       bstr("subject"),
+                       bstr("cc"),
+                       bstr("bcc")
+               );
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '4') {
                        post_mime_to_server();
-                       if (strlen(bstr("recp")) > 0) {
+                       if ( (strlen(bstr("recp")) > 0)
+                          || (strlen(bstr("cc")) > 0)
+                          || (strlen(bstr("bcc")) > 0)
+                       ) {
                                sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
                        }
                        else {
@@ -2291,10 +2406,12 @@ void post_message(void)
 void display_enter(void)
 {
        char buf[SIZ];
+       char ebuf[SIZ];
        long now;
        struct wc_attachment *att;
        int recipient_required = 0;
        int recipient_bad = 0;
+       int i;
 
        if (strlen(bstr("force_room")) > 0) {
                gotoroom(bstr("force_room"));
@@ -2328,9 +2445,9 @@ void display_enter(void)
 
        /*
         * Otherwise proceed normally.
-`       * Do a custom room banner with no navbar...
+        * Do a custom room banner with no navbar...
         */
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
        embed_room_banner(NULL, navbar_none);
        wprintf("</div>\n");
@@ -2338,72 +2455,102 @@ void display_enter(void)
                "<div id=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
 
-       sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
-       serv_puts(buf);
+       /* First test to see whether this is a room that requires recipients to be entered */
+       serv_puts("ENT0 0");
        serv_getln(buf, sizeof buf);
-
-       if (!strncmp(buf, "570", 3)) {
+       if (!strncmp(buf, "570", 3)) {          /* 570 means that we need a recipient here */
                recipient_required = 1;
-               if (strlen(bstr("recp")) > 0) {
-                       recipient_bad = 1;
-               }
        }
-       else if (buf[0] != '2') {
+       else if (buf[0] != '2') {               /* Any other error means that we cannot continue */
                wprintf("<EM>%s</EM><br />\n", &buf[4]);
                goto DONE;
        }
 
+       /* Now check our actual recipients if there are any */
+       if (recipient_required) {
+               sprintf(buf, "ENT0 0|%s|0|0||||%s|%s", bstr("recp"), bstr("cc"), bstr("bcc"));
+               serv_puts(buf);
+               serv_getln(buf, sizeof buf);
+
+               if (!strncmp(buf, "570", 3)) {  /* 570 means we have an invalid recipient listed */
+                       if (strlen(bstr("recp")) + strlen(bstr("cc")) + strlen(bstr("bcc")) > 0) {
+                               recipient_bad = 1;
+                       }
+               }
+               else if (buf[0] != '2') {       /* Any other error means that we cannot continue */
+                       wprintf("<EM>%s</EM><br />\n", &buf[4]);
+                       goto DONE;
+               }
+       }
+
+       /* If we got this far, we can display the message entry screen. */
+
        now = time(NULL);
        fmt_date(buf, now, 0);
        strcat(&buf[strlen(buf)], _(" <I>from</I> "));
        stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+
+       /* Don't need this anymore, it's in the input box below
        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(
-       "<style> div.auto_complete { width: 350px; background: #fff; } div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; } div.auto_complete ul li { margin:0; padding:3px; } div.auto_complete ul li.selected { background-color: #ffc; } div.auto_complete ul strong.highlight { color: #800; margin:0; padding:0; } </style> \n "
-       );
-
        wprintf("<form enctype=\"multipart/form-data\" "
-               "method=\"POST\" action=\"/post\" "
+               "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",
-               now);
+       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
 
        wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
        wprintf("%s<br>\n", buf);       /* header bar */
 
        wprintf("<table border=\"0\" width=\"100%%\">\n");
        if (recipient_required) {
+
                wprintf("<tr><td>");
                wprintf("<font size=-1>");
                wprintf(_("To:"));
                wprintf("</font>");
                wprintf("</td><td>"
-                       "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_name\" value=\"");
+                       "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
                escputs(bstr("recp"));
-               wprintf("\" size=50 maxlength=70>");
-       
+               wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-       
-               wprintf("<script type=\"text/javascript\">                                      "
-                       " new Ajax.Autocompleter('recp_name', 'recp_name_choices',              "
-                       "       '/recp_autocomplete', {} );                             "
-                       "</script>\n                                                            "
-               );
+               wprintf("</td><td></td></tr>\n");
 
+               wprintf("<tr><td>");
+               wprintf("<font size=-1>");
+               wprintf(_("CC:"));
+               wprintf("</font>");
+               wprintf("</td><td>"
+                       "<input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
+               escputs(bstr("cc"));
+               wprintf("\" size=50 maxlength=1000 />");
+               wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
                wprintf("</td><td></td></tr>\n");
+
+               wprintf("<tr><td>");
+               wprintf("<font size=-1>");
+               wprintf(_("BCC:"));
+               wprintf("</font>");
+               wprintf("</td><td>"
+                       "<input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
+               escputs(bstr("bcc"));
+               wprintf("\" size=50 maxlength=1000 />");
+               wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
+               wprintf("</td><td></td></tr>\n");
+
+               /* Initialize the autocomplete ajax helpers (found in wclib.js) */
+               wprintf("<script type=\"text/javascript\">      \n"
+                       " activate_entmsg_autocompleters();     \n"
+                       "</script>                              \n"
+               );
        }
 
        wprintf("<tr><td>");
@@ -2425,31 +2572,80 @@ void display_enter(void)
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
        wprintf("</td></tr></table>\n");
 
-       wprintf("<center><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', '");
+       wprintf("<center>");
+
+       wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
+
+       /* If we're continuing from a previous edit, put our partially-composed message back... */
        msgescputs(bstr("msgtext"));
-       if (atol(bstr("pullquote")) > 0L) {
+
+       /* If we're forwarding a message, insert it here... */
+       if (atol(bstr("fwdquote")) > 0L) {
                wprintf("<br><div align=center><i>");
                wprintf(_("--- forwarded message ---"));
                wprintf("</i></div><br>");
-               pullquote_message(atol(bstr("pullquote")), 1);
+               pullquote_message(atol(bstr("fwdquote")), 1);
+       }
+
+       /* If we're replying quoted, insert the quote here... */
+       else if (atol(bstr("replyquote")) > 0L) {
+               wprintf("<br>"
+                       "<blockquote>");
+               pullquote_message(atol(bstr("replyquote")), 0);
+               wprintf("</blockquote>");
+       }
+
+       /* Insert our signature if appropriate... */
+       if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
+               get_preference("use_sig", buf, sizeof buf);
+               if (!strcasecmp(buf, "yes")) {
+                       get_preference("signature", ebuf, sizeof ebuf);
+                       euid_unescapize(buf, ebuf);
+                       wprintf("<br>--<br>");
+                       for (i=0; i<strlen(buf); ++i) {
+                               if (buf[i] == '\n') {
+                                       wprintf("<br>");
+                               }
+                               else if (buf[i] == '<') {
+                                       wprintf("&lt;");
+                               }
+                               else if (buf[i] == '>') {
+                                       wprintf("&gt;");
+                               }
+                               else if (buf[i] == '&') {
+                                       wprintf("&amp;");
+                               }
+                               else if (buf[i] == '\"') {
+                                       wprintf("&quot;");
+                               }
+                               else if (buf[i] == '\'') {
+                                       wprintf("&#39;");
+                               }
+                               else if (isprint(buf[i])) {
+                                       wprintf("%c", buf[i]);
+                               }
+                       }
+               }
        }
-       wprintf("', '96%%', '200', true, false); \n"
-               "</script></center><br />\n");
+
+       wprintf("</textarea>");
+       wprintf("</center><br />\n");
+
+       /*
+        * The following script embeds the TinyMCE richedit control, and automatically
+        * transforms the textarea into a richedit textarea.
+        */
+       wprintf(
+               "<script language=\"javascript\" type=\"text/javascript\" src=\"tiny_mce/tiny_mce.js\"></script>\n"
+               "<script language=\"javascript\" type=\"text/javascript\">"
+               "tinyMCE.init({"
+               "       mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\" "
+               "});"
+               "</script>\n"
+       );
 
        /* Enumerate any attachments which are already in place... */
-       wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
+       wprintf("<img src=\"static/diskette_24x.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) {
@@ -2478,6 +2674,11 @@ void display_enter(void)
        wprintf("\">&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 
+       /* Make sure we only insert our signature once */
+       if (strcmp(bstr("sig_inserted"), "yes")) {
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"sig_inserted\" VALUE=\"yes\">\n");
+       }
+
        wprintf("</form>\n");
 
        wprintf("</td></tr></table></div>\n");
@@ -2498,10 +2699,9 @@ void delete_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       sprintf(buf, "DELE %ld", msgid);
-       serv_puts(buf);
+       serv_printf("MOVE %ld|_TRASH_|0", msgid);
        serv_getln(buf, sizeof buf);
        wprintf("<EM>%s</EM><br />\n", &buf[4]);
 
@@ -2522,25 +2722,23 @@ void confirm_move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
-               "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
-       wprintf("<font size=+1 color=\"#ffffff\"");
-       wprintf("<b>");
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Confirm move of message"));
-       wprintf("</b>\n");
-       wprintf("</font></td></tr></table></div>\n");
+       wprintf("</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<CENTER>");
 
        wprintf(_("Move this message to:"));
        wprintf("<br />\n");
 
-       wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
-               bstr("msgid"));
-
+       wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
        wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
        serv_puts("LKRA");
@@ -2574,20 +2772,17 @@ void move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
-
        if (strlen(bstr("move_button")) > 0) {
                sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
-               wprintf("<EM>%s</EM><br />\n", &buf[4]);
+               sprintf(WC->ImportantMessage, "%s", &buf[4]);
        } else {
-               wprintf("<EM>");
-               wprintf(_("The message was not moved."));
-               wprintf("</EM><br />\n");
+               sprintf(WC->ImportantMessage, (_("The message was not moved.")));
        }
 
-       wDumpContent(1);
+       readloop("readnew");
+
 }
 
 /*
@@ -2628,7 +2823,7 @@ void do_stuff_to_msgs(void) {
                if (!strcasecmp(bstr(buf), "yes")) {
 
                        if (delete_button_pressed) {
-                               serv_printf("DELE %ld", stuff->msgnum);
+                               serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
                                serv_getln(buf, sizeof buf);
                        }