* Started writing wiki code. It completely does not work. :)
[citadel.git] / webcit / messages.c
index 82fb3dd4818a87846e084aeab8f22cd1ef73c9d0..0009f6b9c0292cedf508cc51023c3e965506a958 100644 (file)
@@ -10,6 +10,9 @@
 #include "webserver.h"
 #include "groupdav.h"
 
+#define SUBJ_COL_WIDTH_PCT             50
+#define SENDER_COL_WIDTH_PCT           30
+#define DATE_PLUS_BUTTONS_WIDTH_PCT    20
 
 /* Address book entry (keep it short and sweet, it's just a quickie lookup
  * which we can use to get to the real meat and bones later)
@@ -162,7 +165,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 )
@@ -247,13 +250,13 @@ void display_parsed_vcard(struct vCard *v, int full) {
        char firsttoken[SIZ];
        int pass;
 
-       char displayname[SIZ];
+       char fullname[SIZ];
        char title[SIZ];
        char org[SIZ];
        char phone[SIZ];
        char mailto[SIZ];
 
-       strcpy(displayname, "");
+       strcpy(fullname, "");
        strcpy(phone, "");
        strcpy(mailto, "");
        strcpy(title, "");
@@ -266,9 +269,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        escputs(name);
                }
                else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(displayname, name);
-                       vcard_n_prettyize(displayname);
-                       escputs(displayname);
+                       strcpy(fullname, name);
+                       vcard_n_prettyize(fullname);
+                       escputs(fullname);
                }
                else {
                        wprintf("&nbsp;");
@@ -318,15 +321,15 @@ void display_parsed_vcard(struct vCard *v, int full) {
        
                        /* N is name, but only if there's no FN already there */
                        if (!strcasecmp(firsttoken, "n")) {
-                               if (strlen(displayname) == 0) {
-                                       strcpy(displayname, thisvalue);
-                                       vcard_n_prettyize(displayname);
+                               if (strlen(fullname) == 0) {
+                                       strcpy(fullname, thisvalue);
+                                       vcard_n_prettyize(fullname);
                                }
                        }
        
                        /* FN (full name) is a true 'display name' field */
                        else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(displayname, thisvalue);
+                               strcpy(fullname, thisvalue);
                        }
 
                        /* title */
@@ -342,10 +345,10 @@ 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)], fullname);
                                urlesc(&mailto[strlen(mailto)], " <");
                                urlesc(&mailto[strlen(mailto)], thisvalue);
                                urlesc(&mailto[strlen(mailto)], ">");
@@ -419,9 +422,9 @@ 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);
+                       escputs(fullname);
                        wprintf("</B></FONT>");
                        if (strlen(title) > 0) {
                                wprintf("<div align=right>");
@@ -550,25 +553,25 @@ void read_message(long msgnum, int printable_view, char *section) {
 
        /* begin everythingamundo table */
        if (!printable_view) {
-               wprintf("<div id=\"fix_scrollbar_bug\">\n");
+               wprintf("<div class=\"fix_scrollbar_bug\">\n");
                wprintf("<table width=100%% border=1 cellspacing=0 "
                        "cellpadding=0><TR><TD>\n");
        }
 
        /* begin message header table */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
-               "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
+       wprintf("<table width=100%% border=0 cellspacing=0 "
+               "cellpadding=1 bgcolor=\"#CCCCCC\"><tr><td>\n");
 
-       wprintf("<SPAN CLASS=\"message_header\">");
+       wprintf("<span class=\"message_header\">");
        strcpy(m_subject, "");
        strcpy(m_cc, "");
 
        while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
                if (!strcmp(buf, "000")) {
-                       wprintf("<I>");
+                       wprintf("<i>");
                        wprintf(_("unexpected end of message"));
-                       wprintf("</I><br /><br />\n");
-                       wprintf("</SPAN>\n");
+                       wprintf("</i><br /><br />\n");
+                       wprintf("</span>\n");
                        return;
                }
                if (!strncasecmp(buf, "nhdr=yes", 8))
@@ -580,14 +583,14 @@ void read_message(long msgnum, int printable_view, char *section) {
                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
                        urlescputs(from);
                        wprintf("\">");
                        escputs(from);
-                       wprintf("</A> ");
+                       wprintf("</a> ");
                }
                if (!strncasecmp(buf, "subj=", 5)) {
                        safestrncpy(m_subject, &buf[5], sizeof m_subject);
@@ -659,18 +662,18 @@ void read_message(long msgnum, int printable_view, char *section) {
                           && (!strncasecmp(mime_content_type, "image/", 6)) ){
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<IMG SRC=\"/mimepart/%ld/%s/%s\">",
+                                       "<img src=\"mimepart/%ld/%s/%s\">",
                                        msgnum, mime_partnum, mime_filename);
                        }
                        else if ( (!strcasecmp(mime_disposition, "attachment")) 
                             || (!strcasecmp(mime_disposition, "inline")) ) {
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<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",
+                                       "<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,
@@ -713,64 +716,68 @@ void read_message(long msgnum, int printable_view, char *section) {
                wprintf("****");
        }
 
-       wprintf("</SPAN>");
+       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\">");
+                       "<span class=\"message_subject\">");
                wprintf(_("CC:"));
                wprintf(" ");
                escputs(m_cc);
-               wprintf("</SPAN>");
+               wprintf("</span>");
        }
        if (strlen(m_subject) > 0) {
                wprintf("<br />"
-                       "<SPAN CLASS=\"message_subject\">");
+                       "<span class=\"message_subject\">");
                wprintf(_("Subject:"));
                wprintf(" ");
                escputs(m_subject);
-               wprintf("</SPAN>");
+               wprintf("</span>");
        }
-       wprintf("</TD>\n");
+       wprintf("</td>\n");
 
        /* start msg buttons */
        if (!printable_view) {
-               wprintf("<td align=right>\n");
+               wprintf("<td align=right><span class=\"msgbuttons\">\n");
 
                /* Reply */
                if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
-                       wprintf("<a href=\"/display_enter");
+                       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);
+                       if (strlen(m_subject) > 0) {
+                               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("<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);
+                               if (strlen(m_subject) > 0) {
+                                       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("<a href=\"display_enter");
                        wprintf("?replyquote=%ld", msgnum);
                        wprintf("?recp=");
                        urlescputs(reply_to);
@@ -786,7 +793,7 @@ void read_message(long msgnum, int printable_view, char *section) {
 
                /* Forward */
                if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"/display_enter?fwdquote=%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"));
@@ -795,27 +802,33 @@ void read_message(long msgnum, int printable_view, char *section) {
                /* 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=\"#\" 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'); \" >"
+               /* Headers */
+               wprintf("<a href=\"#\" onClick=\"window.open('msgheaders/%ld', 'headers%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
+                       "[%s]</a>", msgnum, msgnum, _("Headers"));
+
+
+               /* 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>");
+               wprintf("</span></td>");
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</tr></table>\n");
 
        /* Begin body */
-       wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
-               "CELLPADDING=1 CELLSPACING=0><TR><TD>");
+       wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+               "cellpadding=1 cellspacing=0><tr><td>");
 
        /* 
         * Learn the content type
@@ -823,9 +836,9 @@ void read_message(long msgnum, int printable_view, char *section) {
        strcpy(mime_content_type, "text/plain");
        while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
                if (!strcmp(buf, "000")) {
-                       wprintf("<I>");
+                       wprintf("<i>");
                        wprintf(_("unexpected end of message"));
-                       wprintf("</I><br /><br />\n");
+                       wprintf("</i><br /><br />\n");
                        goto ENDBODY;
                }
                if (!strncasecmp(buf, "Content-type: ", 14)) {
@@ -889,20 +902,20 @@ void read_message(long msgnum, int printable_view, char *section) {
                        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("<BLOCKQUOTE>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+                               wprintf("<blockquote>");
                                bq = 1;
                        } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</BLOCKQUOTE>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+                               wprintf("</blockquote>");
                                bq = 0;
                        }
-                       wprintf("<TT>");
+                       wprintf("<tt>");
                        url(buf);
                        escputs(buf);
-                       wprintf("</TT><br />\n");
+                       wprintf("</tt><br />\n");
                }
-               wprintf("</I><br />");
+               wprintf("</i><br />");
        }
 
        else /* HTML is fun, but we've got to strip it first */
@@ -944,10 +957,10 @@ void read_message(long msgnum, int printable_view, char *section) {
                                || (!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"));
+                               wprintf("[%s]</a>", _("edit"));
                        }
 
                        /* In all cases, display the full card */
@@ -970,11 +983,11 @@ void read_message(long msgnum, int printable_view, char *section) {
        }
 
 ENDBODY:
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 
        /* end everythingamundo table */
        if (!printable_view) {
-               wprintf("</TD></TR></TABLE>\n");
+               wprintf("</td></tr></table>\n");
                wprintf("</div><br />\n");
        }
 
@@ -1029,6 +1042,35 @@ void print_message(char *msgnum_as_string) {
 
 
 
+/*
+ * Display a message's headers
+ */
+void display_headers(char *msgnum_as_string) {
+       long msgnum = 0L;
+       char buf[1024];
+
+       msgnum = atol(msgnum_as_string);
+       output_headers(0, 0, 0, 0, 0, 0);
+
+       wprintf("Content-type: text/plain\r\n"
+               "Server: %s\r\n"
+               "Connection: close\r\n",
+               SERVER);
+       begin_burst();
+
+       serv_printf("MSG2 %ld|3", msgnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') {
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       wprintf("%s\n", buf);
+               }
+       }
+
+       wDumpContent(0);
+}
+
+
+
 /*
  * Read message in simple, JavaScript-embeddable form for 'forward'
  * or 'reply quoted' operations.
@@ -1242,20 +1284,20 @@ void pullquote_message(long msgnum, int forward_attachments) {
                        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("<BLOCKQUOTE>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+                               wprintf("<blockquote>");
                                bq = 1;
                        } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</BLOCKQUOTE>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+                               wprintf("</blockquote>");
                                bq = 0;
                        }
-                       wprintf("<TT>");
+                       wprintf("<tt>");
                        url(buf);
                        msgescputs(buf);
-                       wprintf("</TT><br />");
+                       wprintf("</tt><br />");
                }
-               wprintf("</I><br />");
+               wprintf("</i><br />");
        }
 
        /* HTML just gets escaped and stuffed back into the editor */
@@ -1334,31 +1376,26 @@ ENDBODY:
 void display_summarized(int num) {
        char datebuf[64];
 
-       wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#fff\" "
-               "onClick=\"CtdlSingleClickMsg(%ld)\">",
+       wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#ffffff\" "
+               "onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
                WC->summ[num].msgnum,
                (WC->summ[num].is_new ? "bold" : "normal"),
                WC->summ[num].msgnum
        );
 
-       wprintf("<td>");
+       wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
        escputs(WC->summ[num].subj);
        wprintf("</td>");
 
-       wprintf("<td>");
+       wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
        escputs(WC->summ[num].from);
        wprintf("</td>");
 
-       wprintf("<td>");
+       wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
        fmt_date(datebuf, WC->summ[num].date, 1);       /* brief */
        escputs(datebuf);
        wprintf("</td>");
 
-       wprintf("<td><input type=\"checkbox\" name=\"msg_%ld\" value=\"yes\">",
-               WC->summ[num].msgnum
-       );
-       wprintf("</td>");
-
        wprintf("</tr>\n");
 }
 
@@ -1412,10 +1449,10 @@ 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"));
+                               wprintf("[%s]</a>", _("edit"));
                        }
 
                        free(vcard_source);
@@ -1563,7 +1600,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>");
@@ -1585,7 +1622,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        }
        wprintf("<br />\n");
 
-       wprintf("<TABLE border=0 cellspacing=0 "
+       wprintf("<table border=0 cellspacing=0 "
                "cellpadding=3 width=100%%>\n"
        );
 
@@ -1595,27 +1632,27 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 
                        if ((displayed % 4) == 0) {
                                if (displayed > 0) {
-                                       wprintf("</TR>\n");
+                                       wprintf("</tr>\n");
                                }
                                bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=\"#%s\">",
+                               wprintf("<tr bgcolor=\"#%s\">",
                                        (bg ? "DDDDDD" : "FFFFFF")
                                );
                        }
        
-                       wprintf("<TD>");
+                       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);
                        escputs(addrbook[i].ab_name);
-                       wprintf("</A></TD>\n");
+                       wprintf("</a></td>\n");
                        ++displayed;
                }
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</tr></table>\n");
 }
 
 
@@ -1627,7 +1664,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 {
        char buf[1024];
        time_t datestamp;
-       char displayname[128];
+       char fullname[128];
        char nodename[128];
        char inetaddr[128];
        char subject[256];
@@ -1636,11 +1673,10 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 
        int num_summ_alloc = 0;
 
-       if (with_headers) {
-               if (WC->num_summ != 0) {
-                       free(WC->summ);
-                       WC->num_summ = 0;
-               }
+       if (WC->summ != NULL) {
+               free(WC->summ);
+               WC->num_summ = 0;
+               WC->summ = NULL;
        }
        num_summ_alloc = 100;
        WC->num_summ = 0;
@@ -1658,7 +1694,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                if (nummsgs < maxload) {
                        WC->msgarr[nummsgs] = extract_long(buf, 0);
                        datestamp = extract_long(buf, 1);
-                       extract_token(displayname, buf, 2, '|', sizeof displayname);
+                       extract_token(fullname, buf, 2, '|', sizeof fullname);
                        extract_token(nodename, buf, 3, '|', sizeof nodename);
                        extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
                        extract_token(subject, buf, 5, '|', sizeof subject);
@@ -1667,15 +1703,18 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                        if (with_headers) {
                                if (nummsgs > num_summ_alloc) {
                                        num_summ_alloc *= 2;
-                                       WC->summ = realloc(WC->summ, num_summ_alloc * sizeof(struct message_summary));
+                                       WC->summ = realloc(WC->summ,
+                                               num_summ_alloc * sizeof(struct message_summary));
                                }
                                ++WC->num_summ;
 
                                memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
                                WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
-                               safestrncpy(WC->summ[nummsgs-1].subj, _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
-                               if (strlen(displayname) > 0) {
-                                       safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from);
+                               safestrncpy(WC->summ[nummsgs-1].subj,
+                                       _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
+                               if (strlen(fullname) > 0) {
+                                       safestrncpy(WC->summ[nummsgs-1].from,
+                                               fullname, sizeof WC->summ[nummsgs-1].from);
                                }
                                if (strlen(subject) > 0) {
                                safestrncpy(WC->summ[nummsgs-1].subj, subject,
@@ -1807,6 +1846,7 @@ void readloop(char *oper)
        int is_calendar = 0;
        int is_tasks = 0;
        int is_notes = 0;
+       int is_bbview = 0;
        int lo, hi;
        int lowest_displayed = (-1);
        int highest_displayed = 0;
@@ -1818,7 +1858,13 @@ 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. */
+       int bbs_reverse = 0;
+
+       if (WC->wc_view == VIEW_WIKI) {
+               sprintf(buf, "wiki/%s/home", WC->wc_roomname);
+               http_redirect(buf);
+               return;
+       }
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
@@ -1977,58 +2023,79 @@ 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=rdate\"><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) {
-               wprintf("</div>");              /* end of 'content' div */
-
-               wprintf("<div id=\"message_list\">"
-
-                       "<div id=\"fix_scrollbar_bug\">\n"
-
-                       "<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n"
+               wprintf("</div>\n");            /* end of 'content' div */
+
+               wprintf("<script language=\"javascript\" type=\"text/javascript\">"
+                       " document.onkeydown = CtdlMsgListKeyPress;     "
+                       " if (document.layers) {                        "
+                       "       document.captureEvents(Event.KEYPRESS); "
+                       " }                                             "
+                       "</script>\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>"
+               /* note that Date and Delete are now in the same column */
+               wprintf("<div id=\"message_list_hdr\">"
+                       "<div class=\"fix_scrollbar_bug\">"
+                       "<table cellspacing=0 style=\"width:100%%\">"
+                       "<tr>"
+               );
+               wprintf("<td width=%d%%><b><i>%s</i></b> %s</td>"
+                       "<td width=%d%%><b><i>%s</i></b> %s</td>"
+                       "<td width=%d%%><b><i>%s</i></b> %s"
+                       "&nbsp;"
+                       "<input type=\"submit\" name=\"delete_button\" style=\"font-size:6pt\" "
+                       " onClick=\"CtdlDeleteSelectedMessages(event)\" "
+                       " value=\"%s\">"
+                       "</td>"
                        "</tr>\n"
                        ,
+                       SUBJ_COL_WIDTH_PCT,
                        _("Subject"),   subjsort_button,
+                       SENDER_COL_WIDTH_PCT,
                        _("Sender"),    sendsort_button,
+                       DATE_PLUS_BUTTONS_WIDTH_PCT,
                        _("Date"),      datesort_button,
                        _("Delete")
                );
+               wprintf("</table></div></div>\n");
+
+               wprintf("<div id=\"message_list\">"
+
+                       "<div class=\"fix_scrollbar_bug\">\n"
+
+                       "<table class=\"mailbox_summary\" id=\"summary_headers\" rules=rows "
+                       "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
+               );
        }
 
        for (a = 0; a < nummsgs; ++a) {
@@ -2071,38 +2138,48 @@ void readloop(char *oper)
                }
        }
 
+       /* Set the "is_bbview" variable if it appears that we are looking at
+        * a classic bulletin board view.
+        */
+       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
+               is_bbview = 1;
+       }
+
+       /* Output loop */
        if (displayed_msgs != NULL) {
                if (bbs_reverse) {
                        qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
                }
 
+               /* if we do a split bbview in the future, begin messages div here */
+
                for (a=0; a<num_displayed; ++a) {
                        read_message(displayed_msgs[a], 0, "");
                }
+
+               /* if we do a split bbview in the future, end messages div here */
+
                free(displayed_msgs);
                displayed_msgs = NULL;
        }
 
        if (is_summary) {
-               wprintf("</table></span></form>"
+               wprintf("</table>"
                        "</div>\n");                    /* end of 'fix_scrollbar_bug' div */
                wprintf("</div>");                      /* end of 'message_list' div */
 
-               wprintf("<div id=\"ml_slider\"></div>");        /* slider */
+               /* Here's the grab-it-to-resize-the-message-list widget */
+               wprintf("<div id=\"resize_msglist\" "
+                       "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
+                       "<div class=\"fix_scrollbar_bug\">"
+                       "<table width=100%% border=3 cellspacing=0 "
+                       "bgcolor=\"#cccccc\" "
+                       "cellpadding=0><TR><TD> </td></tr></table>"
+                       "</div></div>\n"
+               );
 
                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
@@ -2115,13 +2192,9 @@ void readloop(char *oper)
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (num_displayed > 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-
-               wprintf("<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
-
+       if (is_bbview) {
+               /* begin bbview scroller */
+               wprintf("<form name=\"msgomatic\">");
                wprintf(_("Reading #"), lowest_displayed, highest_displayed);
 
                wprintf("<select name=\"whichones\" size=\"1\" "
@@ -2134,7 +2207,7 @@ void readloop(char *oper)
                                lo = b - maxmsgs + 2;
                                if (lo < 1) lo = 1;
                                wprintf("<option %s value="
-                                       "\"/%s"
+                                       "\"%s"
                                        "?startmsg=%ld"
                                        "?maxmsgs=%d"
                                        "?summary=%d\">"
@@ -2153,7 +2226,7 @@ void readloop(char *oper)
                                hi = b + maxmsgs + 1;
                                if (hi > nummsgs) hi = nummsgs;
                                wprintf("<option %s value="
-                                       "\"/%s"
+                                       "\"%s"
                                        "?startmsg=%ld"
                                        "?maxmsgs=%d"
                                        "?summary=%d\">"
@@ -2167,7 +2240,7 @@ void readloop(char *oper)
                        }
                }
 
-               wprintf("<option value=\"/%s?startmsg=%ld"
+               wprintf("<option value=\"%s?startmsg=%ld"
                        "?maxmsgs=9999999?summary=%d\">"
                        "ALL"
                        "</option> ",
@@ -2183,20 +2256,18 @@ void readloop(char *oper)
                        "[selectedIndex].value\">\n"
                );
 
-               wprintf("<option %s value=\"/%s&sortby=forward\">oldest to newest</option>\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",
+               wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
                        (bbs_reverse ? "selected" : ""),
                        oper
                );
        
-               wprintf("</select>");
-
-               wprintf("</form>\n");
-           }
+               wprintf("</select></form>\n");
+               /* end bbview scroller */
        }
 
 DONE:
@@ -2212,20 +2283,15 @@ DONE:
                do_addrbook_view(addrbook, num_ab);     /* Render the address book */
        }
 
-       /* Put the data transfer hidden iframe in a hidden div, to make it *really* hidden */
-       wprintf("</div>"
-               "<div display=\"hidden\">\n"
-               "<iframe name=\"msgloader1\" id=\"msgloader1\" width=\"1\"></iframe>\n"
-       );
-
        /* Note: wDumpContent() will output one additional </div> tag. */
        wDumpContent(1);
        if (addrbook != NULL) free(addrbook);
 
        /* free the summary */
-       if (WC->num_summ != 0) {
-               WC->num_summ = 0;
+       if (WC->summ != NULL) {
                free(WC->summ);
+               WC->num_summ = 0;
+               WC->summ = NULL;
        }
 }
 
@@ -2266,9 +2332,9 @@ void post_mime_to_server(void) {
 
        serv_puts("Content-type: text/html; charset=utf-8");
        serv_puts("");
-       serv_puts("<HTML><BODY>\n");
+       serv_puts("<html><body>\n");            /* Future templates go here */
        text_to_server(bstr("msgtext"), 0);
-       serv_puts("</BODY></HTML>\n");
+       serv_puts("</body></html>\n");
        
 
        if (is_multipart) {
@@ -2315,6 +2381,11 @@ void post_message(void)
        char buf[SIZ];
        static long dont_post = (-1L);
        struct wc_attachment *att, *aptr;
+       int is_anonymous = 0;
+
+       if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+               is_anonymous = 1;
+       }
 
        if (WC->upload_length > 0) {
 
@@ -2368,8 +2439,9 @@ void post_message(void)
                        _("Automatically cancelled because you have already "
                        "saved this message."));
        } else {
-               sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
+               sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s",
                        bstr("recp"),
+                       is_anonymous,
                        bstr("subject"),
                        bstr("cc"),
                        bstr("bcc")
@@ -2414,11 +2486,16 @@ void display_enter(void)
        int recipient_required = 0;
        int recipient_bad = 0;
        int i;
+       int is_anonymous = 0;
 
        if (strlen(bstr("force_room")) > 0) {
                gotoroom(bstr("force_room"));
        }
 
+       if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+               is_anonymous = 1;
+       }
+
        /* Are we perhaps in an address book view?  If so, then an "enter
         * message" command really means "add new entry."
         */
@@ -2454,7 +2531,7 @@ void display_enter(void)
        embed_room_banner(NULL, navbar_none);
        wprintf("</div>\n");
        wprintf("<div id=\"content\">\n"
-               "<div id=\"fix_scrollbar_bug\">"
+               "<div class=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
 
        /* First test to see whether this is a room that requires recipients to be entered */
@@ -2470,7 +2547,7 @@ void display_enter(void)
 
        /* 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"));
+               sprintf(buf, "ENT0 0|%s|%d|0||||%s|%s", bstr("recp"), is_anonymous, bstr("cc"), bstr("bcc"));
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
 
@@ -2490,7 +2567,7 @@ void display_enter(void)
        now = time(NULL);
        fmt_date(buf, now, 0);
        strcat(&buf[strlen(buf)], _(" <I>from</I> "));
-       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+       stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1);
 
        /* Don't need this anymore, it's in the input box below
        if (strlen(bstr("recp")) > 0) {
@@ -2504,13 +2581,21 @@ void display_enter(void)
 
        /* begin message entry screen */
        wprintf("<form enctype=\"multipart/form-data\" "
-               "method=\"POST\" action=\"/post\" "
+               "method=\"POST\" action=\"post\" "
                "name=\"enterform\""
                ">\n");
        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("%s\n", buf);   /* header bar */
+       if (WC->room_flags & QR_ANONOPT) {
+               wprintf("&nbsp;"
+                       "<input type=\"checkbox\" name=\"is_anonymous\" value=\"yes\" %s>",
+                               (is_anonymous ? "checked" : "")
+               );
+               wprintf("Anonymous");
+       }
+       wprintf("<br>\n");      /* header bar */
 
        wprintf("<table border=\"0\" width=\"100%%\">\n");
        if (recipient_required) {
@@ -2594,7 +2679,7 @@ void display_enter(void)
                wprintf("<br>"
                        "<blockquote>");
                pullquote_message(atol(bstr("replyquote")), 0);
-               wprintf("</blockquote>");
+               wprintf("</blockquote>\n\n");
        }
 
        /* Insert our signature if appropriate... */
@@ -2641,14 +2726,21 @@ void display_enter(void)
                "<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\" "
+               "       mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\", "
+               "       theme : \"advanced\", plugins : \"iespell\", "
+               "       theme_advanced_buttons1 : \"bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code\", "
+               "       theme_advanced_buttons2 : \"\", "
+               "       theme_advanced_buttons3 : \"\" "
                "});"
                "</script>\n"
        );
 
+
        /* Enumerate any attachments which are already in place... */
-       wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
-               "align=middle height=16 width=16> Attachments: ");
+       wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
+               "align=middle height=16 width=16> ");
+       wprintf(_("Attachments:"));
+       wprintf(" ");
        wprintf("<select name=\"which_attachment\" size=1>");
        for (att = WC->first_attachment; att != NULL; att = att->next) {
                wprintf("<option value=\"");
@@ -2661,8 +2753,9 @@ void display_enter(void)
        wprintf("</select>");
 
        /* Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;"
-               "Attach file: <input NAME=\"attachfile\" "
+       wprintf("&nbsp;&nbsp;&nbsp;");
+       wprintf(_("Attach file:"));
+       wprintf(" <input NAME=\"attachfile\" "
                "SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
 
@@ -2690,10 +2783,6 @@ DONE:    wDumpContent(1);
 
 
 
-
-
-
-
 void delete_msg(void)
 {
        long msgid;
@@ -2703,7 +2792,13 @@ void delete_msg(void)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       if (WC->wc_is_trash) {  /* Delete from Trash is a real delete */
+               serv_printf("DELE %ld", msgid); 
+       }
+       else {                  /* Otherwise move it to Trash */
+               serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       }
+
        serv_getln(buf, sizeof buf);
        wprintf("<EM>%s</EM><br />\n", &buf[4]);
 
@@ -2739,7 +2834,7 @@ void confirm_move_msg(void)
        wprintf(_("Move this message to:"));
        wprintf("<br />\n");
 
-       wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
+       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");
@@ -2786,55 +2881,3 @@ void move_msg(void)
        readloop("readnew");
 
 }
-
-/*
- * This gets called when a user selects multiple messages in a summary
- * list and then clicks to perform a transformation of some sort on them
- * (such as deleting them).
- */
-void do_stuff_to_msgs(void) {
-       char buf[256];
-
-       struct stuff_t {
-               struct stuff_t *next;
-               long msgnum;
-       };
-
-       struct stuff_t *stuff = NULL;
-       struct stuff_t *ptr;
-       int delete_button_pressed = 0;
-
-
-       serv_puts("MSGS ALL");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               ptr = malloc(sizeof(struct stuff_t));
-               ptr->msgnum = atol(buf);
-               ptr->next = stuff;
-               stuff = ptr;
-       }
-
-       if (strlen(bstr("delete_button")) > 0) {
-               delete_button_pressed = 1;
-       }
-
-       while (stuff != NULL) {
-
-               sprintf(buf, "msg_%ld", stuff->msgnum);
-               if (!strcasecmp(bstr(buf), "yes")) {
-
-                       if (delete_button_pressed) {
-                               serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
-                               serv_getln(buf, sizeof buf);
-                       }
-
-               }
-
-               ptr = stuff->next;
-               free(stuff);
-               stuff = ptr;
-       }
-
-       readloop("readfwd");
-}