// Copyright (c) 2016-2023 by the citadel.org team
//
// This program is open source software. Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
var displayed_message = 0; // ID of message currently being displayed
NO : 0, // do not perform new mail notifications
YES : 1 // yes, perform new mail notifications
};
-var num_attachments = 0; // number of attachments in current composed msg
// This is the async back end for mail_delete_selected()
;
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(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(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\">"
+ + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Fwd: ${subject}');">`
+ + "<i class=\"fa fa-mail-forward\"></i> "
+ + _("Forward")
+ "</a></span>";
if (can_delete_messages) {
"</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);
- document.getElementById("ctdl-main").innerHTML
- = "<div id=\"ctdl-mailbox-grid-container\" class=\"ctdl-mailbox-grid-container\">"
- + "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
- + "<div id=\"ctdl-mailbox-reading-pane\" class=\"ctdl-mailbox-reading-pane\"></div>"
- + "</div>"
- ;
+ document.getElementById("ctdl-main").innerHTML = `
+ <div id="ctdl-mailbox-grid-container" class="ctdl-mailbox-grid-container">
+ <div id="ctdl-mailbox-pane" class="ctdl-mailbox-pane"></div>
+ <div id="ctdl-mailbox-reading-pane" class="ctdl-mailbox-reading-pane"></div>
+ </div>
+ `;
- highest_mailnum = 0; // Keep track of highest message number to track newly arrived messages
+ highest_mailnum = 0; // Keep track of highest msg number to track newly arrived msgs
render_mailbox_display(newmail_notify.NO);
try { // if this was already set up, clear it so there aren't multiple
clearInterval(RefreshMailboxInterval);
fetch_stat = async() => {
response = await fetch(url);
stat = await(response.json());
- if (stat.room_mtime > room_mtime) { // FIXME commented out to force refreshes
+ if (stat.room_mtime > room_mtime) { // if modified...
room_mtime = stat.room_mtime;
- render_mailbox_display(newmail_notify.YES);
+ render_mailbox_display(newmail_notify.YES); // ...force a refresh
}
}
fetch_stat();
}
// begin rendering the mailbox table
- box = "<table id=\"ctdl-onscreen-mailbox\" class=\"ctdl-mailbox-table\" width=100%><tr>"
- + "<th>" + _("Subject") + "</th>"
- + "<th>" + _("Sender") + "</th>"
- + "<th>" + _("Date") + "</th>"
- + "<th>#</th>"
- + "</tr>";
+ box = `
+ <table id="ctdl-onscreen-mailbox" class="ctdl-mailbox-table" width=100%><tr>
+ <th>${_("Subject")}</th>
+ <th>${ _("Sender")}</th>
+ <th>${_("Date")}</th>
+ <th>#</th>
+ </tr>
+ `;
for (let i=0; i<msgs.length; ++i) {
let m = parseInt(msgs[i].msgnum);
}
-// 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) {
- // 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("<", "<").replaceAll(">", ">");
+// 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(">", ">");
}
- }
- 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) {
+ // 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)
+//
+// 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(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.
+ 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\">"
+ "<div class=\"ctdl-compose-message-box\" id=\"ctdl-editor-body\" contenteditable=\"true\">"
;
- if (is_quoted) {
- compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\"></div></blockquote>";
+ // If this is a quoted reply, insert a div within which we will render the original message.
+ 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.
<div class="ctdl-compose-toolbar">
<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" onClick="show_or_hide_attachments()"><i class="fa fa-paperclip" style="color:grey"></i> ${_("Attachments:")} <span id="ctdl_num_attachments"> ${num_attachments} </span></span>
+ <span class="ctdl-msg-button" onClick="show_or_hide_upload_window()"><i class="fa fa-paperclip" style="color:grey"></i> ${_("Attachments:")} <span id="ctdl_num_attachments"> ${uploads.length} </span></span>
<span class="ctdl-msg-button"> ${_("Contacts")} </span>
- <span class="ctdl-msg-button" onClick="document.getElementById('ctdl_big_modal').style.display='none';gotoroom(current_room)"><i class="fa fa-trash" style="color:red"></i> ${_("Cancel")} </span>
+ <span class="ctdl-msg-button" onClick="flush_uploads();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";
}
- activate_uploads();
-}
-
-
-function activate_uploads() {
- document.getElementById("ctdl_big_modal").innerHTML = `
- <div id="ctdl_attachments_outer">
- <div id="ctdl_attachments_title" class="ctdl-compose-attachments-title">
- <div><h1><i class="fa fa-paperclip" style="color:grey"></i>` + _("Attachments:") + " " + num_attachments + `</h1></div>
- <div><h1><i class="fas fa-window-close" style="color:red" onClick="show_or_hide_attachments()"></i></h1></div>
- </div>
- <br>
- <ul id="ctdl_upload_list">
- <li>uploaded file</li>
- <li>another uploaded file</li>
- <li>philez and warez</li>
- </ul>
- <br>
- <div id="drop-area" class="ctdl-upload-drop-area">
- <form class="my-form">
- <p>${_("Drop files here to upload")}</p>
- <input type="file" id="fileElem" multiple acce=t="*/*" onChange="handleFiles(this.files)">
- <label class="button" for="fileElem">Select some files</label>
- </form>
- </div>
- </div>
- `;
-
- // activate drag and drop (shamelessly swiped from https://www.smashingmagazine.com/2018/01/drag-drop-file-uploader-vanilla-js/ )
- let dropArea = document.getElementById("drop-area");
- ;['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
- dropArea.addEventListener(eventName, preventDefaults, false)
- })
- ;["dragenter", "dragover"].forEach(eventName => {
- dropArea.addEventListener(eventName, highlight, false)
- })
- ;['dragleave', 'drop'].forEach(eventName => {
- dropArea.addEventListener(eventName, unhighlight, false)
- })
- dropArea.addEventListener('drop', handleDrop, false);
-
- // make the modal smaller than the containing window but pretty big
- document.getElementById("ctdl_attachments_outer").style.width =
- Math.trunc((document.getElementById("ctdl-editor-body").getBoundingClientRect().width) * 0.60).toString() + "px";
- document.getElementById("ctdl_attachments_outer").style.height =
- Math.trunc((document.getElementById("ctdl-editor-body").getBoundingClientRect().height) * 0.60).toString() + "px";
-}
-
-
-// prevent drag and drop events from propagating up through the DOM
-function preventDefaults(e) {
- e.preventDefault();
- e.stopPropagation();
-}
-
-
-function handleDrop(e) {
- let dt = e.dataTransfer;
- let files = dt.files;
- handleFiles(files);
-}
-
-
-function handleFiles(files) {
- ([...files]).forEach(uploadFile)
-}
-
-
-function uploadFile(file) {
- var url = '/ctdl/zzz/attach_it;'
- var xhr = new XMLHttpRequest();
- var formData = new FormData();
- xhr.open('POST', url, true);
-
- xhr.addEventListener('readystatechange', function(e) {
- if (xhr.readyState == 4 && xhr.status == 200) {
- document.getElementById("ctdl_upload_list").innerHTML += "<li>succeeeeed</li>";
- console.log("upload succeeded");
- }
- else if (xhr.readyState == 4 && xhr.status != 200) {
- document.getElementById("ctdl_upload_list").innerHTML += "<li>EPIC FAIL</li>";
- console.log("upload failed");
- }
- })
-
- formData.append('file', file);
- xhr.send(formData);
-}
-
-
-function highlight(e) {
- let dropArea = document.getElementById("drop-area");
- dropArea.classList.add('highlight')
-}
-
-function unhighlight(e) {
- let dropArea = document.getElementById("drop-area");
- dropArea.classList.remove('highlight')
-}
-
+ 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) {
+ mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
+ }
-// Show or hide the attachments window in the composer
-function show_or_hide_attachments() {
+ // If this is a forwarded messages, preload its attachments into the forwarded copy.
+ if (is_fwd) {
+ forward_attachments(quoted_msgnum);
+ }
- if (document.getElementById("ctdl_big_modal").style.display == "block") {
- document.getElementById("ctdl_big_modal").style.display = "none";
+ if (is_reply) {
+ setTimeout(() => { document.getElementById("ctdl-editor-body").focus(); }, 0);
}
else {
- document.getElementById("ctdl_big_modal").style.display = "block";
+ setTimeout(() => { document.getElementById("ctdl-compose-to-field").focus(); }, 0);
}
-}
+}
// Called when the user clicks the button to make the hidden "CC" and "BCC" lines appear.
// It is also called automatically during a Reply when CC is pre-populated.
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";
}
function mail_send_message() {
document.body.style.cursor = "wait";
+ 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)
+ "&mailbcc=" + msm_field("ctdl-compose-bcc-field", ",") // Bcc: (if present)
;
- boundary = randomString();
- body_text =
- "--" + boundary + "\r\n"
- + "Content-type: text/html\r\n"
- + "Content-transfer-encoding: quoted-printable\r\n"
- + "\r\n"
- + quoted_printable_encode(
- "<html><body>" + document.getElementById("ctdl-editor-body").innerHTML + "</body></html>"
- ) + "\r\n"
- + "--" + boundary + "--\r\n"
- ;
+ if (uploads.length > 0) {
+ url += "&att=";
+ for (let i=0; i<uploads.length; ++i) {
+ url += uploads[i]["ref"];
+ if (i != uploads.length - 1) {
+ url += ",";
+ }
+ }
+ }
+ body_text = "<html><body>" + document.getElementById("ctdl-editor-body").innerHTML + "</body></html>\r\n";
var request = new XMLHttpRequest();
request.open("PUT", url, true);
- request.setRequestHeader("Content-type", "multipart/mixed; boundary=\"" + boundary + "\"");
+ request.setRequestHeader("Content-type", "text/html");
request.onreadystatechange = function() {
if (request.readyState == 4) {
document.body.style.cursor = "default";
}
}
+ // successfully saving a message means the attachments are now gone from the server.
+ uploads = [];
+
// After saving the message, go back to the mailbox view.
gotoroom(current_room);
projects / citadel.git / blobdiff