;
if (include_controls) { // omit controls if this is a pull quote
+
+ let subject = msg.subj ? escapeJS(msg.subj) : "" ;
+
outmsg +=
render_userpic(msg.from) // user avatar
+ "<div class=\"ctdl-mmsg-content\">" // begin content
+ "</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);\">"
+ + "<span class=\"ctdl-msg-button\">" // Reply
+ + `<a href="javascript:mail_compose(true, msg.wefw, ${msgnum}, reply_addr(msg), [], 'Re: ${subject}');">`
+ "<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);\">"
+ + "<span class=\"ctdl-msg-button\">" // Reply-All
+ + `<a href="javascript:mail_compose(true, msg.wefw, ${msgnum}, replyall_to(msg), msg.cccc, 'Re: ${subject}');">`
+ "<i class=\"fa fa-reply-all\"></i> "
+ _("ReplyAll")
+ + "</a></span>"
+
+ + "<span class=\"ctdl-msg-button\">" // Forward FIXME
+ + "<a>"
+ + "<i class=\"fa fa-mail-forward\"></i> "
+ + _("Forward")
+ "</a></span>";
if (can_delete_messages) {
}
-// Compose a new mail message (called by the Reply button here, or by the dispatcher in views.js)
-function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subject) {
+// helper function for mail_compose() -- converts a recipient array to a string suitable for the To: or Cc: field
+function recipient_array_to_string(recps_arr) {
- let is_reply = 0;
+ let returned_string = ""
- // m_to will be an array of zero or more recipients for the To: field. Convert it to a string.
- if (m_to) {
+ if (recps_arr) {
is_reply = 1;
- 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("<", "<").replaceAll(">", ">");
+
+ // first clean up the recipients
+ for (i=0; i<recps_arr.length; ++i) {
+ recps_arr[i] = recps_arr[i].replaceAll("<", "<").replaceAll(">", ">");
}
- }
- 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) {
- is_reply = 1;
- m_cc = Array.from(new Set(m_cc)); // remove dupes
- m_cc_str = "";
- for (i=0; i<m_cc.length; ++i) {
+ // remove dupes
+ recps_arr = Array.from(new Set(recps_arr));
+
+ // now convert it to a string
+ returned_string = "";
+ for (i=0; i<recps_arr.length; ++i) {
if (i > 0) {
- m_cc_str += ", ";
+ returned_string += ", ";
}
- m_cc_str += m_cc[i].replaceAll("<", "<").replaceAll(">", ">");
+ returned_string += recps_arr[i];
}
}
- else {
- m_cc_str = "";
- }
+
+ return(returned_string);
+}
+
+
+
+// Compose a new mail message (called by the Reply button here, or by the dispatcher in views.js)
+//
+// is_quoted true or false depending on whether the user selected "reply quoted" (is this appropriate for mail?)
+// references list of references, be sure to use this in a reply
+// quoted_msgnum if a reply, the msgid of the most recent message in the chain, the one to which we are replying
+// m_to an ARRAY of zero or more recipients to pre-insert into the To: field
+// m_cc an ARRAY of zero or more recipients to pre-insert into the Cc: field
+// m_subject a string to pre-insert into the Subject: field
+//
+function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subject) {
+
+ let is_reply = 0;
+
+ // m_to will be an array of zero or more recipients for the To: field. Convert it to a string.
+ m_to_str = recipient_array_to_string(m_to);
+
+ // m_cc will be an array of zero or more recipients for the Cc: field. Convert it to a string.
+ m_cc_str = recipient_array_to_string(m_cc);
quoted_div_name = randomString();
// Make the "Write mail" button disappear. We're already there!
document.getElementById("ctdl-newmsg-button").style.display = "none";
- // is_quoted true or false depending on whether the user selected "reply quoted" (is this appropriate for mail?)
- // references list of references, be sure to use this in a reply
- // 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. (Yes, I combined regular strings + template literals. I just learned template literals. Converting to all template literals would be fine.)
+ // Now display the screen. (Yes, I combined regular strings + template literals.
+ // I just learned template literals. Converting the whole thing to template literals would be fine.)
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_references\" style=\"display:none\" value=\"" + references + "\"></input>"
+ "<div id=\"ctdl-mc-references\" style=\"display:none\">" + references + "</div>"
// Header fields, the composition window, and the button bar are arranged using a Grid layout.
+ "<div id=\"ctdl-compose-mail\" class=\"ctdl-compose-mail\">"
deactivate_uploads();
let url = "/ctdl/r/" + escapeHTMLURI(current_room)
+ "/dummy_name_for_new_mail"
- + "?wefw=" + msm_field("ctdl_mc_references", "!") // references (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)
projects / citadel.git / blobdiff