diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-02-28 03:28:28 -0800 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-02-28 03:28:28 -0800 |
| commit | fa94f1e17e3cce657adb2a3e9182f4d1c0c545fd (patch) | |
| tree | 1229ef44e62d4d6a000b13d68c297e733b8e3963 /usr/local/www/firewall_rules_edit.php | |
| parent | d47e25c7775cbb150a59d56ddb4b2e360014eb12 (diff) | |
| download | pfsense-fa94f1e17e3cce657adb2a3e9182f4d1c0c545fd.zip pfsense-fa94f1e17e3cce657adb2a3e9182f4d1c0c545fd.tar.gz | |
Tidy "gateway name - IP" in dropdown list
While I notice this also, for a plain gateway, the current IP address is also listed in the dropdown list text, like "WAN_DHCP - 10.42.11.1". If there is no IP address currently, it might say "WAN_DHCP - dynamic". But for some DHCP gateways that have not had any non-default manual settings done, it can say "OPT1_DHCP -". This gets rid of the silly-looking "-"
Diffstat (limited to 'usr/local/www/firewall_rules_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index e3dd955..daa5d11 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -1468,7 +1468,8 @@ $i--): ?> } else { $selected = ""; } - echo "<option value=\"{$gwname}\" {$selected}>{$gw['name']} - {$gw['gateway']}</option>\n"; + $gateway_addr_str = empty($gw['gateway']) ? "" : " - " . $gw[gateway]; + echo "<option value=\"{$gwname}\" {$selected}>{$gw['name']}{$gateway_addr_str}</option>\n"; } /* add gateway groups to the list */ if (is_array($a_gatewaygroups)) { |
