From ff0597ee1a6ff0fc744e156a77db616c7ff712bc Mon Sep 17 00:00:00 2001 From: Warren Baker Date: Mon, 7 Apr 2014 10:24:53 +0200 Subject: Allow mail report to make use of TLS --- config/mailreport/mail_reports.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'config/mailreport') diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index 746b4759..aa2bc3ce 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -194,11 +194,13 @@ function mail_report_send($headertext, $cmdtext, $logtext, $attachments) { $mail = new PHPMailer(); $mail->IsSMTP(); $mail->Host = $config['notifications']['smtp']['ipaddress']; + $mail->Port = empty($config['notifications']['smtp']['port']) ? 25 : $config['notifications']['smtp']['port']; - if ($config['notifications']['smtp']['ssl'] == "checked") + if ((isset($config['notifications']['smtp']['ssl']) && $config['notifications']['smtp']['ssl'] != "unchecked") || $config['notifications']['smtp']['ssl'] == "checked") $mail->SMTPSecure = "ssl"; - $mail->Port = empty($config['notifications']['smtp']['port']) ? 25 : $config['notifications']['smtp']['port']; + if ((isset($config['notifications']['smtp']['tls']) && $config['notifications']['smtp']['tls'] != "unchecked") || $config['notifications']['smtp']['tls'] == "checked") + $mail->SMTPSecure = "tls"; if($config['notifications']['smtp']['username'] && $config['notifications']['smtp']['password']) { -- cgit v1.2.3