mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the PPP interface list. List all physical interfaces + VLANs and not the assigned ports.

Browse Source 
Ticket #5925
This commit is contained in:
Luiz Otavio O Souza 2016-02-25 07:56:18 -06:00
parent 34938b8d16
commit 84a2ff78a3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/usr/local/www/interfaces_ppps_edit.php
View File

@ -79,14 +79,6 @@ if (!is_array($config['ppps']['ppp'])) {
$a_ppps = &$config['ppps']['ppp'];
$portlist = get_configured_interface_with_descr();
if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $vlan) {
$portlist[$vlan['vlanif']] = $vlan;
}
}
if (isset($_REQUEST['type'])) {
$pconfig['type'] = $_REQUEST['type'];
}
@ -496,11 +488,8 @@ function build_country_list() {
return($list);
}
$port_count = 0;
$serport_count = 0;
function build_link_list() {
global $pconfig, $portlist, $port_count, $serport_count;
global $config, $pconfig;
$linklist = array('list' => array(), 'selected' => array());
@ -531,6 +520,12 @@ function build_link_list() {
}
} else {
$port_count = 0;
$portlist = get_interface_list();
if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $vlan) {
$portlist[$vlan['vlanif']] = $vlan;
}
}
foreach ($portlist as $ifn => $ifinfo) {
$port_count++;
$string = "";
@ -540,6 +535,12 @@ function build_link_list() {
if ($ifinfo['mac']) {
$string .= " ({$ifinfo['mac']})";
}
if ($ifinfo['friendly']) {
$string .= " - {$ifinfo['friendly']}";
}
if ($ifinfo['descr']) {
$string .= " - {$ifinfo['descr']}";
}
} else {
$string .= $ifinfo;
}