From db69027dda5c31bdf0b0ecb6dfaf1263bf5c1533 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 10 May 2023 15:48:12 +0200 Subject: [PATCH] wizard: may end up duplicating WAN_GW which is bad PR: https://forum.opnsense.org/index.php?topic=33864.0 --- src/wizard/system.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/wizard/system.xml b/src/wizard/system.xml index 06f52c817..828356ed4 100644 --- a/src/wizard/system.xml +++ b/src/wizard/system.xml @@ -612,19 +612,18 @@ if (!empty($config['wizardtemp']['wangateway'])) { $found = false; $defaultgw_found = false; foreach ($config['gateways']['gateway_item'] as & $gw) { - if ($gw['interface'] != "wan") - continue; - if (isset($gw['defaultgw'])) + if (isset($gw['defaultgw'])) { $defaultgw_found = true; - if ($gw['name'] == 'WAN_GW' || (!empty($config['wizardtemp']['wangateway']) && $gw['gateway'] == $config['wizardtemp']['wangateway'])) { + } + if ($gw['name'] == 'WAN_GW') { $found = true; $gw['gateway'] = $config['wizardtemp']['wangateway']; $config['interfaces']['wan']['gateway'] = $gw['name']; } } if (!$found) { - $newgw = array(); - $newgw['interface'] = "wan"; + $newgw = []; + $newgw['interface'] = 'wan'; $newgw['gateway'] = $config['wizardtemp']['wangateway']; $newgw['name'] = 'WAN_GW'; $newgw['weight'] = 1;