From 3bccc9ff2d4e7f5aab6f2267153b52534f5cdc6c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 23 Mar 2020 17:49:17 +0900
Subject: [PATCH] Enable SSL by default when SMTP is selected as a sending
 method

---
 modules/admin/tpl/config_notification.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/admin/tpl/config_notification.html b/modules/admin/tpl/config_notification.html
index aab69ecdd..b6cc425ab 100644
--- a/modules/admin/tpl/config_notification.html
+++ b/modules/admin/tpl/config_notification.html
@@ -98,7 +98,7 @@
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
 					<label class="x_control-label" for="mail_{$driver_name}_smtp_port">{$lang->cmd_advanced_mailer_smtp_port}</label>
 					<div class="x_controls">
-						<input type="text" name="mail_{$driver_name}_smtp_port" id="mail_{$driver_name}_smtp_port" value="{$conf_value}" />
+						<input type="text" name="mail_{$driver_name}_smtp_port" id="mail_{$driver_name}_smtp_port" value="{$conf_value ?: '465'}" />
 					</div>
 				</div>
 				<!--@end-->
@@ -107,9 +107,9 @@
 				<div class="x_control-group hidden-by-default show-for-{$driver_name}">
 					<label class="x_control-label">{$lang->cmd_advanced_mailer_smtp_security}</label>
 					<div class="x_controls">
-						<label class="x_inline" for="mail_{$driver_name}_security_none"><input type="radio" name="mail_{$driver_name}_smtp_security" id="mail_{$driver_name}_security_none" value="none" checked="checked"|cond="!in_array($conf_value, array('ssl', 'tls'))" /> {$lang->cmd_advanced_mailer_smtp_security_none}</label>
-						<label class="x_inline" for="mail_{$driver_name}_security_ssl"><input type="radio" name="mail_{$driver_name}_smtp_security" id="mail_{$driver_name}_security_ssl" value="ssl" checked="checked"|cond="$conf_value === 'ssl'" /> {$lang->cmd_advanced_mailer_smtp_security_ssl}</label>
+						<label class="x_inline" for="mail_{$driver_name}_security_ssl"><input type="radio" name="mail_{$driver_name}_smtp_security" id="mail_{$driver_name}_security_ssl" value="ssl" checked="checked"|cond="$conf_value === 'ssl' || !$conf_value" /> {$lang->cmd_advanced_mailer_smtp_security_ssl}</label>
 						<label class="x_inline" for="mail_{$driver_name}_security_tls"><input type="radio" name="mail_{$driver_name}_smtp_security" id="mail_{$driver_name}_security_tls" value="tls" checked="checked"|cond="$conf_value === 'tls'" /> {$lang->cmd_advanced_mailer_smtp_security_tls}</label>
+						<label class="x_inline" for="mail_{$driver_name}_security_none"><input type="radio" name="mail_{$driver_name}_smtp_security" id="mail_{$driver_name}_security_none" value="none" checked="checked"|cond="$conf_value === 'none'" /> {$lang->cmd_advanced_mailer_smtp_security_none}</label>
 					</div>
 				</div>
 				<!--@end-->