From 9a7d4ec035b56eee1da8dc5212bda94e25863426 Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Thu, 10 Feb 2022 22:01:54 -0500
Subject: [PATCH] signatures still need voodoo for bgcolor and such

---
 zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js | 5 +++--
 zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js | 8 +++++---
 zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail.js    | 2 +-
 zefie_wtvp_minisrv/WTVShared.js                      | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
index 075f47ab..0b351c35 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
@@ -294,8 +294,9 @@ ${html_entities.encode(message.body).replace("\n", "<br>")}
 <br>
 <br>`;
                 if (message.signature) {
-                    if (wtvshared.isHTML(message.signature)) data += `<embed src="wtv-mail:/get-signature?message_id='+messageid+'">`;
-                    else data += message.signature;
+                    if (wtvshared.isHTML(message.signature)) data += `<wtvnoscript>`;
+                    data += message.signature;
+                    if (wtvshared.isHTML(message.signature)) data += `</wtvnoscript>`;
                 }
 data += `<p>
 <p>
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
index 065fc79a..168256d8 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
@@ -32,7 +32,8 @@ Location: wtv-mail:/sendmail`;
     var msg_subject = request_headers.query.message_subject || null;
     var msg_body = request_headers.query.message_body || null;
     var to_name = request_headers.query.whatever_webtv_sends_this_as || null;
-    var no_signature = (request_headers.query.togglesign == "true") ? false : true; // opposite webtv
+    var no_signature = false;
+    if (request_headers.query.togglesign == "true") no_signature = false;
     var mail_draft_data = ssid_sessions[socket.ssid].getSessionData("mail_draft");
     var mail_draft_attachments = ssid_sessions[socket.ssid].getSessionData("mail_draft_attachments") || {};
     if (mail_draft_data) {
@@ -412,8 +413,9 @@ vlink=#62B362
 vspace=0
 hspace=0>`;
             if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) {
-                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");
+                if (wtvshared.isHTML(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"))) data += `<wtvnoscript>`;
+                data += ssid_sessions[socket.ssid].getSessionData("subscriber_signature");
+                if (wtvshared.isHTML(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"))) data += `</wtvnoscript>`;
             }
             data += `
 <td abswidth=2 bgcolor=#000000>
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail.js
index abda916f..0d06ae61 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail.js
@@ -22,7 +22,7 @@ Mail settings
 <tr>
 <td abswidth=6>
 <td abswidth=92 absheight=76>
-<table absheight=76 cellspacing=0 cellpadding=0>
+<table href="wtv-home:/home" absheight=76 cellspacing=0 cellpadding=0>
 <tr>
 <td align=right>
 <img src="${minisrv_config.config.service_logo}" width=87 height=67>
diff --git a/zefie_wtvp_minisrv/WTVShared.js b/zefie_wtvp_minisrv/WTVShared.js
index deef3b38..0557e524 100644
--- a/zefie_wtvp_minisrv/WTVShared.js
+++ b/zefie_wtvp_minisrv/WTVShared.js
@@ -31,7 +31,7 @@ class WTVShared {
     }
 
     isHTML(str) {
-        return /<\s*([^ >]+)[^>]*>.*?<\s*\/\s*\1\s*>/.test(str);
+        return /<[a-z][\s\S]*>/i.test(str);
     }
 
     returnAbsolutePath(check_path) {