Firewall: Rules - fix presentation when alias name overlaps group name. closes https://github.com/opnsense/core/issues/8423

Unfortunately we can't prevent all overlaps, but at least we cab make it consistent with the rules being generated. loadAliasMap() overlays aliases on top of networks (and interface groups), swapping the order makes sure we thread them equally.
This commit is contained in:
Ad Schellevis 2025-04-01 20:48:29 +02:00
parent 8c609298f3
commit 4de4bd2774

View File

@ -233,10 +233,10 @@ function filter_rule_address($adr) {
$result = [];
$items = isset($adr['network']) ? $adr['network'] : ($adr['address'] ?? '');
foreach (explode(',', $items) as $item) {
if (isset($specialnets[$item])) {
$result[] = $specialnets[$item];
} elseif (is_alias($item)) {
if (is_alias($item)) {
$result[] = filter_rule_item_alias_tooltip($item);
} elseif(isset($specialnets[$item])) {
$result[] = $specialnets[$item];
} else {
$result[] = $item;
}