diff options
author | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
commit | 37df6d7b15905be3dd198d9c17f19a1697beea9f (patch) | |
tree | ef071adda82633630b88de0041b20f757c82bb89 /usr/local/www/interfaces_assign.php | |
parent | 04d36b1f1fdff85cd902b9aa15103b98475b4777 (diff) | |
parent | e256e9d4d1dedb1418204d2879c7dcf7edcf2137 (diff) | |
download | pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.zip pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.tar.gz |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/upgrade_config.inc
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
-rwxr-xr-x | usr/local/www/interfaces_assign.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 427d303..e67b346 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -316,6 +316,7 @@ if ($_GET['act'] == "add") { /* find next free optional interface number */ if(!$config['interfaces']['lan']) { $newifname = "lan"; + $descr = "LAN"; $config['interfaces'][$newifname] = array(); $config['interfaces'][$newifname]['descr'] = $descr; } else { @@ -327,9 +328,10 @@ if ($_GET['act'] == "add") { $descr = "OPT{$i}"; $config['interfaces'][$newifname] = array(); $config['interfaces'][$newifname]['descr'] = $descr; - uksort($config['interfaces'], "strnatcmp"); } - + + uksort($config['interfaces'], "compare_interface_names"); + /* Find an unused port for this interface */ foreach ($portlist as $portname => $portinfo) { $portused = false; @@ -358,6 +360,21 @@ if ($_GET['act'] == "add") { } +function compare_interface_names($a, $b) { + if ($a == $b) + return 0; + else if ($a == 'wan') + return -1; + else if ($b == 'wan') + return 1; + else if ($a == 'lan') + return -1; + else if ($b == 'lan') + return 1; + + return strnatcmp($a, $b); +} + include("head.inc"); if(file_exists("/var/run/interface_mismatch_reboot_needed")) |