signature updates

This commit is contained in:
zefie
2022-10-14 12:49:28 -04:00
parent f23c8e6b9b
commit 80b5dcbdc8
3 changed files with 27 additions and 9 deletions

View File

@@ -10,12 +10,18 @@ if (!messageid) {
// get message signature // get message signature
var message = session_data.mailstore.getMessageByID(messageid); var message = session_data.mailstore.getMessageByID(messageid);
if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID"); if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID");
data = message.signature data = message.signature;
} }
if (request_headers.query.sanitize) { if (request_headers.query.sanitize) {
if (!data) data = '';
var message_colors = session_data.mailstore.getSignatureColors(data) var message_colors = session_data.mailstore.getSignatureColors(data)
data = wtvshared.sanitizeSignature(data).replace("<html>", `<html><body bgcolor=${message_colors.bgcolor} text=${message_colors.text} link=${message_colors.link} vlink=${message_colors.vlink} vspace=0 hspace=0>`);
if (data.indexOf("<html>") >= 0) {
data = wtvshared.sanitizeSignature(data).replace("<html>", `<html><body bgcolor=${message_colors.bgcolor} text=${message_colors.text} link=${message_colors.link} vlink=${message_colors.vlink} vspace=0 hspace=0>`);
} else {
data = `<body bgcolor=${message_colors.bgcolor} text=${message_colors.text} link=${message_colors.link} vlink=${message_colors.vlink} vspace=0 hspace=0>\n${data}`;
}
if (request_headers.query.demotext) data += "<br>" + request_headers.query.demotext; if (request_headers.query.demotext) data += "<br>" + request_headers.query.demotext;
} }
if (!errpage) { if (!errpage) {

View File

@@ -9,8 +9,16 @@ wtv-expire-all: wtv-mail:/sendmail
wtv-expire-all: http wtv-expire-all: http
Content-Type: text/html` Content-Type: text/html`
var signature = session_data.getSessionData("subscriber_signature") var signature = session_data.getSessionData("subscriber_signature");
if (request_headers.query.preview) var message_colors = session_data.mailstore.getSignatureColors(signature)
if (request_headers.query.mail_signature) {
if (signature != request_headers.query.mail_signature) {
session_data.setSessionData("subscriber_signature", (request_headers.query.mail_signature) ? request_headers.query.mail_signature : "");
session_data.saveSessionData();
signature = request_headers.query.mail_signature;
}
}
var message_colors = session_data.mailstore.getSignatureColors(signature)
data = `<HTML> data = `<HTML>
<HEAD> <HEAD>
@@ -79,7 +87,7 @@ Type a short text <B>signature</B> here and it will be added to the end of each
<TR> <TR>
<TD> <TD>
<TD colspan=3 WIDTH=416 HEIGHT=118 VALIGN=top ALIGN=left> <TD colspan=3 WIDTH=416 HEIGHT=118 VALIGN=top ALIGN=left>
<FORM method="POST" action="/validate-mail-signature"> <FORM method="POST" name="sig" action="/validate-mail-signature">
<INPUT type=hidden autosubmit=onleave> <INPUT type=hidden autosubmit=onleave>
<TEXTAREA name="mail_signature" <TEXTAREA name="mail_signature"
action="/validate-mail-signature" action="/validate-mail-signature"
@@ -106,7 +114,7 @@ ${(request_headers.query.preview) ? "<tr><td><td colspan=3><b>Signature Preview:
<tr> <tr>
<TD> <TD>
<td colspan=3 valign=top align=left bgcolor="${(request_headers.query.preview) ? message_colors.bgcolor : "0D0D0D"}"> <td colspan=3 valign=top align=left bgcolor="${(request_headers.query.preview) ? message_colors.bgcolor : "0D0D0D"}">
${(request_headers.query.preview) ? `<embed src="wtv-mail:/get-signature?sanitize=true&demotext=${encodeURIComponent(`This is a preview of your signature.<br><a href="client:donothing">This is what a link looks like</a>.`)}" height=40></embed><br><br>` : ''} ${(request_headers.query.preview) ? `<embed src="wtv-mail:/get-signature?sanitize=true&demotext=${encodeURIComponent(`<hr>This is a preview of your signature. The text below the line will not appear in your outgoing messages. It is provided to demonstrate what a message composed with this signature may look like. <a href="client:donothing">This is what a link looks like</a>.`)}" height=40></embed><br><br>` : ''}
<tr> <tr>
<td> <td>
<td colspan=3 height=2 valign=top align=left> <td colspan=3 height=2 valign=top align=left>
@@ -114,7 +122,8 @@ ${(request_headers.query.preview) ? `<embed src="wtv-mail:/get-signature?sanitiz
<TR> <TR>
<TD> <TD>
<TD VALIGN=top ALIGN=left> <TD VALIGN=top ALIGN=left>
<FORM action="mail-signature"> <FORM action="/mail-signature" METHOD="POST" onsubmit="this.mail_signature.value = document.forms[0].mail_signature.value">
<INPUT type=hidden name="mail_signature">
<FONT COLOR="#E7CE4A" SIZE=-1><SHADOW> <FONT COLOR="#E7CE4A" SIZE=-1><SHADOW>
<INPUT TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" Value=Preview NAME="preview" USESTYLE WIDTH=103> <INPUT TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" Value=Preview NAME="preview" USESTYLE WIDTH=103>
</SHADOW></FONT></FORM> </SHADOW></FONT></FORM>

View File

@@ -1,8 +1,11 @@
var minisrv_service_file = true; var minisrv_service_file = true;
if (request_headers.query && session_data) { if (request_headers.query && session_data) {
session_data.setSessionData("subscriber_signature", (request_headers.query.mail_signature) ? request_headers.query.mail_signature : ""); var signature = session_data.getSessionData("subscriber_signature");
session_data.saveSessionData(); if (request_headers.query.mail_signature != signature) {
session_data.setSessionData("subscriber_signature", (request_headers.query.mail_signature) ? request_headers.query.mail_signature : "");
session_data.saveSessionData();
}
headers = `200 OK headers = `200 OK
Content-type: text/html` Content-type: text/html`
} else { } else {