diff options
| author | jim-p <jimp@pfsense.org> | 2016-03-23 12:55:26 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-03-23 12:55:26 -0400 |
| commit | 1558a4bebb9e4afd64ab0fcd9440f515ae25db9e (patch) | |
| tree | 0e5c7b27927df8f965ca7284372f1f747124d6ca | |
| parent | ab824cdee772b5c9e726db2dc8f198944b57910f (diff) | |
| download | pfsense-1558a4bebb9e4afd64ab0fcd9440f515ae25db9e.zip pfsense-1558a4bebb9e4afd64ab0fcd9440f515ae25db9e.tar.gz | |
Fix display of gateway IP address and gateway/group descriptions in firewall_rules_edit.php.
| -rw-r--r-- | src/etc/inc/gwlb.inc | 1 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 454e16c..e712319 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -899,6 +899,7 @@ function return_gateway_groups_array() { if (is_array($config['gateways']['gateway_group'])) { $viplist = get_configured_vip_list(); foreach ($config['gateways']['gateway_group'] as $group) { + $gateway_groups_array[$group['name']]['descr'] = $group['descr']; /* create array with group gateways members separated by tier */ $tiers = array(); $backupplan = array(); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 13ae009..9d5a7e1 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1632,12 +1632,12 @@ foreach (return_gateways_array() as $gwname => $gw) { continue; } - $gateways[ $gwname ] = $gw['name'] . (empty($gw['gateway'])? '' : ' - '. $gateway_addr_str); + $gateways[ $gwname ] = $gw['name'] . (empty($gw['gateway'])? '' : ' - '. $gw['gateway']) . (empty($gw['descr'])? '' : ' - '. $gw['descr']); } foreach ((array)$a_gatewaygroups as $gwg_name => $gwg_data) { if ((empty($pconfig['ipprotocol'])) || ($pconfig['ipprotocol'] == $gwg_data['ipprotocol'])) { - $gateways[ $gwg_name ] = $gwg_name; + $gateways[ $gwg_name ] = $gwg_name . (empty($gwg_data['descr'])? '' : ' - '. $gwg_data['descr']); } } |
