summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_advanced_notifications.php
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2017-01-17 19:06:08 +0100
committerGitHub <noreply@github.com>2017-01-17 19:06:08 +0100
commit3988cfa7d281370500a7f58cb5f73f28a931f0ae (patch)
tree6ffa8e6f5fc35a5cfacad59ff3770c450f21ac0f /src/usr/local/www/system_advanced_notifications.php
parent06f7d60e9de1dde2886dd84009e3986678eaa27e (diff)
downloadpfsense-3988cfa7d281370500a7f58cb5f73f28a931f0ae.zip
pfsense-3988cfa7d281370500a7f58cb5f73f28a931f0ae.tar.gz
Do not nag people about passwords mismatch when SMTP notifications are disabled (Bug #7129)
Diffstat (limited to 'src/usr/local/www/system_advanced_notifications.php')
-rw-r--r--src/usr/local/www/system_advanced_notifications.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php
index f8ebb14..3c3eaaa 100644
--- a/src/usr/local/www/system_advanced_notifications.php
+++ b/src/usr/local/www/system_advanced_notifications.php
@@ -129,7 +129,10 @@ if ($_POST) {
if ($_POST['smtppassword'] == $_POST['smtppassword_confirm']) {
$config['notifications']['smtp']['password'] = $_POST['smtppassword'];
} else {
- $input_errors[] = gettext("SMTP passwords must match");
+ if ($_POST['disable_smtp'] != "yes") {
+ // Bug #7129 - do not nag people about passwords mismatch when SMTP notifications are disabled
+ $input_errors[] = gettext("SMTP passwords must match");
+ }
}
}
OpenPOWER on IntegriCloud