diff options
| author | Albert S. Causing <albertcausing@gmail.com> | 2011-03-16 15:31:22 +0800 |
|---|---|---|
| committer | Albert S. Causing <albertcausing@gmail.com> | 2011-03-16 15:31:22 +0800 |
| commit | 2d74f1cf28a734fe1880dce7638bc1cbab558ab8 (patch) | |
| tree | 30387f0f0e9ed0a5b77625d0e8f475c47d1d1e15 | |
| parent | e58da189b45242c57ba8b186c0209087cfa67c11 (diff) | |
| download | pfsense-2d74f1cf28a734fe1880dce7638bc1cbab558ab8.zip pfsense-2d74f1cf28a734fe1880dce7638bc1cbab558ab8.tar.gz | |
Add support for TLS/SSL for notification (tested with smtp.gmail.com port 465)
| -rw-r--r-- | etc/inc/notices.inc | 2 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_notifications.php | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc index 0cbf5fd..a5ccc7b 100644 --- a/etc/inc/notices.inc +++ b/etc/inc/notices.inc @@ -295,7 +295,7 @@ function notify_via_smtp($message) { $smtp->host_port = empty($config['notifications']['smtp']['port']) ? 25 : $config['notifications']['smtp']['port']; $smtp->direct_delivery = 0; - $smtp->ssl = 0; + $smtp->ssl = ($config['notifications']['smtp']['ssl'] == "checked") ? 1 : 0; $smtp->debug = 0; $smtp->html_debug = 0; $smtp->localhost=$config['system']['hostname'].".".$config['system']['domain']; 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> |
