From bb6d69cc98b7475d572e4068abe6f346659ded46 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 25 Sep 2023 14:58:58 +0200 Subject: [PATCH] mvc: inline one time use of $parentKey --- src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php | 3 +-- src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php index cb0c0f9eb..e8944d39d 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php +++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.php @@ -50,11 +50,10 @@ class IPsec extends BaseModel if ($validateFullModel || $node->isFieldChanged()) { $tagName = $node->getInternalXMLTagName(); $parentNode = $node->getParentNode(); - $parentKey = $parentNode->__reference; $parentTagName = $parentNode->getInternalXMLTagName(); if ($parentTagName === 'keyPair' && in_array($tagName, ['keyType', 'privateKey', 'publicKey'])) { - $keyPairs[$parentKey] = $parentNode; + $keyPairs[$parentNode->__reference] = $parentNode; } } } diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php index de474db4b..28718ae2e 100644 --- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php +++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php @@ -52,10 +52,10 @@ class OpenVPN extends BaseModel if ($validateFullModel || $node->isFieldChanged()) { $tagName = $node->getInternalXMLTagName(); $parentNode = $node->getParentNode(); - $parentKey = $parentNode->__reference; $parentTagName = $parentNode->getInternalXMLTagName(); + if ($parentTagName === 'Instance') { - $instances[$parentKey] = $parentNode; + $instances[$parentNode->__reference] = $parentNode; } } }