MAKE K&R CODING STYLE GREAT AGAIN!

[citadel.git] / webcit-ng / static / js / view_mail.js

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 174178e0ce53d9c7cd56dd459950c9e59b0461f0..1dcc07fe030bebf0cf04a6a2b8fd5400a0b0c447 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -343,7 +343,7 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
 
                // 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>"
@@ -353,30 +353,37 @@ function mail_compose(is_quoted, references, quoted_msgnum, m_to, m_cc, m_subjec
 
        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";
 }
 
 
-// Helper function for mail_save_messages() to extract form values.
-// (We have to replace "|" with "!" because "|" is a field separator in the Citadel protocol)
+// Helper function for mail_send_messages() to extract and decode metadata values.
 function msm_field(element_name, separator) {
-       return (document.getElementById(element_name).innerHTML).replaceAll("|",separator);
+       let s1 = document.getElementById(element_name).innerHTML;
+       let s2 = s1.replaceAll("|",separator);  // Replace "|" with "!" because "|" is a field separator in Citadel wire protocol
+       let s3 = decodeURI(s2);
+       let s4 = document.createElement("textarea");    // This One Weird Trick Unescapes All HTML Entities
+       s4.innerHTML = s3;
+       let s5 = s4.value;
+       return(s5);
 }
 
 
 // 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)
+       let 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)