war on old style
[citadel.git] / webcit-ng / static / js / view_mail.js
index aed72f99bd6488184eda5ae00b4bf8f8be5bb10e..fac046decf109e5b9fc85b94144d5967d1dff155 100644 (file)
@@ -10,6 +10,23 @@ var selected_message = 0;                                                    // Remember the last message that was selected
 var RefreshMailboxInterval;                                                    // We store our refresh timer here
 
 
+// Render reply address for a message (FIXME we might want to figure out in-reply-to)
+function reply_addr(msg) {
+       if (msg.locl) {
+               return([msg.from]);
+       }
+       else {
+               return([msg.from + " <" + msg.rfca + ">"]);
+       }
+}
+
+
+// Render the To: recipients for a reply-all operation
+function replyall_to(msg) {
+       return([...reply_addr(msg), ...msg.rcpt]);
+}
+
+
 // Render a message into the mailbox view
 // (We want the message number and the message itself because we need to keep the msgnum for reply purposes)
 function mail_render_one(msgnum, msg, target_div, include_controls) {
@@ -33,13 +50,13 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                        + "<span class=\"ctdl-msg-header-buttons\">"            // begin buttons on right side
                
                        + "<span class=\"ctdl-msg-button\">"                    // Reply (mail is always Quoted)
-                       + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', '', '', 'Re: '+msg.subj);\">"
+                       + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', reply_addr(msg), [], 'Re: '+msg.subj);\">"
                        + "<i class=\"fa fa-reply\"></i> " 
                        + _("Reply")
                        + "</a></span>"
                
                        + "<span class=\"ctdl-msg-button\">"                    // Reply-All (mail is always Quoted)
-                       + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', '', '', 'Re: '+msg.subj);\">"
+                       + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', replyall_to(msg), msg.cccc, 'Re: '+msg.subj);\">"
                        + "<i class=\"fa fa-reply-all\"></i> " 
                        + _("ReplyAll")
                        + "</a></span>";
@@ -55,10 +72,37 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                
                        outmsg +=
                          "</span>";                                            // end buttons on right side
+
+                       // Display the To: recipients, if any are present
+                       if (msg.rcpt) {
+                               outmsg += "<br><span>" + _("To:") + " ";
+                               for (var r=0; r<msg.rcpt.length; ++r) {
+                                       if (r != 0) {
+                                               outmsg += ", ";
+                                       }
+                                       outmsg += escapeHTML(msg.rcpt[r]);
+                               }
+                               outmsg += "</span>";
+                       }
+
+                       // Display the Cc: recipients, if any are present
+                       if (msg.cccc) {
+                               outmsg += "<br><span>" + _("Cc:") + " ";
+                               for (var r=0; r<msg.cccc.length; ++r) {
+                                       if (r != 0) {
+                                               outmsg += ", ";
+                                       }
+                                       outmsg += escapeHTML(msg.cccc[r]);
+                               }
+                               outmsg += "</span>";
+                       }
+
+                       // Display a subject line, but only if the message has a subject (internal Citadel messages often don't)
                        if (msg.subj) {
                                outmsg +=
                                "<br><span class=\"ctdl-msgsubject\">" + msg.subj + "</span>";
                        }
+
                        outmsg +=
                          "</div>";                                             // end header
                }
@@ -216,7 +260,39 @@ function render_mailbox_display() {
 
 
 // Compose a new mail message (called by the Reply button here, or by the dispatcher in views.js)
-function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
+function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subject) {
+       console.log("mail_compose()");
+
+       // m_to will be an array of zero or more recipients for the To: field.  Convert it to a string.
+       if (m_to) {
+               m_to = Array.from(new Set(m_to));       // remove dupes
+               m_to_str = "";
+               for (i=0; i<m_to.length; ++i) {
+                       if (i > 0) {
+                               m_to_str += ", ";
+                       }
+                       m_to_str += m_to[i].replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+               }
+       }
+       else {
+               m_to_str = "";
+       }
+
+       // m_to will be an array of zero or more recipients for the Cc: field.  Convert it to a string.
+       if (m_cc) {
+               m_cc = Array.from(new Set(m_cc));       // remove dupes
+               m_cc_str = "";
+               for (i=0; i<m_cc.length; ++i) {
+                       if (i > 0) {
+                               m_cc_str += ", ";
+                       }
+                       m_cc_str += m_cc[i].replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+               }
+       }
+       else {
+               m_cc_str = "";
+       }
+
        quoted_div_name = randomString();
 
        // Make the "Write mail" button disappear.  We're already there!
@@ -238,7 +314,7 @@ function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
                // Visible To: field, plus a box to make the CC/BCC lines appear
                + "<div class=\"ctdl-compose-to-label\">" + _("To:") + "</div>"
                + "<div class=\"ctdl-compose-to-line\">"
-               + "<div class=\"ctdl-compose-to-field\" id=\"ctdl-compose-to-field\" contenteditable=\"true\">" + m_to + "</div>"
+               + "<div class=\"ctdl-compose-to-field\" id=\"ctdl-compose-to-field\" contenteditable=\"true\">" + m_to_str + "</div>"
                + "<div class=\"ctdl-cc-bcc-buttons ctdl-msg-button\" id=\"ctdl-cc-bcc-buttons\" "
                + "onClick=\"make_cc_bcc_visible()\">"
                + _("CC:") + "/" + _("BCC:") + "</div>"
@@ -246,7 +322,7 @@ function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
 
                // CC/BCC
                + "<div class=\"ctdl-compose-cc-label\" id=\"ctdl-compose-cc-label\">" + _("CC:") + "</div>"
-               + "<div class=\"ctdl-compose-cc-field\" id=\"ctdl-compose-cc-field\" contenteditable=\"true\">" + m_cc + "</div>"
+               + "<div class=\"ctdl-compose-cc-field\" id=\"ctdl-compose-cc-field\" contenteditable=\"true\">" + m_cc_str + "</div>"
                + "<div class=\"ctdl-compose-bcc-label\" id=\"ctdl-compose-bcc-label\">" + _("BCC:") + "</div>"
                + "<div class=\"ctdl-compose-bcc-field\" id=\"ctdl-compose-bcc-field\" contenteditable=\"true\"></div>"
 
@@ -259,11 +335,7 @@ function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
        ;
 
        if (is_quoted) {
-               compose_screen +=
-                         "<br><br><blockquote><div id=\"" + quoted_div_name + "\">"
-                       + "FIXME get the quoted message into here"
-                       + "</div></blockquote>";
-               ;
+               compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\"></div></blockquote>";
        }
 
        compose_screen +=
@@ -271,7 +343,7 @@ function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
 
                // The button bar is a Grid element, and is also a Flexbox container.
                + "<div class=\"ctdl-compose-toolbar\">"
-               + "<span class=\"ctdl-msg-button\" onclick=\"mail_save_message()\"><i class=\"fa fa-paper-plane\" style=\"color:green\"></i> " + _("Send message") + "</span>"
+               + "<span class=\"ctdl-msg-button\" onclick=\"mail_send_message()\"><i class=\"fa fa-paper-plane\" style=\"color:green\"></i> " + _("Send message") + "</span>"
                + "<span class=\"ctdl-msg-button\">" + _("Save to Drafts") + "</span>"
                + "<span class=\"ctdl-msg-button\">" + _("Attachments:") + " 0" + "</span>"
                + "<span class=\"ctdl-msg-button\">" + _("Contacts") + "</span>"
@@ -280,20 +352,22 @@ function mail_compose(is_quoted, references, msgnum, m_to, m_cc, m_subject) {
        ;
 
        document.getElementById("ctdl-main").innerHTML = compose_screen;
-       mail_display_message(msgnum, document.getElementById(quoted_div_name), 0);
+       mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
+       if (m_cc) {
+               document.getElementById("ctdl-compose-cc-label").style.display = "block";
+               document.getElementById("ctdl-compose-cc-field").style.display = "block";
+       }
 }
 
 
 function make_cc_bcc_visible() {
        document.getElementById("ctdl-cc-bcc-buttons").style.display = "none";
-       document.getElementById("ctdl-compose-cc-label").style.display = "block";
-       document.getElementById("ctdl-compose-cc-field").style.display = "block";
        document.getElementById("ctdl-compose-bcc-label").style.display = "block";
        document.getElementById("ctdl-compose-bcc-field").style.display = "block";
 }
 
 
-// Helper function for mail_save_messages() to extract form values.
+// Helper function for mail_send_messages() to extract form values.
 // (We have to replace "|" with "!" because "|" is a field separator in the Citadel protocol)
 function msm_field(element_name, separator) {
        return (document.getElementById(element_name).innerHTML).replaceAll("|",separator);
@@ -301,7 +375,7 @@ function msm_field(element_name, separator) {
 
 
 // Save the posted message to the server
-function mail_save_message() {
+function mail_send_message() {
 
        document.body.style.cursor = "wait";
        url = "/ctdl/r/" + escapeHTMLURI(current_room)
@@ -312,6 +386,7 @@ function mail_save_message() {
                + "&mailcc="    + msm_field("ctdl-compose-cc-field", ",")                       // Cc: (if present)
                + "&mailbcc="   + msm_field("ctdl-compose-bcc-field", ",")                      // Bcc: (if present)
        ;
+       console.log(url);
        boundary = randomString();
        body_text =
                "--" + boundary + "\r\n"