diff options
| author | Stuart Wyatt <stuart@gogglespisano.com> | 2015-04-07 11:59:04 -0700 |
|---|---|---|
| committer | Stuart Wyatt <stuart@gogglespisano.com> | 2015-04-07 11:59:04 -0700 |
| commit | 49ba94548045b833f27b31cc8541dba03ea46162 (patch) | |
| tree | 4f3412f4fb315cb40c05f823ebab02a348b23be5 | |
| parent | e194ac796ff97ddde13eea2710cf07a83a1a2e58 (diff) | |
| download | pfsense-packages-49ba94548045b833f27b31cc8541dba03ea46162.tar.gz pfsense-packages-49ba94548045b833f27b31cc8541dba03ea46162.tar.bz2 pfsense-packages-49ba94548045b833f27b31cc8541dba03ea46162.zip | |
Apcupsd - Bug 4650 - Support TLS email notifications and update email notification flag tests
Bump package number to 0.3.5
| -rwxr-xr-x | config/apcupsd/apcupsd_mail.php | 7 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 8 insertions, 5 deletions
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']; diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 72b7ebff..0eb4bf6e 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1452,7 +1452,7 @@ <descr>Set of programs for controlling APC UPS.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file> - <version>apcupsd-3.14.12_1 pkg v0.3.4</version> + <version>apcupsd-3.14.12_1 pkg v0.3.5</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>apcupsd.xml</configurationfile> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 930d943e..5029eb28 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1883,7 +1883,7 @@ <descr>Set of programs for controlling APC UPS.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file> - <version>apcupsd-3.14.10_1 pkg v0.3.4</version> + <version>apcupsd-3.14.10_1 pkg v0.3.5</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>apcupsd.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 63a97830..83f5c242 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1870,7 +1870,7 @@ <descr>Set of programs for controlling APC UPS.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file> - <version>apcupsd-3.14.10_1 pkg v0.3.4</version> + <version>apcupsd-3.14.10_1 pkg v0.3.5</version> <status>BETA</status> <required_version>2.0</required_version> <configurationfile>apcupsd.xml</configurationfile> |