mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-14 08:34:39 +00:00
wizard: further tweaking for #7263
This commit is contained in:
parent
6f87280cd4
commit
bb17672ed8
@ -602,21 +602,22 @@ if (!empty($input_errors)) {
|
||||
</field>
|
||||
</fields>
|
||||
<stepafterformdisplay><![CDATA[
|
||||
$found = false;
|
||||
$defaultgw_found = false;
|
||||
$gateways = new \OPNsense\Routing\Gateways();
|
||||
$found = $defaultgw_found = false;
|
||||
|
||||
foreach ($gateways->gatewayIterator() as $gw) {
|
||||
if (!empty($gw['defaultgw'])) {
|
||||
$defaultgw_found = true;
|
||||
}
|
||||
|
||||
if ($gw['name'] == 'WAN_GW' && !empty($gw['uuid'])) {
|
||||
$found = true;
|
||||
$gateways->createOrUpdateGateway(['gateway' => $config['wizardtemp']['wangateway']], $gw['uuid']);
|
||||
$config['interfaces']['wan']['gateway'] = $gw['name'];
|
||||
$found = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
$newgw = [
|
||||
$gateways->createOrUpdateGateway([
|
||||
'interface' => 'wan',
|
||||
'gateway' => $config['wizardtemp']['wangateway'],
|
||||
'name' => 'WAN_GW',
|
||||
@ -624,15 +625,17 @@ if (!$found) {
|
||||
'monitor_disable' => 1,
|
||||
'descr' => "WAN Gateway",
|
||||
'defaultgw' => !$defaultgw_found,
|
||||
];
|
||||
|
||||
$gateways->createOrUpdateGateway($newgw);
|
||||
]);
|
||||
}
|
||||
|
||||
/* Assignments to $config only after this went through! */
|
||||
$config = OPNsense\Core\Config::getInstance()->toArray(listtags());
|
||||
|
||||
$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
|
||||
$config['system']['domain'] = $config['wizardtemp']['system']['domain'];
|
||||
if ($found) {
|
||||
$config['interfaces']['wan']['gateway'] = 'WAN_GW';
|
||||
}
|
||||
unset($config['wizardtemp']);
|
||||
|
||||
write_config();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user