diff options
| author | Steve Beaver <sbeaver@netgate.com> | 2017-03-20 09:26:58 -0400 |
|---|---|---|
| committer | Steve Beaver <sbeaver@netgate.com> | 2017-03-20 09:26:58 -0400 |
| commit | e471eaaf27f9ddc13c14f840a731f915fcac1f0b (patch) | |
| tree | ed1b28b51290d41928c07bea1b9eb79367f58a0c /src/usr/local/www/firewall_nat_edit.php | |
| parent | 31b1f1e14d9fceed8bece4679275965ece495fd8 (diff) | |
| parent | 065bd33d2ef1967d976e40842f4eb34f9a487a5f (diff) | |
| download | pfsense-e471eaaf27f9ddc13c14f840a731f915fcac1f0b.zip pfsense-e471eaaf27f9ddc13c14f840a731f915fcac1f0b.tar.gz | |
Merge pull request #3529 from Chrisc-c-c/Fix-List-Sort-Order
Diffstat (limited to 'src/usr/local/www/firewall_nat_edit.php')
| -rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 96869b5..83440ba 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -584,14 +584,16 @@ function build_dsttype_list() { $list[$ifent . 'ip'] = $ifdesc . ' address'; } } - + + //Temporary array so we can sort IPs + $templist = array(); if (is_array($config['virtualip']['vip'])) { foreach ($config['virtualip']['vip'] as $sn) { if (is_ipaddrv6($sn['subnet'])) { continue; } if (($sn['mode'] == "proxyarp" || $sn['mode'] == "other") && $sn['type'] == "network") { - $list[$sn['subnet'] . '/' . $sn['subnet_bits']] = 'Subnet: ' . $sn['subnet'] . '/' . $sn['subnet_bits'] . ' (' . $sn['descr'] . ')'; + $templist[$sn['subnet'] . '/' . $sn['subnet_bits']] = 'Subnet: ' . $sn['subnet'] . '/' . $sn['subnet_bits'] . ' (' . $sn['descr'] . ')'; if (isset($sn['noexpand'])) { continue; } @@ -602,13 +604,18 @@ function build_dsttype_list() { for ($i = 0; $i <= $len; $i++) { $snip = long2ip32($start+$i); - $list[$snip] = $snip . ' (' . $sn['descr'] . ')'; + $templist[$snip] = $snip . ' (' . $sn['descr'] . ')'; } } else { - $list[$sn['subnet']] = $sn['subnet'] . ' (' . $sn['descr'] . ')'; + $templist[$sn['subnet']] = $sn['subnet'] . ' (' . $sn['descr'] . ')'; } } } + + //Sort temp IP array and append onto main array + asort($templist); + $list = array_merge($list, $templist); + unset($templist); return($list); } |
