diff options
| -rw-r--r-- | etc/inc/notices.inc | 2 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_notifications.php | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc index 6880844..558a86e 100644 --- a/etc/inc/notices.inc +++ b/etc/inc/notices.inc @@ -291,7 +291,7 @@ function notify_via_smtp($message) { $to = $config['notifications']['smtp']['notifyemailaddress']; $smtp->host_name = $config['notifications']['smtp']['ipaddress']; - $smtp->host_port = 25; + $smtp->host_port = empty($config['notifications']['smtp']['port']) ? 25 : $config['notifications']['smtp']['port']; $smtp->direct_delivery = 0; $smtp->ssl = 0; diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php index 80fecce..cdd8b2d 100644 --- a/usr/local/www/system_advanced_notifications.php +++ b/usr/local/www/system_advanced_notifications.php @@ -60,6 +60,8 @@ else // SMTP 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']['notifyemailaddress']) $pconfig['smtpnotifyemailaddress'] = $config['notifications']['smtp']['notifyemailaddress']; if($config['notifications']['smtp']['username']) @@ -97,6 +99,7 @@ if ($_POST) { // SMTP $config['notifications']['smtp']['ipaddress'] = $_POST['smtpipaddress']; + $config['notifications']['smtp']['port'] = $_POST['smtpport']; $config['notifications']['smtp']['notifyemailaddress'] = $_POST['smtpnotifyemailaddress']; $config['notifications']['smtp']['username'] = $_POST['smtpusername']; $config['notifications']['smtp']['password'] = $_POST['smtppassword']; @@ -203,6 +206,13 @@ include("head.inc"); </td> </tr> <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)."); ?> + </td> + </tr> + <tr> <td width="22%" valign="top" class="vncell"><?=gettext("From e-mail address"); ?></td> <td width="78%" class="vtable"> <input name='smtpfromaddress' type='input' value='<?php echo $pconfig['smtpfromaddress']; ?>'><br/> |
