diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/VxLan.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/VxLan.php index 5b36541bf..bf391a6d5 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/VxLan.php +++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/VxLan.php @@ -1,7 +1,7 @@ vxlandev; // Validate that values in Fields have been changed, prevents configuration save lockout when invalid data is present. - if ($validateFullModel || + if ( + $validateFullModel || $vxlan->vxlangroup->isFieldChanged() || $vxlan->vxlanremote->isFieldChanged() || $vxlan->vxlandev->isFieldChanged() ) { // Validation 1: At least one of vxlangroup and vxlanremote must be populated, but not both. - if ((!empty($vxlangroup) && !empty($vxlanremote)) || + if ( + (!empty($vxlangroup) && !empty($vxlanremote)) || (empty($vxlangroup) && empty($vxlanremote)) ) { $messages->appendMessage(new Message( diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php index bcc787b67..17e0aa33a 100644 --- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php +++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php @@ -66,7 +66,8 @@ class OpenVPN extends BaseModel ); } } elseif ($instance->role == 'server') { - if ($instance->dev_type == 'tun' && + if ( + $instance->dev_type == 'tun' && empty((string)$instance->server) && empty((string)$instance->server_ipv6) ) {