diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-04-16 16:03:28 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2017-04-16 16:03:28 +0545 |
| commit | f593f80b48027485c97516dcda4336b31a9f58a2 (patch) | |
| tree | 8db80b459f90f7acd5da590f2d0f5f3bc61853c5 /src/etc/inc | |
| parent | 8a0af41adc9c29ccf7b8dabb3b7658abf46054a6 (diff) | |
| download | pfsense-f593f80b48027485c97516dcda4336b31a9f58a2.zip pfsense-f593f80b48027485c97516dcda4336b31a9f58a2.tar.gz | |
Refactor get_configured_interface_with_descr remove unused parameter
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/easyrule.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/gwlb.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/util.inc | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index 766eb2e..8984c45 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -30,7 +30,7 @@ require_once("config.inc"); function easyrule_find_rule_interface($int) { global $config; /* Borrowed from firewall_rules.php */ - $iflist = get_configured_interface_with_descr(false, true); + $iflist = get_configured_interface_with_descr(true); if ($config['pppoe']['mode'] == "server") { $iflist['pppoe'] = "PPPoE Server"; diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index d7cecc0..cba07b4 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -638,7 +638,7 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive if ($disabled == false) { $iflist = get_configured_interface_with_descr(); } else { - $iflist = get_configured_interface_with_descr(false, true); + $iflist = get_configured_interface_with_descr(true); } /* Process/add dynamic v4 gateways. */ diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index d50aab8..4f309f5 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -4879,7 +4879,7 @@ function convert_friendly_interface_to_friendly_descr($interface) { return get_interface_linklocal($interface); } else { /* if list */ - $ifdescrs = get_configured_interface_with_descr(false, true); + $ifdescrs = get_configured_interface_with_descr(true); foreach ($ifdescrs as $if => $ifname) { if ($if == $interface || $ifname == $interface) { return $ifname; diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index d294d1d..6820a24 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1408,16 +1408,13 @@ function get_configured_interface_list_by_realif($only_opt = false, $withdisable } /* return the configured interfaces list with their description. */ -function get_configured_interface_with_descr($only_opt = false, $withdisabled = false) { +function get_configured_interface_with_descr($withdisabled = false) { global $config, $user_settings; $iflist = array(); /* if list */ foreach ($config['interfaces'] as $if => $ifdetail) { - if ($only_opt && ($if == "wan" || $if == "lan")) { - continue; - } if (isset($ifdetail['enable']) || $withdisabled == true) { if (empty($ifdetail['descr'])) { $iflist[$if] = strtoupper($if); |
