+ "</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(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: ${subject}');">`
+ + "<span class=\"ctdl-msg-button\">" // Reply-All
+ + `<a href="javascript:mail_compose(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 (server handles this)
- + "<a href=\"javascript:mail_compose(true,'"+msg.wefw+"','"+msgnum+"', '', '', 'Fwd: '+msg.subj);\">"
+ + "<span class=\"ctdl-msg-button\">"
+ + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Fwd: ${subject}');">`
+ "<i class=\"fa fa-mail-forward\"></i> "
+ _("Forward")
+ "</a></span>";
"</div>"; // end header
}
- // Display attachments, if any are present
- if (msg.part) {
+ // Display attachments, if any are present (don't do this if we're quoting the message)
+ if ( (msg.part) && (include_controls) ) {
let display_attachments = 0;
for (let r=0; r<msg.part.length; ++r) {
if (msg.part[r].disp == "attachment") {
// RENDERER FOR THIS VIEW
function view_render_mail() {
// Put the "enter new message" button into the topbar
- document.getElementById("ctdl-newmsg-button").innerHTML = "<i class=\"fa fa-edit\"></i>" + _("Write mail");
+ document.getElementById("ctdl-newmsg-button").innerHTML = `<i class="fa fa-edit"></i> ` + _("Write mail");
document.getElementById("ctdl-newmsg-button").style.display = "block";
// Put the "delete message(s)" button into the topbar
let d = document.getElementById("ctdl-delete-button");
- d.innerHTML = "<i class=\"fa fa-trash\"></i>" + _("Delete");
+ d.innerHTML = `<i class="fa fa-trash"></i> ` + _("Delete");
d.style.display = "block";
//d.addEventListener("click", mail_delete_selected);
}
+// 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 returned_string = ""
+
+ if (recps_arr) {
+ is_reply = 1;
+
+ // first clean up the recipients
+ for (i=0; i<recps_arr.length; ++i) {
+ recps_arr[i] = recps_arr[i].replaceAll("<", "<").replaceAll(">", ">");
+ }
+
+ // 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) {
+ returned_string += ", ";
+ }
+ returned_string += recps_arr[i];
+ }
+ }
+
+ 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
+// (set to 0 if this is not a reply)
// 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) {
+function mail_compose(references, quoted_msgnum, m_to, m_cc, m_subject) {
let is_reply = 0;
+ let is_quoted = (quoted_msgnum > 0) ? true : false ;
+ let is_fwd = (is_quoted && m_to.length==0 && m_cc.length==0) ;
// m_to will be an array of zero or more recipients for the To: field. Convert it to a string.
- if (m_to) {
- 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(">", ">");
- }
- }
- else {
- m_to_str = "";
- }
+ m_to_str = recipient_array_to_string(m_to);
- // 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) {
- if (i > 0) {
- m_cc_str += ", ";
- }
- m_cc_str += m_cc[i].replaceAll("<", "<").replaceAll(">", ">");
- }
- }
- else {
- m_cc_str = "";
- }
+ // 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";
- // 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\">"
;
// If this is a quoted reply, insert a div within which we will render the original message.
- if (is_quoted) {
- compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTED MESSAGE HERE</div></blockquote>";
+ if (is_quoted && is_fwd) {
+ compose_screen += "<br><br>" + _("--- forwarded message ---") + "<br><div id=\"" + quoted_div_name + "\">QUOTE</div>";
+ }
+ else if (is_quoted) {
+ compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTE</div></blockquote>";
}
// The button bar is a Grid element, and is also a Flexbox container.
document.getElementById("ctdl-compose-cc-field").style.display = "block";
}
- activate_uploads("ctdl-editor-body");
+ activate_uploads("ctdl-editor-body"); // create the attachments window
+ attachment_counter_divs.push("ctdl_num_attachments"); // make the Attachments: count at the bottom update too
// If this is a quoted reply, render the original message into the div we set up earlier.
if (is_quoted) {
- document.getElementById(quoted_div_name).innerHTML = quoted_msgnum;
mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
}
+ // If this is a forwarded messages, preload its attachments into the forwarded copy.
+ if (is_fwd) {
+ forward_attachments(quoted_msgnum);
+ }
+
if (is_reply) {
setTimeout(() => { document.getElementById("ctdl-editor-body").focus(); }, 0);
}
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