From a9ecea3dcd4aa7abfc964d9c3ebb957a9a086762 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 12 Feb 2023 19:12:30 +0100
Subject: [PATCH] php8.x - fix some deprecation warnings

---
 src/etc/inc/plugins.inc.d/openvpn.inc                     | 8 ++++----
 src/etc/inc/plugins.inc.d/vxlan.inc                       | 4 +++-
 .../models/OPNsense/Base/Validators/NetworkValidator.php  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 3e34906bf..a2a238da0 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -443,7 +443,7 @@ function openvpn_add_keyfile($data, &$conf, $mode_id, $directive, $opt = '')
 {
     $fpath = "/var/etc/openvpn/{$mode_id}.{$directive}";
     openvpn_create_dirs();
-    $data = str_replace("\r", "", base64_decode($data));
+    $data = !empty($data) ? str_replace("\r", "", base64_decode($data)) : '';
     file_put_contents($fpath, str_replace("\n\n", "\n", $data));
     @chmod($fpath, 0600);
 
@@ -542,8 +542,8 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
 
     // server specific settings
     if ($mode == 'server') {
-        list($ip, $cidr) = explode('/', $settings['tunnel_network']);
-        list($ipv6, $prefix) = explode('/', $settings['tunnel_networkv6']);
+        list($ip, $cidr) = explode('/', $settings['tunnel_network'] ?? '');
+        list($ipv6, $prefix) = explode('/', $settings['tunnel_networkv6'] ?? '');
         $mask = gen_subnet_mask($cidr);
 
         // client connect and disconnect handling
@@ -1520,7 +1520,7 @@ function openvpn_refresh_crls()
                     if (!empty($settings['crlref'])) {
                         $crl = lookup_crl($settings['crlref']);
                         $fpath = "/var/etc/openvpn/server{$settings['vpnid']}.crl-verify";
-                        file_put_contents($fpath, base64_decode($crl['text']));
+                        file_put_contents($fpath, !empty($crl['text']) ? base64_decode($crl['text']) : '');
                         @chmod($fpath, 0644);
                     }
                     break;
diff --git a/src/etc/inc/plugins.inc.d/vxlan.inc b/src/etc/inc/plugins.inc.d/vxlan.inc
index fd9b16a05..6fa7a4f28 100644
--- a/src/etc/inc/plugins.inc.d/vxlan.inc
+++ b/src/etc/inc/plugins.inc.d/vxlan.inc
@@ -110,7 +110,9 @@ function vxlan_configure_do($verbose = false, $device = null)
             $current_settings['vxlanid'] = $interfaces_details[$device_name]['vxlan']['vni'];
             $current_settings['vxlanlocal'] = explode(":", $interfaces_details[$device_name]['vxlan']['local'])[0];
             $current_settings['vxlanremote'] = explode(":", $interfaces_details[$device_name]['vxlan']['remote'])[0];
-            $current_settings['vxlangroup'] = explode(":", $interfaces_details[$device_name]['vxlan']['group'])[0];
+            if (!empty($interfaces_details[$device_name]['vxlan']['group'])) {
+                $current_settings['vxlangroup'] = explode(":", $interfaces_details[$device_name]['vxlan']['group'])[0];
+            }
         }
         // gather settings, detect changes
         $ifcnfcmd = '/sbin/ifconfig %s';
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
index 7127533a6..1215aa9bc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
@@ -65,7 +65,7 @@ class NetworkValidator extends BaseValidator
         foreach ($values as $value) {
             // parse filter options
             $filterOpt = 0;
-            switch (strtolower($this->getOption('version'))) {
+            switch (strtolower($this->getOption('version') ?? '')) {
                 case "ipv4":
                     $filterOpt |= FILTER_FLAG_IPV4;
                     break;