X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fview_mail.js;h=d5673193a4e86fab587fdae351ba98e42f8ab4c7;hb=ca47a50d32510ab33032512c0a33a4712f4811c5;hp=3118a6b7aac8ef5256a6e0f2afdd2eb048c93b2b;hpb=badf45c4d07cf22c6b08c22dc08b0b91b8f45ffe;p=citadel.git

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 3118a6b7a..d5673193a 100644
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -137,6 +137,9 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
 		;
 
 		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
@@ -156,7 +159,7 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
 			+ "</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);\">"
+			+ `<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>"
@@ -436,6 +439,14 @@ function render_mailbox_display(notify) {
 
 
 // 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;
@@ -477,10 +488,6 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
 	// 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.)
 	compose_screen =
 		// Hidden values that we are storing right here in the document tree for later