system: no more arguments for last two callers of function

This commit is contained in:
Franco Fichtner 2018-09-22 21:46:06 +02:00
parent d93f60bf08
commit f5d2ee6fea
3 changed files with 11 additions and 16 deletions

View File

@ -960,7 +960,7 @@ function system_arp_wrong_if()
));
}
function get_possible_listen_ips($include_ipv6_link_local = false)
function get_possible_listen_ips()
{
global $config;
@ -982,13 +982,12 @@ function get_possible_listen_ips($include_ipv6_link_local = false)
$tmp["name"] = $ifacename;
$tmp["value"] = $iface;
$listenips[] = $tmp;
if ($include_ipv6_link_local) {
$llip = find_interface_ipv6_ll(get_real_interface($iface, 'inet6'));
if (!empty($llip)) {
$tmp["name"] = "{$ifacename} IPv6 Link-Local";
$tmp["value"] = $llip;
$listenips[] = $tmp;
}
$llip = find_interface_ipv6_ll(get_real_interface($iface, 'inet6'));
if (!empty($llip)) {
$tmp['name'] = "{$ifacename} IPv6 Link-Local";
$tmp['value'] = $llip;
$listenips[] = $tmp;
}
}

View File

@ -187,13 +187,11 @@ include("head.inc"); ?>
<td>
<select name="sourceip" class="selectpicker" data-size="5" data-live-search="true">
<option value=""><?= gettext('Any') ?></option>
<?php
foreach (get_possible_listen_ips(true) as $sip):?>
<?php foreach (get_possible_listen_ips() as $sip): ?>
<option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip) ? "selected=\"selected\"" : "";?>>
<?=htmlspecialchars($sip['name']);?>
</option>
<?php
endforeach;?>
<?php endforeach ?>
</select>
</td>
</tr>

View File

@ -128,13 +128,11 @@ include("head.inc");
<td>
<select name="sourceip" class="selectpicker">
<option value=""><?= gettext('Any') ?></option>
<?php
foreach (get_possible_listen_ips(true) as $sip):?>
<?php foreach (get_possible_listen_ips() as $sip): ?>
<option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $pconfig['sourceip']) ? "selected=\"selected\"" : "";?>>
<?=htmlspecialchars($sip['name']);?>
</option>
<?php
endforeach; ?>
<?php endforeach ?>
</select>
</td>
</tr>