summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorBill Marquette <bill.marquette@gmail.com>2011-05-14 11:16:56 -0500
committerBill Marquette <bill.marquette@gmail.com>2011-05-14 11:16:56 -0500
commit92ca10c1f6657ac1911c5eaa0fea97bdd948466f (patch)
tree3458ce8d3ad4a9e41769519796e96cb8d438ee65 /usr
parent23b774e0cfce78e24cd290f096972b098b7bf66b (diff)
parent2d74f1cf28a734fe1880dce7638bc1cbab558ab8 (diff)
downloadpfsense-92ca10c1f6657ac1911c5eaa0fea97bdd948466f.zip
pfsense-92ca10c1f6657ac1911c5eaa0fea97bdd948466f.tar.gz
Merge branch 'axscode-pfs'
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/system_advanced_notifications.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php
index c914d7a..7da289a 100644
--- a/usr/local/www/system_advanced_notifications.php
+++ b/usr/local/www/system_advanced_notifications.php
@@ -62,6 +62,8 @@ if($config['notifications']['smtp']['ipaddress'])
$pconfig['smtpipaddress'] = $config['notifications']['smtp']['ipaddress'];
if($config['notifications']['smtp']['port'])
$pconfig['smtpport'] = $config['notifications']['smtp']['port'];
+if($config['notifications']['smtp']['ssl'])
+ $pconfig['smtpssl'] = $config['notifications']['smtp']['ssl'];
if($config['notifications']['smtp']['notifyemailaddress'])
$pconfig['smtpnotifyemailaddress'] = $config['notifications']['smtp']['notifyemailaddress'];
if($config['notifications']['smtp']['username'])
@@ -100,6 +102,7 @@ if ($_POST) {
// SMTP
$config['notifications']['smtp']['ipaddress'] = $_POST['smtpipaddress'];
$config['notifications']['smtp']['port'] = $_POST['smtpport'];
+ $config['notifications']['smtp']['ssl'] = isset($_POST['smtpssl']) ? 'checked' : 'unchecked';
$config['notifications']['smtp']['notifyemailaddress'] = $_POST['smtpnotifyemailaddress'];
$config['notifications']['smtp']['username'] = $_POST['smtpusername'];
$config['notifications']['smtp']['password'] = $_POST['smtppassword'];
@@ -208,8 +211,9 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("SMTP Port of E-Mail server"); ?></td>
<td width="78%" class="vtable">
- <input name='smtpport' value='<?php echo $pconfig['smtpport']; ?>'><br/>
- <?=gettext("This is the port of the SMTP E-Mail server, typically 25 or 587 (submission)."); ?>
+ <input name='smtpport' value='<?php echo $pconfig['smtpport']; ?>'>
+ <input type='checkbox' name='smtpssl' <?php echo $pconfig['smtpssl']; ?>>Enable SSL/TLS Authentication<br/>
+ <?=gettext("This is the port of the SMTP E-Mail server, typically 25, 587 (submission) or 465 (smtps, tick ssl/tls checkbox)"); ?>
</td>
</tr>
<tr>
OpenPOWER on IntegriCloud