]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* Corrected overly-escaped reply-to addresses in "reply" button
[citadel.git] / webcit / messages.c
index 1c50808b754c444b4d0d954988297a096cea3ed6..ffe4a20f65d84f4895480b223cb6dfdb3b2f33d7 100644 (file)
@@ -368,6 +368,11 @@ void read_message(long msgnum) {
                return;
        }
 
+       /* begin everythingamundo table */
+       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");
 
@@ -493,56 +498,50 @@ void read_message(long msgnum) {
                wprintf("****");
        }
 
-       wprintf("</SPAN></TD>");
-
-       wprintf("<TD ALIGN=RIGHT>\n"
-               "<TABLE BORDER=0><TR>\n");
-
-       /***  "Read" button is now superfluous
-        ***
-        ***wprintf("<TD BGCOLOR=\"#AAAADD\">"
-        ***    "<A HREF=\"/readfwd?startmsg=%ld", msgnum);
-        ***wprintf("&maxmsgs=1&summary=0\">Read</A>"
-        ***    "</TD>\n", msgnum);
-        ***/
-
-       wprintf("<TD BGCOLOR=\"#AAAADD\">"
-               "<A HREF=\"/display_enter?recp=");
-       urlescputs(reply_to);
-       wprintf("\"><FONT SIZE=-1>Reply</FONT></A>"
-               "</TD>\n", msgnum);
+       wprintf("</SPAN>");
+       if (strlen(m_subject) > 0) {
+               wprintf("<BR>"
+                       "<SPAN CLASS=\"message_subject\">"
+                       "Subject: %s"
+                       "</SPAN>", m_subject
+               );
+       }
+       wprintf("</TD>\n");
 
-       if (WC->is_room_aide) {
-               wprintf("<TD BGCOLOR=\"#AAAADD\">"
-                       "<A HREF=\"/confirm_move_msg"
-                       "&msgid=%ld"
-                       "\"><FONT SIZE=-1>Move</FONT></A>"
-                       "</TD>\n", msgnum);
+       /* start msg buttons */
+       wprintf("<TD ALIGN=RIGHT>\n");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_one_msg\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%ld\">\n",
+               msgnum);
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
+       escputs(reply_to);
+       wprintf("\">\n");
 
-               wprintf("<TD BGCOLOR=\"#AAAADD\">"
-                       "<A HREF=\"/delete_msg"
-                       "&msgid=%ld\""
-                       "onClick=\"return confirm('Delete this message?');\""
-                       "><FONT SIZE=-1>Del</FONT></A>"
-                       "</TD>\n", msgnum);
+       if (!strncasecmp(m_subject, "Re:", 2)) {
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"");
+               escputs(m_subject);
+               wprintf("\">\n");
+       }
+       else if (strlen(m_subject) > 0) {
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"Re: ");
+               escputs(m_subject);
+               wprintf("\">\n");
        }
 
-       wprintf("</TR></TABLE>\n"
-               "</TD>\n");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Reply\">\n");
 
-       if (strlen(m_subject) > 0) {
-               wprintf("<TR><TD>"
-                       "<SPAN CLASS=\"message_subject\">"
-                       "Subject: %s"
-                       "</SPAN>"
-                       "</TD><TD>&nbsp;</TD></TR>\n", m_subject);
+       if (WC->is_room_aide)  {
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\"VALUE=\"Move\">\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Delete\""
+                       "onClick=\"return confirm('Delete this message?');\">\n");
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</FORM>\n"
+               "</TD></TR></TABLE>\n");
 
        /* Begin body */
        wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
-               "CELLPADDING=0 CELLSPACING=0><TR><TD>");
+               "CELLPADDING=1 CELLSPACING=0><TR><TD>");
 
        /* 
         * Learn the content type
@@ -573,11 +572,11 @@ void read_message(long msgnum) {
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
                        ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<SPAN CLASS=\"pull_quote\">");
+                               wprintf("<BLOCKQUOTE>");
                                bq = 1;
                        } else if ((bq == 1) &&
                                (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</SPAN>");
+                               wprintf("</BLOCKQUOTE>");
                                bq = 0;
                        }
                        wprintf("<TT>");
@@ -641,10 +640,13 @@ void read_message(long msgnum) {
 
 ENDBODY:
        wprintf("</TD></TR></TABLE>\n");
+
+       /* end everythingamundo table */
+       wprintf("</TD></TR></TABLE><BR>\n");
 }
 
 
-void summarize_message(long msgnum) {
+void summarize_message(long msgnum, int is_new) {
        char buf[SIZ];
 
        struct {
@@ -658,7 +660,7 @@ void summarize_message(long msgnum) {
        memset(&summ, 0, sizeof(summ));
        strcpy(summ.subj, "(no subject)");
 
-       sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
+       sprintf(buf, "MSG0 %ld|3", msgnum);     /* ask for headers only with no MIME */
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '1') return;
@@ -695,14 +697,22 @@ void summarize_message(long msgnum) {
                }
        }
 
-       wprintf("<TD><A HREF=\"/readfwd?startmsg=%ld"
+       wprintf("<TD>");
+       if (is_new) wprintf("<B>");
+       wprintf("<A HREF=\"/readfwd?startmsg=%ld"
                "&maxmsgs=1&summary=0\">", 
                msgnum);
        escputs(summ.subj);
-       wprintf("</A></TD><TD>");
+       wprintf("</A>");
+       if (is_new) wprintf("</B>");
+       wprintf("</TD><TD>");
+       if (is_new) wprintf("<B>");
        escputs(summ.from);
+       if (is_new) wprintf("</B>");
        wprintf(" </TD><TD>");
+       if (is_new) wprintf("<B>");
        escputs(summ.date);
+       if (is_new) wprintf("</B>");
        wprintf(" </TD>");
        wprintf("<TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
@@ -808,6 +818,7 @@ void fetch_ab_name(long msgnum, char *namebuf) {
        int mime_length;
        char vcard_partnum[SIZ];
        char *vcard_source = NULL;
+       int i;
 
        struct {
                char date[SIZ];
@@ -855,6 +866,11 @@ void fetch_ab_name(long msgnum, char *namebuf) {
        }
 
        lastfirst_firstlast(namebuf);
+       striplt(namebuf);
+       for (i=0; i<strlen(namebuf); ++i) {
+               if (namebuf[i] != ';') return;
+       }
+       strcpy(namebuf, "(no name)");
 }
 
 
@@ -870,39 +886,99 @@ int abcmp(const void *ab1, const void *ab2) {
 }
 
 
+/*
+ * Helper function for do_addrbook_view()
+ * Converts a name into a three-letter tab label
+ */
+void nametab(char *tabbuf, char *name) {
+       stresc(tabbuf, name, 0, 0);
+       tabbuf[0] = toupper(tabbuf[0]);
+       tabbuf[1] = tolower(tabbuf[1]);
+       tabbuf[2] = tolower(tabbuf[2]);
+       tabbuf[3] = 0;
+}
+
+
 /*
  * Render the address book using info we gathered during the scan
  */
 void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        int i = 0;
+       int displayed = 0;
        int bg = 0;
+       static int NAMESPERPAGE = 60;
+       int num_pages = 0;
+       int page = 0;
+       int tabfirst = 0;
+       char tabfirst_label[SIZ];
+       int tablast = 0;
+       char tablast_label[SIZ];
+
+       if (num_ab == 0) {
+               wprintf("<I>This address book is empty.</I>\n");
+               return;
+       }
 
        if (num_ab > 1) {
                qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
        }
 
+       num_pages = num_ab / NAMESPERPAGE;
+
+       page = atoi(bstr("page"));
+
+       wprintf("Page: ");
+       for (i=0; i<=num_pages; ++i) {
+               if (i != page) {
+                       wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+               }
+               else {
+                       wprintf("<B>");
+               }
+               tabfirst = i * NAMESPERPAGE;
+               tablast = tabfirst + NAMESPERPAGE - 1;
+               if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+               nametab(tabfirst_label, addrbook[tabfirst].ab_name);
+               nametab(tablast_label, addrbook[tablast].ab_name);
+               wprintf("[%s&nbsp;-&nbsp;%s]",
+                       tabfirst_label, tablast_label
+               );
+               if (i != page) {
+                       wprintf("</A>\n");
+               }
+               else {
+                       wprintf("</B>\n");
+               }
+       }
+       wprintf("<BR>\n");
+
        wprintf("<TABLE border=0 cellspacing=0 "
                "cellpadding=3 width=100%%>\n"
        );
 
        for (i=0; i<num_ab; ++i) {
 
-               if ((i % 4) == 0) {
-                       if (i > 0) {
-                               wprintf("</TR>\n");
+               if ((i / NAMESPERPAGE) == page) {
+
+                       if ((displayed % 4) == 0) {
+                               if (displayed > 0) {
+                                       wprintf("</TR>\n");
+                               }
+                               bg = 1 - bg;
+                               wprintf("<TR BGCOLOR=\"#%s\">",
+                                       (bg ? "DDDDDD" : "FFFFFF")
+                               );
                        }
-                       bg = 1 - bg;
-                       wprintf("<TR BGCOLOR=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
-                       );
+       
+                       wprintf("<TD>");
+       
+                       wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+                               addrbook[i].ab_msgnum);
+                       wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
+                       escputs(addrbook[i].ab_name);
+                       wprintf("</A></TD>\n");
+                       ++displayed;
                }
-
-               wprintf("<TD>");
-               wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
-                       addrbook[i].ab_msgnum);
-               wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
-               escputs(addrbook[i].ab_name);
-               wprintf("</A></TD>\n");
        }
 
        wprintf("</TR></TABLE>\n");
@@ -917,8 +993,10 @@ int load_msg_ptrs(char *servcmd)
 {
        char buf[SIZ];
        int nummsgs;
+       int maxload = 0;
 
        nummsgs = 0;
+       maxload = sizeof(WC->msgarr) / sizeof(long) ;
        serv_puts(servcmd);
        serv_gets(buf);
        if (buf[0] != '1') {
@@ -926,9 +1004,10 @@ int load_msg_ptrs(char *servcmd)
                return (nummsgs);
        }
        while (serv_gets(buf), strcmp(buf, "000")) {
-               WC->msgarr[nummsgs] = atol(buf);
-               /* FIXME check for overflow */
-               ++nummsgs;
+               if (nummsgs < maxload) {
+                       WC->msgarr[nummsgs] = atol(buf);
+                       ++nummsgs;
+               }
        }
        return (nummsgs);
 }
@@ -941,7 +1020,9 @@ void readloop(char *oper)
 {
        char cmd[SIZ];
        char buf[SIZ];
-       int a, b, i;
+       char old_msgs[SIZ];
+       int is_new = 0;
+       int a, b;
        int nummsgs;
        long startmsg;
        int maxmsgs;
@@ -951,6 +1032,7 @@ void readloop(char *oper)
        int is_singlecard = 0;
        int is_calendar = 0;
        int is_tasks = 0;
+       int is_notes = 0;
        int remaining_messages;
        int lo, hi;
        int lowest_displayed = (-1);
@@ -959,94 +1041,85 @@ void readloop(char *oper)
        long pn_current = 0L;
        long pn_next = 0L;
        int bg = 0;
-       char alpha = 0;
-       char ab_alpha = 0;
        struct addrbookent *addrbook = NULL;
        int num_ab = 0;
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
        is_summary = atoi(bstr("summary"));
-       if (maxmsgs == 0) maxmsgs = 20;
+       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
 
        output_headers(1);
 
+       /* When in summary mode, always show ALL messages instead of just
+        * new or old.  Otherwise, show what the user asked for.
+        */
        if (!strcmp(oper, "readnew")) {
                strcpy(cmd, "MSGS NEW");
-       } else if (!strcmp(oper, "readold")) {
+       }
+       else if (!strcmp(oper, "readold")) {
                strcpy(cmd, "MSGS OLD");
-       } else {
+       }
+       else {
                strcpy(cmd, "MSGS ALL");
        }
 
-       /* FIXME put in the correct constant #defs */
-       if ((WC->wc_view == 1) && (maxmsgs > 1)) {
+       if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
                is_summary = 1;
                strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
        }
 
-       if ((WC->wc_view == 2) && (maxmsgs > 1)) {
+       if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
                is_addressbook = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
 
-       is_singlecard = atoi(bstr("is_singlecard"));
-
-       /* Display the letter indices across the top */
-       if ((is_addressbook) || (is_singlecard)) {
-               if (strlen(bstr("alpha")) == 0) {
-                       alpha = 'a';
-               }
-               else {
-                       strcpy(buf, bstr("alpha"));
-                       alpha = buf[0];
-               }
+       if (is_summary) {
+               strcpy(cmd, "MSGS ALL");
+       }
 
-               for (i='1'; i<='z'; ++i) if ((i=='1')||(islower(i))) {
-                       if ((i != alpha) || (is_singlecard)) {
-                               wprintf("<A HREF=\"/readfwd?alpha=%c\">", i);
-                       }
-                       if (i == alpha) wprintf("<FONT SIZE=+2>");
-                       if (isalpha(i)) {
-                               wprintf("%c", toupper(i));
-                       }
-                       else {
-                               wprintf("(other)");
-                       }
-                       if (i == alpha) wprintf("</FONT>");
-                       if ((i != alpha) || (is_singlecard)) {
-                               wprintf("</A>\n");
-                       }
-                       wprintf("&nbsp;");
+       /* Are we doing a summary view?  If so, we need to know old messages
+        * and new messages, so we can do that pretty boldface thing for the
+        * new messages.
+        */
+       strcpy(old_msgs, "");
+       if (is_summary) {
+               serv_puts("GTSN");
+               serv_gets(buf);
+               if (buf[0] == '2') {
+                       strcpy(old_msgs, &buf[4]);
                }
-
-               wprintf("<HR width=100%%>\n");
        }
 
-       if (WC->wc_view == 3) {         /* calendar */
+       is_singlecard = atoi(bstr("is_singlecard"));
+
+       if (WC->wc_view == VIEW_CALENDAR) {             /* calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
-       if (WC->wc_view == 4) {         /* tasks */
+       if (WC->wc_view == VIEW_TASKS) {                /* tasks */
                is_tasks = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
-               wprintf("<UL>");
+       }
+       if (WC->wc_view == VIEW_NOTES) {                /* notes */
+               is_notes = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
        }
 
        nummsgs = load_msg_ptrs(cmd);
        if (nummsgs == 0) {
 
-               if ((!is_tasks) && (!is_calendar)) {
+               if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
                        if (!strcmp(oper, "readnew")) {
-                               wprintf("<EM>No new messages in this room.</EM>\n");
+                               wprintf("<EM>No new messages.</EM>\n");
                        } else if (!strcmp(oper, "readold")) {
-                               wprintf("<EM>No old messages in this room.</EM>\n");
+                               wprintf("<EM>No old messages.</EM>\n");
                        } else {
-                               wprintf("<EM>This room is empty.</EM>\n");
+                               wprintf("<EM>No messages here.</EM>\n");
                        }
                }
 
@@ -1078,6 +1151,17 @@ void readloop(char *oper)
        for (a = 0; a < nummsgs; ++a) {
                if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
+                       /* Are you a new message, or an old message? */
+                       is_new = 0;
+                       if (is_summary) {
+                               if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
+                                       is_new = 0;
+                               }
+                               else {
+                                       is_new = 1;
+                               }
+                       }
+
                        /* Learn which msgs "Prev" & "Next" buttons go to */
                        pn_current = WC->msgarr[a];
                        if (a > 0) pn_previous = WC->msgarr[a-1];
@@ -1093,24 +1177,16 @@ void readloop(char *oper)
 
                        /* Display the message */
                        if (is_summary) {
-                               summarize_message(WC->msgarr[a]);
+                               summarize_message(WC->msgarr[a], is_new);
                        }
                        else if (is_addressbook) {
                                fetch_ab_name(WC->msgarr[a], buf);
-                               if ((strlen(buf) > 0) && (isalpha(buf[0]))) {
-                                       ab_alpha = tolower(buf[0]);
-                               }
-                               else {
-                                       ab_alpha = '1';
-                               }
-                               if (alpha == ab_alpha) {
-                                       ++num_ab;
-                                       addrbook = realloc(addrbook,
-                                               (sizeof(struct addrbookent) * num_ab) );
-                                       safestrncpy(addrbook[num_ab-1].ab_name, buf,
-                                               sizeof(addrbook[num_ab-1].ab_name));
-                                       addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
-                               }
+                               ++num_ab;
+                               addrbook = realloc(addrbook,
+                                       (sizeof(struct addrbookent) * num_ab) );
+                               safestrncpy(addrbook[num_ab-1].ab_name, buf,
+                                       sizeof(addrbook[num_ab-1].ab_name));
+                               addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
                        }
                        else if (is_calendar) {
                                display_calendar(WC->msgarr[a]);
@@ -1118,6 +1194,9 @@ void readloop(char *oper)
                        else if (is_tasks) {
                                display_task(WC->msgarr[a]);
                        }
+                       else if (is_notes) {
+                               display_note(WC->msgarr[a]);
+                       }
                        else {
                                read_message(WC->msgarr[a]);
                        }
@@ -1139,10 +1218,6 @@ void readloop(char *oper)
                wprintf("</TABLE>\n");
        }
 
-       if (is_tasks) {
-               wprintf("</UL>\n");
-       }
-
        /* Bump these because although we're thinking in zero base, the user
         * is a drooling idiot and is thinking in one base.
         */
@@ -1151,7 +1226,7 @@ void readloop(char *oper)
 
        /* If we're only looking at one message, do a prev/next thing */
        if (num_displayed == 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
 
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
@@ -1195,13 +1270,12 @@ 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_singlecard)) {
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
                        "Reading #%d-%d of %d messages.</TD>\n"
@@ -1256,9 +1330,7 @@ void readloop(char *oper)
 
 DONE:
        if (is_tasks) {
-               wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
-                       "Add new task</A>\n"
-               );
+               do_tasks_view();        /* Render the task list */
        }
 
        if (is_calendar) {
@@ -1285,7 +1357,7 @@ void post_mime_to_server(void) {
        struct wc_attachment *att;
        char *encoded;
        size_t encoded_length;
-       
+
        /* If there are attachments, we have to do multipart/mixed */
        if (WC->first_attachment != NULL) {
                is_multipart = 1;
@@ -1307,7 +1379,10 @@ void post_mime_to_server(void) {
 
        serv_puts("Content-type: text/html");
        serv_puts("");
-       text_to_server(bstr("msgtext"), 1);
+       serv_puts("<HTML><BODY>\n");
+       text_to_server(bstr("msgtext"), 0);
+       serv_puts("</BODY></HTML>\n");
+       
 
        if (is_multipart) {
 
@@ -1352,17 +1427,27 @@ void post_message(void)
 {
        char buf[SIZ];
        static long dont_post = (-1L);
-       struct wc_attachment *att;
+       struct wc_attachment *att, *aptr;
 
        if (WC->upload_length > 0) {
 
+               /* There's an attachment.  Save it to this struct... */
                att = malloc(sizeof(struct wc_attachment));
                memset(att, 0, sizeof(struct wc_attachment));
-               att->next = WC->first_attachment;
-               WC->first_attachment = att;
                att->length = WC->upload_length;
                strcpy(att->content_type, WC->upload_content_type);
                strcpy(att->filename, WC->upload_filename);
+               att->next = NULL;
+
+               /* And add it to the list. */
+               if (WC->first_attachment == NULL) {
+                       WC->first_attachment = att;
+               }
+               else {
+                       aptr = WC->first_attachment;
+                       while (aptr->next != NULL) aptr = aptr->next;
+                       aptr->next = att;
+               }
 
                /* Netscape sends a simple filename, which is what we want,
                 * but Satan's browser sends an entire pathname.  Reduce
@@ -1385,9 +1470,12 @@ void post_message(void)
                return;
        }
 
-       if (strcasecmp(bstr("sc"), "Save message")) {
+       if (!strcasecmp(bstr("sc"), "Cancel")) {
                sprintf(WC->ImportantMessage, 
                        "Cancelled.  Message was not posted.");
+       } else if (!strcasecmp(bstr("attach"), "Add")) {
+               display_enter();
+               return;
        } else if (atol(bstr("postseq")) == dont_post) {
                sprintf(WC->ImportantMessage, 
                        "Automatically cancelled because you have already "
@@ -1426,17 +1514,35 @@ void display_enter(void)
        struct wc_attachment *att;
 
        if (strlen(bstr("force_room")) > 0) {
-               gotoroom(bstr("force_room"), 0);
+               gotoroom(bstr("force_room"));
        }
 
        /* Are we perhaps in an address book view?  If so, then an "enter
         * message" command really means "add new entry."
         */
-       if (WC->wc_view == 2) {
+       if (WC->wc_view == VIEW_ADDRESSBOOK) {
                do_edit_vcard(-1, "", "");
                return;
        }
 
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       /* Are we perhaps in a calendar view?  If so, then an "enter
+        * message" command really means "add new calendar item."
+        */
+       if (WC->wc_view == VIEW_CALENDAR) {
+               display_edit_event();
+               return;
+       }
+
+       /* Are we perhaps in a tasks view?  If so, then an "enter
+        * message" command really means "add new task."
+        */
+       if (WC->wc_view == VIEW_TASKS) {
+               display_edit_task();
+               return;
+       }
+#endif
+
        /* Otherwise proceed normally */
        output_headers(1);
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
@@ -1461,13 +1567,13 @@ void display_enter(void)
        now = time(NULL);
        fmt_date(buf, now);
        strcat(&buf[strlen(buf)], " <I>from</I> ");
-       stresc(&buf[strlen(buf)], WC->wc_username, 1);
+       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
        if (strlen(bstr("recp")) > 0) {
                strcat(&buf[strlen(buf)], " <I>to</I> ");
-               stresc(&buf[strlen(buf)], bstr("recp"), 1);
+               stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
        }
        strcat(&buf[strlen(buf)], " <I>in</I> ");
-       stresc(&buf[strlen(buf)], WC->wc_roomname, 1);
+       stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
        svprintf("BOXTITLE", WCS_STRING, buf);
        do_template("beginbox");
 
@@ -1475,25 +1581,57 @@ void display_enter(void)
 
        wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
                "METHOD=\"POST\" ACTION=\"/post\" "
-               "NAME=\"enterform\">\n");
+               "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("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \" "
-               "onLoad=\"document.enterform.msgtext.focus();\" >");
+
+       wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
+       wprintf("<TR><TD ALIGN=LEFT>");
+       wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \">");
+               /* "onLoad=\"document.enterform.msgtext.focus();\" " */
        wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
                "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
        escputs(bstr("subject"));
-       wprintf("\" MAXLENGTH=70>"
-               "&nbsp;&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+       wprintf("\" SIZE=40 MAXLENGTH=70>"
+               "&nbsp;"
+       );
+       wprintf("</TD>");
+
+       wprintf("<TD ALIGN=RIGHT>");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+               "&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
+       wprintf("<SCRIPT language=\"JavaScript\" type=\"text/javascript\" "
+               "src=\"static/richtext_compressed.js\"></SCRIPT>\n"
+               "<SCRIPT language=\"JavaScript\" 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 language=\"javascript\" type=\"text/javascript\"> \n"
+               "writeRichText('msgtext', '");
+       msgescputs(bstr("msgtext"));
+       wprintf("', '100%%', 200, true, false); \n"
+               "</script> \n");
+
+/*
+ * Before we had the richedit widget, we did it this way...
+ *
        wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
                "WIDTH=80>");
        escputs(bstr("msgtext"));
        wprintf("</TEXTAREA><BR>\n");
+ */
 
        /* Enumerate any attachments which are already in place... */
        for (att = WC->first_attachment; att != NULL; att = att->next) {
@@ -1505,7 +1643,8 @@ void display_enter(void)
        }
 
        /* Now offer the ability to attach additional files... */
-       wprintf("Attach file: <input NAME=\"attachfile\" "
+       wprintf("&nbsp;&nbsp;&nbsp;"
+               "Attach file: <input NAME=\"attachfile\" "
                "SIZE=48 TYPE=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
 
@@ -1554,14 +1693,14 @@ void confirm_move_msg(void)
 
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
        wprintf("<B>Confirm move of message</B>\n");
        wprintf("</FONT></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
 
-       wprintf("Please select the room to which you would like this message moved:<BR>\n");
+       wprintf("Move this message to:<BR>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
@@ -1583,6 +1722,7 @@ void confirm_move_msg(void)
        wprintf("<BR>\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
        wprintf("</FORM></CENTER>\n");
 
@@ -1613,8 +1753,37 @@ void move_msg(void)
        wDumpContent(1);
 }
 
+/*
+ * This gets called when a user selects Reply/Move/Del etc. on *one* message.
+ */
+void do_stuff_to_one_msg(void) {
+       char *msg_oper;
 
+       msg_oper = bstr("msg_oper");
 
+       if (!strcasecmp(msg_oper, "Delete")) {
+               delete_msg();   /* It's already been confirmed using JS */
+               return;
+       }
+       if (!strcasecmp(msg_oper, "Move")) {
+               confirm_move_msg();
+               return;
+       }
+       if (!strcasecmp(msg_oper, "Reply")) {
+               display_enter();        /* recp and subject already set */
+               return;
+       }
+
+       /* should never get here.  FIXME: display an error */
+
+}
+
+
+/*
+ * This gets called when a user selects multiple messages in a summary
+ * list and then clicks to perform a transformation of some sort on them
+ * (such as deleting them).
+ */
 void do_stuff_to_msgs(void) {
        char buf[SIZ];
        char sc[SIZ];