From 51a0576a3e19fce7dfc67ea3cac149e6f0c8e3c9 Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Thu, 10 Feb 2022 21:44:01 -0500
Subject: [PATCH] only embed signature if its html, otherwise just write it

---
 zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js | 8 ++++++--
 zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js | 3 ++-
 zefie_wtvp_minisrv/WTVShared.js                      | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
index 96dab2e3..075f47ab 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
@@ -292,8 +292,12 @@ ${html_entities.encode((message.subject) ? message.subject : '(No subject)')}
                 data += `
 ${html_entities.encode(message.body).replace("\n", "<br>")}
 <br>
-${(message.signature) ? '<embed src="wtv-mail:/get-signature?message_id='+messageid+'">' : ''}
-<p>
+<br>`;
+                if (message.signature) {
+                    if (wtvshared.isHTML(message.signature)) data += `<embed src="wtv-mail:/get-signature?message_id='+messageid+'">`;
+                    else data += message.signature;
+                }
+data += `<p>
 <p>
 </table>
 </table>
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
index 97c3df69..065fc79a 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
@@ -412,7 +412,8 @@ vlink=#62B362
 vspace=0
 hspace=0>`;
             if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) {
-                data += `<embed src="wtv-mail:/get-signature" transparent>`;
+                if (wtvshared.isHTML(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"))) data += `<embed src="wtv-mail:/get-signature" transparent>`;
+                else data += ssid_sessions[socket.ssid].getSessionData("subscriber_signature");
             }
             data += `
 <td abswidth=2 bgcolor=#000000>
diff --git a/zefie_wtvp_minisrv/WTVShared.js b/zefie_wtvp_minisrv/WTVShared.js
index 009e1558..deef3b38 100644
--- a/zefie_wtvp_minisrv/WTVShared.js
+++ b/zefie_wtvp_minisrv/WTVShared.js
@@ -30,6 +30,10 @@ class WTVShared {
         return true;
     }
 
+    isHTML(str) {
+        return /<\s*([^ >]+)[^>]*>.*?<\s*\/\s*\1\s*>/.test(str);
+    }
+
     returnAbsolutePath(check_path) {
         if (check_path.substring(0, 1) != this.path.sep && check_path.substring(1, 1) != ":") {
             // non-absolute path, so use current directory as base