fix: Added support for autotls in mail transport #5314

This commit is contained in:
Rob Nichols
2017-01-10 05:03:47 -05:00
committed by Neil Lathwood
parent 656a1524d2
commit f98829ba9d
3 changed files with 7 additions and 0 deletions

View File

@@ -278,6 +278,11 @@ $mail_conf = array(
'type' => 'select',
'options' => $dyn_config['email_smtp_secure'],
),
array('name' => 'email_auto_tls',
'descr' => 'SMTP Auto TLS Support',
'type' => 'select',
'options' => array('true', 'false'),
),
array('name' => 'email_smtp_auth',
'descr' => 'SMTP Authentication',
'type' => 'checkbox',

View File

@@ -801,6 +801,7 @@ function send_mail($emails, $subject, $message, $html = false)
$mail->Port = $config['email_smtp_port'];
$mail->Username = $config['email_smtp_username'];
$mail->Password = $config['email_smtp_password'];
$mail->SMTPAutoTLS= $config['email_auto_tls'];
$mail->SMTPDebug = false;
break;
default:

1
sql-schema/153.sql Normal file
View File

@@ -0,0 +1 @@
INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES ('email_auto_tls','true','true','Enable / disable Auto TLS support','alerting',0,'general',0,'0','0');