From 144d0e793de61366340758b28f169c3afeeba922 Mon Sep 17 00:00:00 2001 From: gnhb Date: Thu, 16 Sep 2010 10:45:50 +0700 Subject: [PATCH] Reorder the way this list (get_configured_interface_list) is generated to make it more beautiful. I know you guys said don't bother, but it's just cosmetic, and it took 10 seconds. --- etc/inc/util.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/etc/inc/util.inc b/etc/inc/util.inc index f07e2aaffd..0437039486 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -566,21 +566,19 @@ function get_configured_interface_list($only_opt = false, $withdisabled = false) global $config; $iflist = array(); - - if (!$only_opt) { - if (isset($config['interfaces']['wan'])) - $iflist['wan'] = "wan"; - if (isset($config['interfaces']['lan'])) - $iflist['lan'] = "lan"; - } - /* if list */ - foreach($config['interfaces'] as $if => $ifdetail) { + foreach($config['interfaces'] as $if => $ifdetail) { if ($if == "wan" || $if == "lan") continue; if (isset($ifdetail['enable']) || $withdisabled == true) $iflist[$if] = $if; } + if (!$only_opt) { + if (isset($config['interfaces']['lan'])) + $iflist['lan'] = "lan"; + if (isset($config['interfaces']['wan'])) + $iflist['wan'] = "wan"; + } return $iflist; }