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 | |
parent | 8a0af41adc9c29ccf7b8dabb3b7658abf46054a6 (diff) | |
download | pfsense-f593f80b48027485c97516dcda4336b31a9f58a2.zip pfsense-f593f80b48027485c97516dcda4336b31a9f58a2.tar.gz |
Refactor get_configured_interface_with_descr remove unused parameter
-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 | ||||
-rwxr-xr-x | src/etc/rc.banner | 2 | ||||
-rwxr-xr-x | src/etc/rc.initial.setlanip | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_virtual_ip.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_virtual_ip_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 2 | ||||
-rw-r--r-- | src/usr/local/www/head.inc | 2 | ||||
-rwxr-xr-x | src/usr/local/www/interfaces.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_groups.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_groups_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/pkg.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/status_interfaces.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_common.inc | 2 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_filter.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_gateways_edit.php | 2 |
21 files changed, 22 insertions, 25 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); diff --git a/src/etc/rc.banner b/src/etc/rc.banner index 92d9e12..05f1e2c 100755 --- a/src/etc/rc.banner +++ b/src/etc/rc.banner @@ -32,7 +32,7 @@ $machine = trim(`uname -m`); print "*** Welcome to {$product} {$g['product_version_string']} ({$machine}) on {$hostname} ***\n"; -$iflist = get_configured_interface_with_descr(false, true); +$iflist = get_configured_interface_with_descr(true); foreach ($iflist as $ifname => $friendly) { /* point to this interface's config */ $ifconf = $config['interfaces'][$ifname]; diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip index b0b7144..25ed88e 100755 --- a/src/etc/rc.initial.setlanip +++ b/src/etc/rc.initial.setlanip @@ -134,7 +134,7 @@ function get_interface_config_description($iface) { $fp = fopen('php://stdin', 'r'); /* build an interface collection */ -$ifdescrs = get_configured_interface_with_descr(false, true); +$ifdescrs = get_configured_interface_with_descr(true); $count = count($ifdescrs); /* grab interface that we will operate on, unless there is only one interface */ diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index f3f3734..6e7584a 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -429,7 +429,7 @@ $section->addInput(new Form_Checkbox( $pconfig['nobinat'] ))->setHelp('Excludes the address from a later, more general, rule.'); -$iflist = get_configured_interface_with_descr(false, true); +$iflist = get_configured_interface_with_descr(true); foreach ($iflist as $if => $ifdesc) { if (have_ruleint_access($if)) { diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index ddba4fa..55fc463 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -667,7 +667,7 @@ $section->addInput(new Form_Checkbox( $pconfig['nordr'] ))->setHelp('This option is rarely needed. Don\'t use this without thorough knowledge of the implications.'); -$iflist = get_configured_interface_with_descr(false, true); +$iflist = get_configured_interface_with_descr(true); foreach ($iflist as $if => $ifdesc) { if (have_ruleint_access($if)) { diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index ad7e3d0..cc12353 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -472,7 +472,7 @@ $section->addInput(new Form_Checkbox( isset($pconfig['nonat']) ))->setHelp('In most cases this option is not required.'); -$iflist = get_configured_interface_with_descr(false, true); +$iflist = get_configured_interface_with_descr(true); foreach ($iflist as $if => $ifdesc) { if (have_ruleint_access($if)) { diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index 161cdda..476d71d 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -262,7 +262,7 @@ display_top_tabs($tab_array); </thead> <tbody> <?php -$interfaces = get_configured_interface_with_descr(false, true); +$interfaces = get_configured_interface_with_descr(true); $viplist = get_configured_vip_list(); foreach ($viplist as $vipname => $address) { diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index f550d83..3062bb8 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -290,7 +290,7 @@ include("head.inc"); function build_if_list() { $list = array(); - $interfaces = get_configured_interface_with_descr(false, true); + $interfaces = get_configured_interface_with_descr(true); $carplist = get_configured_vip_list('all', VIP_CARP); foreach ($carplist as $vipname => $address) { diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 0d4a849..96af68f 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -230,7 +230,7 @@ $specialnets = array( "pppoe" => gettext("PPPoE clients"), "l2tp" => gettext("L2TP clients")); -$spiflist = get_configured_interface_with_descr(false, true); +$spiflist = get_configured_interface_with_descr(true); foreach ($spiflist as $ifgui => $ifdesc) { $specialnets[$ifgui] = $ifdesc . " net"; $specialnets[$ifgui . 'ip'] = $ifdesc . " address"; diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 5943a55..736cc99 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -267,7 +267,7 @@ if ($platform['name'] == "uFW") { $interfaces_top[] = array(gettext("Switches"), "/switch_system.php"); } -$opts = get_configured_interface_with_descr(false, true); +$opts = get_configured_interface_with_descr(true); foreach ($opts as $oif => $odescr) { if (!isset($config['interfaces'][$oif]['ovpn'])) { diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index 7acec05..b6069fe 100755 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -50,7 +50,7 @@ if (isset($_POST['referer'])) { } // Get configured interface list -$ifdescrs = get_configured_interface_with_descr(false, true); +$ifdescrs = get_configured_interface_with_descr(true); $if = "wan"; @@ -2441,7 +2441,7 @@ function build_ipv6interface_list() { $list = array('' => ''); - $interfaces = get_configured_interface_with_descr(false, true); + $interfaces = get_configured_interface_with_descr(true); $dynv6ifs = array(); foreach ($interfaces as $iface => $ifacename) { diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index eb9a6e5..079afe9 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -91,7 +91,7 @@ display_top_tabs($tab_array); <td> <?php $members_arr = explode(" ", $ifgroupentry['members']); - $iflist = get_configured_interface_with_descr(false, true); + $iflist = get_configured_interface_with_descr(true); $memberses_arr = array(); foreach ($members_arr as $memb) { $memberses_arr[] = $iflist[$memb] ? $iflist[$memb] : $memb; diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index 3f3e979..9134d16 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -48,7 +48,7 @@ if (isset($id) && $a_ifgroups[$id]) { } $interface_list = get_configured_interface_with_descr(); -$interface_list_disabled = get_configured_interface_with_descr(false, true); +$interface_list_disabled = get_configured_interface_with_descr(true); $ifname_allowed_chars_text = gettext("Only letters (A-Z), digits (0-9) and '_' are allowed."); $ifname_no_digit_text = gettext("The group name cannot end with a digit."); diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index 305f28b..9358fd3 100644 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -143,7 +143,7 @@ if ($_REQUEST['act'] == "del") { ob_start(); -$iflist = get_configured_interface_with_descr(false, true); +$iflist = get_configured_interface_with_descr(true); $evaledvar = $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']; if ($pkg['custom_php_global_functions'] != "") { diff --git a/src/usr/local/www/status_interfaces.php b/src/usr/local/www/status_interfaces.php index 0c53fc4..3d645d1 100644 --- a/src/usr/local/www/status_interfaces.php +++ b/src/usr/local/www/status_interfaces.php @@ -94,7 +94,7 @@ $pgtitle = array(gettext("Status"), gettext("Interfaces")); $shortcut_section = "interfaces"; include("head.inc"); -$ifdescrs = get_configured_interface_with_descr(false, true); +$ifdescrs = get_configured_interface_with_descr(true); foreach ($ifdescrs as $ifdescr => $ifname): $ifinfo = get_interface_info($ifdescr); diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 808bec4..443f74e 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -546,7 +546,7 @@ function filter_form_firewall() { function status_logs_build_if_list() { - $iflist = get_configured_interface_with_descr(false, true); + $iflist = get_configured_interface_with_descr(true); //$iflist = get_interface_list(); // Allow extending of the firewall edit interfaces pfSense_handle_custom_code("/usr/local/pkg/firewall_nat/pre_interfaces_edit"); diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 0fcd838..467664a 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -124,7 +124,7 @@ filter_form_firewall(); // Now the forms are complete we can draw the log table and its controls if (!$rawfilter) { - $iflist = get_configured_interface_with_descr(false, true); + $iflist = get_configured_interface_with_descr(true); if ($iflist[$interfacefilter]) { $interfacefilter = $iflist[$interfacefilter]; diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 6c3f46f..c44100d 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -596,7 +596,7 @@ $section->addInput(new Form_Select( 'interface', '*Interface', $pconfig['friendlyiface'], - get_configured_interface_with_descr(false, true) + get_configured_interface_with_descr(true) ))->setHelp('Choose which interface this gateway applies to.'); $section->addInput(new Form_Select( |