diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-12-04 16:16:05 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-12-04 16:16:05 +0545 |
| commit | f0eef2ef625de9471c71f0445f98a80155ca2dde (patch) | |
| tree | d457fe122c76d760f49b8ae4311ef0fd0d7d52af /usr/local | |
| parent | 99a803645394f4d78c26fd34255da51f0e3dd78b (diff) | |
| download | pfsense-f0eef2ef625de9471c71f0445f98a80155ca2dde.zip pfsense-f0eef2ef625de9471c71f0445f98a80155ca2dde.tar.gz | |
Provide friendly descr in error message in Interfaces Assign
I was doing drastic things testing some stuff, swapping WAN and OPT1 interfaces in Interfaces->Assign. I accidentally pressed Save when I had the same real device selected for both. Thankfully there was input validation! But I noticed that the error message reported just the names WAN and OPT1, but actual I had them named as different things. So the names in the error message did not match the names (friendly descriptions) in the table of interfaces.
This change makes it display both like FRIENDLY_DESC (FRIENDLY_NAME) so there is less room for confusion.
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/interfaces_assign.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index f971874..a2ab3a6 100644 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -276,7 +276,7 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) { ' interfaces:'), $portname, count($ifnames)); foreach ($portifmap[$portname] as $ifn) - $errstr .= " " . $ifn; + $errstr .= " " . convert_friendly_interface_to_friendly_descr(strtolower($ifn)) . " (" . $ifn . ")"; $input_errors[] = $errstr; } else if (count($ifnames) == 1 && preg_match('/^bridge[0-9]/', $portname) && is_array($config['bridges']['bridged']) && count($config['bridges']['bridged'])) { |
