From ab91e7df348c7c89fb0b2638f58d7eb26c053edd Mon Sep 17 00:00:00 2001
From: Peyton Duncan <11335266+Helithumper@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:53:59 -0600
Subject: [PATCH] SMTP TLS/SSL Labels to Match Thunderbird (#2293)

* TLS/SSL Labels to Match Thunderbird

Replaced TLS and SSL checkbox text to match the
defaults used by Mozilla Thunderbird to eliminate confusion when
configuring SMTP

* Add link to email server documentation

* Properly save changes

---------

Co-authored-by: Kevin Chung <kchung@ctfd.io>
---
 CTFd/themes/admin/templates/configs/email.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CTFd/themes/admin/templates/configs/email.html b/CTFd/themes/admin/templates/configs/email.html
index dba8a60d..6bbba6f4 100644
--- a/CTFd/themes/admin/templates/configs/email.html
+++ b/CTFd/themes/admin/templates/configs/email.html
@@ -133,6 +133,9 @@
 		<h5>Email Server</h5>
 		<small class="form-text text-muted">
 			Change the email server used by CTFd to send email
+			<a class="float-right" href="https://docs.ctfd.io/docs/settings/emails#email-server" target="_blank">
+				<i class="far fa-question-circle pr-2"></i>
+			</a>
 		</small>
 		<ul class="nav nav-tabs my-3" role="tablist">
 			<li class="nav-item active">
@@ -221,13 +224,13 @@
 				<div class="form-check">
 					<label>
 						<input id="mail_ssl" name="mail_ssl" type="checkbox" {% if mail_ssl %}checked{% endif %}>
-						SSL
+						TLS/SSL
 					</label>
 				</div>
 				<div class="form-check">
 					<label>
 						<input id="mail_tls" name="mail_tls" type="checkbox" {% if mail_tls %}checked{% endif %}>
-						TLS
+						STARTTLS
 					</label>
 				</div>
 			</div>
@@ -259,4 +262,4 @@
 		</div>
 		<button type="submit" class="btn btn-md btn-primary float-right">Update</button>
 	</form>
-</div>
\ No newline at end of file
+</div>