diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js index 7dd7ed41..647c8a7f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js @@ -10,12 +10,18 @@ if (!messageid) { // get message signature var message = session_data.mailstore.getMessageByID(messageid); if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID"); - data = message.signature + data = message.signature; } if (request_headers.query.sanitize) { + if (!data) data = ''; var message_colors = session_data.mailstore.getSignatureColors(data) - data = wtvshared.sanitizeSignature(data).replace("", ``); + + if (data.indexOf("") >= 0) { + data = wtvshared.sanitizeSignature(data).replace("", ``); + } else { + data = `\n${data}`; + } if (request_headers.query.demotext) data += "
" + request_headers.query.demotext; } if (!errpage) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js index 30ee1a7d..b182869a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js @@ -9,8 +9,16 @@ wtv-expire-all: wtv-mail:/sendmail wtv-expire-all: http Content-Type: text/html` -var signature = session_data.getSessionData("subscriber_signature") -if (request_headers.query.preview) var message_colors = session_data.mailstore.getSignatureColors(signature) +var signature = session_data.getSessionData("subscriber_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 = ` @@ -79,7 +87,7 @@ Type a short text signature here and it will be added to the end of each -
+