summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_advanced_notifications.php
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2017-01-17 10:17:41 +0100
committerRenato Botelho <renato@netgate.com>2017-01-17 16:47:47 -0200
commit83ddceca242a448de25a33707a613b8d16310191 (patch)
tree8aefa1a5cdb07ede3f4c44433812a75ec72b369b /src/usr/local/www/system_advanced_notifications.php
parenta929acf0ce4a6c7bdf90331771fe26e9e99f4727 (diff)
downloadpfsense-83ddceca242a448de25a33707a613b8d16310191.zip
pfsense-83ddceca242a448de25a33707a613b8d16310191.tar.gz
Do not nag people about passwords mismatch when growl is disabled (Bug #7129)
These fields tend to get "helpfully" pre-filled with random crap by built-in browser password managers or extensions such as LastPass. No need to bother people with these when the feature is disabled. (cherry picked from commit 06f7d60e9de1dde2886dd84009e3986678eaa27e)
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 5d8757b..52e1e42 100644
--- a/src/usr/local/www/system_advanced_notifications.php
+++ b/src/usr/local/www/system_advanced_notifications.php
@@ -128,7 +128,10 @@ if ($_POST) {
if ($_POST['password'] == $_POST['password_confirm']) {
$config['notifications']['growl']['password'] = $_POST['password'];
} else {
- $input_errors[] = gettext("Growl passwords must match");
+ // Bug #7129 - do not nag people about passwords mismatch when growl is disabled
+ if ($_POST['disable_growl'] != "yes") {
+ $input_errors[] = gettext("Growl passwords must match");
+ }
}
}
OpenPOWER on IntegriCloud