From 13b839cfda163f6efcc4c0bf0eec6403b8a62ace Mon Sep 17 00:00:00 2001
From: David D'Hauwe <43988646+daviddhauwe@users.noreply.github.com>
Date: Tue, 14 Jun 2022 23:13:16 +0200
Subject: [PATCH] Smtp server security note and hide unrelevant fields (#924)

* Email Mta Node added security and authentication

* Documentation updated

* Original formatting restored

* email-mta added note for port security
hide fields when not relevant
---
 social/email/61-email.html               | 38 ++++++++++++++++++------
 social/email/locales/en-US/61-email.html |  3 +-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/social/email/61-email.html b/social/email/61-email.html
index 8baadfb4..552e7bbe 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -316,19 +316,18 @@
         <input type="checkbox" id="node-input-starttls" style="display:inline-block; width:20px; vertical-align:baseline;">
         <span data-i18n="email.label.starttlsUpgrade"></span>
     </div>     
-    <div class="form-row">
+    <div class="form-row" id="certRow">
         <label for="node-input-certFile"><i class="fa fa-file"></i>
         <span data-i18n="email.label.certFile"></span></label>
         <input type="text" id="node-input-certFile" placeholder="server.crt" style="width:100%">
     </div>  
-    <div class="form-row">
+    <div class="form-row" id="keyRow">
         <label for="node-input-keyFile"><i class="fa fa-key"></i>
         <span data-i18n="email.label.keyFile"></span></label>
         <input type="text" id="node-input-keyFile" placeholder="private.key" style="width:100%">
     </div>       
     <div class="form-row">
         <label for="node-input-auth"><i class="fa fa-user"></i> <span data-i18n="email.label.users"></span></label>
-        <label style="width:144px"> </label>
         <input type="checkbox" id="node-input-auth" style="display:inline-block; width:20px; vertical-align:baseline;">
         <span data-i18n="email.label.auth"></span>
     </div>
@@ -382,11 +381,18 @@
         },
         oneditprepare: function () {
             let node = this;
-            // Expert settings
-            $("#node-input-expert").typedInput({
-                type: "json",
-                types: ["json"]
-            })
+            // Certificate settings
+            $("#node-input-secure").change(secVisibility);
+            $("#node-input-starttls").change(secVisibility);
+            function secVisibility() {
+                if ($("#node-input-secure").is(":checked") || $("#node-input-starttls").is(":checked")) {
+                    $("#certRow").show();
+                    $("#keyRow").show();
+                } else {
+                    $("#certRow").hide();
+                    $("#keyRow").hide();
+                }
+            }
             // User Management
             let cacheItemCount = 0;
             if (node.users && node.users.length > 0) {
@@ -461,7 +467,21 @@
                 $("#node-input-email-users-container-div").scrollTop(
                     $("#node-input-email-users-container-div").get(0).scrollHeight
                 );
-            });
+            }); 
+            $("#node-input-auth").change(function () {
+                if ($("#node-input-auth").is(":checked")) {
+                    $("#node-input-email-users-add").show();
+                    $("#node-input-email-users-container-div").show();
+                } else {
+                    $("#node-input-email-users-add").hide();
+                    $("#node-input-email-users-container-div").hide();
+                }
+            });   
+            // Expert settings
+            $("#node-input-expert").typedInput({
+                type: "json",
+                types: ["json"]
+            })                              
         },
         oneditsave: function () {
             let node = this;
diff --git a/social/email/locales/en-US/61-email.html b/social/email/locales/en-US/61-email.html
index 9bd97cda..1eb79661 100644
--- a/social/email/locales/en-US/61-email.html
+++ b/social/email/locales/en-US/61-email.html
@@ -68,7 +68,8 @@
     <h3>Security</h3>
     <p>When <i>Secure connection</i> is checked, the connection will use TLS. 
     If not it is still possible to upgrade clear text socket to TLS socket by checking <i>Start TLS</i>.
-    If you do no specify your own certificate (path to file) then a pregenerated self-signed certificate is used. Any respectful client refuses to accept such certificate.</p>
+    In most cases when using port 465, check <i>Secure connection</i>. For port 587 or 25 keep it disabled, use <i>Start TLS</i> instead.</p>
+    <p>If you do no specify your own certificate (path to file) then a pregenerated self-signed certificate is used. Any respectful client refuses to accept such certificate.</p>
     <h3>Authentication</h3>
     <p>Authentication can be enabled (PLAIN or LOGIN). Add at least one user.</p>
     <h3>Expert</h3>