]> code.citadel.org Git - citadel.git/blobdiff - webcit-ng/static/js/view_mail.js
Make the CC: line appear if there is already something in it.
[citadel.git] / webcit-ng / static / js / view_mail.js
index b33fbc691ccc6186e53b3107f9fa07659862468d..d524c7988f1a71b4d6a86f1846f21629eb332b46 100644 (file)
@@ -10,47 +10,105 @@ 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
-function mail_render_one(msg, target_div) {
+// (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) {
        let div = "FIXME";
        try {
                outmsg =
                  "<div class=\"ctdl-mmsg-wrapper\">"                           // begin message wrapper
-               + render_userpic(msg.from)                                      // user avatar
-               + "<div class=\"ctdl-mmsg-content\">"                           // begin content
-               + "<div class=\"ctdl-msg-header\">"                             // begin header
-               + "<span class=\"ctdl-msg-header-info\">"                       // begin header info on left side
-               + render_msg_author(msg)
-               + "<span class=\"ctdl-msgdate\">"
-               + string_timestamp(msg.time,0)
-               + "</span>"                                                     // end msgdate
-               + "</span>"                                                     // end header info on left side
-               + "<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+"','"+msg.msgn+"');\">"
-               + "<i class=\"fa fa-reply\"></i> " 
-               + _("Reply")
-               + "</a></span>";
-       
-               if (can_delete_messages) {
+               ;
+
+               if (include_controls) {                                         // omit controls if this is a pull quote
                        outmsg +=
-                       "<span class=\"ctdl-msg-button\">"
-                       + "<a href=\"javascript:forum_delete_message('"+div+"','"+msg.msgnum+"');\">"
-                       + "<i class=\"fa fa-trash\"></i> " 
-                       + _("Delete")
+                         render_userpic(msg.from)                              // user avatar
+                       + "<div class=\"ctdl-mmsg-content\">"                   // begin content
+                       + "<div class=\"ctdl-msg-header\">"                     // begin header
+                       + "<span class=\"ctdl-msg-header-info\">"               // begin header info on left side
+                       + render_msg_author(msg)
+                       + "<span class=\"ctdl-msgdate\">"
+                       + string_timestamp(msg.time,0)
+                       + "</span>"                                             // end msgdate
+                       + "</span>"                                             // end header info on left side
+                       + "<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+"', 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+"', replyall_to(msg), msg.cccc, 'Re: '+msg.subj);\">"
+                       + "<i class=\"fa fa-reply-all\"></i> " 
+                       + _("ReplyAll")
                        + "</a></span>";
-               }
-       
-               outmsg +=
-                 "</span>";                                                    // end buttons on right side
-               if (msg.subj) {
+               
+                       if (can_delete_messages) {
+                               outmsg +=
+                               "<span class=\"ctdl-msg-button\">"
+                               + "<a href=\"javascript:forum_delete_message('"+div+"','"+msg.msgnum+"');\">"
+                               + "<i class=\"fa fa-trash\"></i> " 
+                               + _("Delete")
+                               + "</a></span>";
+                       }
+               
+                       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 +=
-                       "<br><span class=\"ctdl-msgsubject\">" + msg.subj + "</span>";
+                         "</div>";                                             // end header
                }
+
                outmsg +=
-                 "</div>"                                                      // end header
-               + "<div class=\"ctdl-msg-body\" id=\"" + div + "_body\">"       // begin body
+                 "<div class=\"ctdl-msg-body\" id=\"" + div + "_body\">"       // begin body
                + msg.text
                + "</div>"                                                      // end body
                + "</div>"                                                      // end content
@@ -65,14 +123,14 @@ function mail_render_one(msg, target_div) {
 }
 
 
-// display an individual message
-function mail_display_message(msgnum, target_div) {
+// display an individual message (note: this wants an actual div object, not a string containing the name of a div)
+function mail_display_message(msgnum, target_div, include_controls) {
        url = "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgnum + "/json";
        mail_fetch_msg = async() => {
                response = await fetch(url);
                msg = await(response.json());
                if (response.ok) {
-                       mail_render_one(msg, target_div);
+                       mail_render_one(msgnum, msg, target_div, include_controls);
                }
        }
        mail_fetch_msg();
@@ -95,7 +153,7 @@ function select_message(msgnum) {
        // display the message if it isn't already displayed
        if (selected_message != msgnum) {
                selected_message = msgnum;
-               mail_display_message(msgnum, document.getElementById("ctdl-mailbox-reading-pane"));
+               mail_display_message(msgnum, document.getElementById("ctdl-mailbox-reading-pane"), 1);
        }
 }
 
@@ -202,7 +260,40 @@ 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, msgid) {
+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!
        document.getElementById("ctdl-newmsg-button").style.display = "none";
@@ -212,12 +303,10 @@ function mail_compose(is_quoted, references, msgid) {
        // msgid        if a reply, the msgid of the most recent message in the chain, the one to which we are replying
 
        // Now display the screen.
-       document.getElementById("ctdl-main").innerHTML
-
+       compose_screen =
                // Hidden values that we are storing right here in the document tree for later
-               = "<input id=\"ctdl_mc_is_quoted\" style=\"display:none\" value=\"" + is_quoted + "\"></input>"
+                 "<input id=\"ctdl_mc_is_quoted\" style=\"display:none\" value=\"" + is_quoted + "\"></input>"
                + "<input id=\"ctdl_mc_references\" style=\"display:none\" value=\"" + references + "\"></input>"
-               + "<input id=\"ctdl_mc_reply_msgid\" style=\"display:none\" value=\"" + msgid + "\"></input>"
 
                // Header fields, the composition window, and the button bar are arranged using a Grid layout.
                + "<div id=\"ctdl-compose-mail\" class=\"ctdl-compose-mail\">"
@@ -225,7 +314,7 @@ function mail_compose(is_quoted, references, msgid) {
                // 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\"></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>"
@@ -233,33 +322,46 @@ function mail_compose(is_quoted, references, msgid) {
 
                // 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\"></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>"
 
                // Visible subject field
                + "<div class=\"ctdl-compose-subject-label\">" + _("Subject:") + "</div>"
-               + "<div class=\"ctdl-compose-subject-field\" id=\"ctdl-compose-subject-field\" contenteditable=\"true\"></div>"
+               + "<div class=\"ctdl-compose-subject-field\" id=\"ctdl-compose-subject-field\" contenteditable=\"true\">" + m_subject + "</div>"
 
                // Message composition box
                + "<div class=\"ctdl-compose-message-box\" id=\"ctdl-editor-body\" contenteditable=\"true\">"
-               + "</div>"
+       ;
+
+       if (is_quoted) {
+               compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\"></div></blockquote>";
+       }
+
+       compose_screen +=
+                 "</div>"
 
                // 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-check\" style=\"color:green\"></i> " + _("Send message") + "</span>"
+               + "<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\">" + _("Save to Drafts") + "</span>"
                + "<span class=\"ctdl-msg-button\">" + _("Attachments:") + " 0" + "</span>"
                + "<span class=\"ctdl-msg-button\">" + _("Contacts") + "</span>"
                + "<span class=\"ctdl-msg-button\" onClick=\"gotoroom(current_room)\"><i class=\"fa fa-trash\" style=\"color:red\"></i> " + _("Cancel") + "</span>"
                + "</div>"
        ;
+
+       document.getElementById("ctdl-main").innerHTML = compose_screen;
+       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";
 }
@@ -267,8 +369,8 @@ function make_cc_bcc_visible() {
 
 // Helper function for mail_save_messages() to extract form values.
 // (We have to replace "|" with "!" because "|" is a field separator in the Citadel protocol)
-function msm_field(element_name) {
-       return (document.getElementById(element_name).innerHTML).replaceAll("|","!");
+function msm_field(element_name, separator) {
+       return (document.getElementById(element_name).innerHTML).replaceAll("|",separator);
 }
 
 
@@ -278,12 +380,12 @@ function mail_save_message() {
        document.body.style.cursor = "wait";
        url = "/ctdl/r/" + escapeHTMLURI(current_room)
                + "/dummy_name_for_new_mail"
-               + "?wefw=" + msm_field("ctdl_mc_references")                            // references (if present)
-               + "&subj=" + msm_field("ctdl-compose-subject-field")                    // subject (if present)
-               + "&mailto=" + msm_field("ctdl-compose-to-field")                       // To: (required)
-               + "&mailcc=" + msm_field("ctdl-compose-cc-field")                       // Cc: (if present)
-               + "&mailbcc=" + msm_field("ctdl-compose-bcc-field")                     // Bcc: (if present)
-               ;
+               + "?wefw="      + msm_field("ctdl_mc_references", "!")                          // references (if present)
+               + "&subj="      + msm_field("ctdl-compose-subject-field", " ")                  // subject (if present)
+               + "&mailto="    + msm_field("ctdl-compose-to-field", ",")                       // To: (required)
+               + "&mailcc="    + msm_field("ctdl-compose-cc-field", ",")                       // Cc: (if present)
+               + "&mailbcc="   + msm_field("ctdl-compose-bcc-field", ",")                      // Bcc: (if present)
+       ;
        boundary = randomString();
        body_text =
                "--" + boundary + "\r\n"