lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interfaces: Other Types: VLAN - add not yet applied vlan's in model field.

Browse Source
This commit is contained in:
Ad Schellevis 2022-04-04 19:47:27 +02:00
parent d9eeb5d066
commit 6e4789f225
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php
View File

@ -60,11 +60,30 @@ class VlanInterfaceField extends BaseListField
) {
continue;
}
self::$interface_devices[$ifname] = sprintf(
"%s (%s) [%s]",
$ifname,
$details['macaddr'],
!empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
if (empty($details['vlan'])) {
self::$interface_devices[$ifname] = sprintf(
"%s (%s) [%s]",
$ifname,
$details['macaddr'],
!empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
);
} else {
self::$interface_devices[$ifname] = sprintf(
"%s (%s) [%s]",
$ifname,
sprintf("tag: %s, if: %s", $details['vlan']['tag'], $details['vlan']['parent']),
!empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
);
}
}
}
// append not yet applied vlan interfaces
foreach ($this->getParentModel()->vlan->iterateItems() as $key => $vlan) {
if (strpos((string)$vlan->vlanif, "qinq") !== 0 && !isset(self::$interface_devices[(string)$vlan->vlanif])) {
self::$interface_devices[(string)$vlan->vlanif] = sprintf(
"%s (%s) []",
(string)$vlan->vlanif,
sprintf("tag: %s, if: %s", (string)$vlan->tag, (string)$vlan->if)
);
}
}