From 49ba94548045b833f27b31cc8541dba03ea46162 Mon Sep 17 00:00:00 2001 From: Stuart Wyatt Date: Tue, 7 Apr 2015 11:59:04 -0700 Subject: Apcupsd - Bug 4650 - Support TLS email notifications and update email notification flag tests Bump package number to 0.3.5 --- config/apcupsd/apcupsd_mail.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config/apcupsd') diff --git a/config/apcupsd/apcupsd_mail.php b/config/apcupsd/apcupsd_mail.php index 3b13309c..15c74fd2 100755 --- a/config/apcupsd/apcupsd_mail.php +++ b/config/apcupsd/apcupsd_mail.php @@ -61,8 +61,11 @@ $mail = new PHPMailer(); $mail->IsSMTP(); $mail->Host = $config['notifications']['smtp']['ipaddress']; -if ($config['notifications']['smtp']['ssl'] == "checked") - $mail->SMTPSecure = "ssl"; +if ((isset($config['notifications']['smtp']['ssl']) && $config['notifications']['smtp']['ssl'] != "unchecked") || $config['notifications']['smtp']['ssl'] == "checked") + $mail->SMTPSecure = "ssl"; + +if ((isset($config['notifications']['smtp']['tls']) && $config['notifications']['smtp']['tls'] != "unchecked") || $config['notifications']['smtp']['tls'] == "checked") + $mail->SMTPSecure = "tls"; $mail->Port = empty($config['notifications']['smtp']['port']) ? 25 : $config['notifications']['smtp']['port']; -- cgit v1.2.3