diff --git a/LICENSE b/LICENSE index 7abe09341..8d95ff1e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014-2024 Ad Schellevis +Copyright (c) 2014-2025 Ad Schellevis Copyright (c) 2017 Alexander Shursha Copyright (c) 2004 Bachman Kharazmi Copyright (c) 2005-2008 Bill Marquette diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php index 848406e6e..7fc769b66 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php +++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php @@ -33,7 +33,6 @@ use OPNsense\Base\Messages\Message; use OPNsense\Base\BaseModel; use OPNsense\Core\Config; - /** * Class IPsec * @package OPNsense\IPsec @@ -201,7 +200,7 @@ class IPsec extends BaseModel $result[$target_key] = !empty((string)$item) ? 'yes' : 'no'; } elseif (is_a($item, "OPNsense\\Base\\FieldTypes\\AuthenticationServerField")) { $servers = []; - foreach(explode(',', (string)$item) as $item) { + foreach (explode(',', (string)$item) as $item) { $idx = 'server' . (string)(count($servers) + 1); $mapping = []; if (isset($cnf->authserver)) { @@ -218,7 +217,6 @@ class IPsec extends BaseModel } } } - } $result[$target_key] = $servers; } elseif ((string)$item != '') { diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Migrations/M1_0_4.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/Migrations/M1_0_4.php index a8e81fdfd..d23083209 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Migrations/M1_0_4.php +++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Migrations/M1_0_4.php @@ -102,7 +102,8 @@ class M1_0_4 extends BaseModelMigration } else { if (isset($cnf->ipsec->phase1)) { foreach ($cnf->ipsec->phase1 as $phase1) { - if (!isset($phase1->disabled) && isset($phase1->mobile) && + if ( + !isset($phase1->disabled) && isset($phase1->mobile) && $phase1->authentication_method == 'eap-radius' ) { $model->charon->plugins->{'eap-radius'}->servers = (string)$phase1->authservers;