From 061c43b4aab97618f67651146d2fcf533d85b008 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 11 Oct 2023 20:55:14 +0200 Subject: [PATCH] src: style sweep and plist fix --- plist | 1 + .../OPNsense/Interfaces/Api/VipSettingsController.php | 4 +++- .../app/models/OPNsense/Interfaces/FieldTypes/VipField.php | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plist b/plist index e1cb98f7c..62f281022 100644 --- a/plist +++ b/plist @@ -675,6 +675,7 @@ /usr/local/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml /usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/ACL/ACL.xml /usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LaggInterfaceField.php +/usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipField.php /usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipInterfaceField.php /usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipNetworkField.php /usr/local/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php index bf38614ec..b89053d0c 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php @@ -112,7 +112,9 @@ class VipSettingsController extends ApiMutableModelControllerBase return in_array($record->mode, $mode); }; } - $result = $this->searchBase('vip', [ + $result = $this->searchBase( + 'vip', + [ 'interface', 'mode', 'type', 'descr', 'subnet', 'subnet_bits', 'vhid', 'advbase', 'advskew', 'address', 'vhid_txt' ], diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipField.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipField.php index baca662de..95fe6a09f 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VipField.php @@ -33,7 +33,6 @@ namespace OPNsense\Interfaces\FieldTypes; use OPNsense\Base\FieldTypes\ArrayField; use OPNsense\Base\FieldTypes\TextField; - class VipField extends ArrayField { /** @@ -52,7 +51,7 @@ class VipField extends ArrayField $node->advskew ); } else { - $add_fields['vhid_txt'] = (string)$node->vhid ; + $add_fields['vhid_txt'] = (string)$node->vhid; } foreach ($add_fields as $key => $value) { $tmp_node = new TextField(); @@ -62,4 +61,4 @@ class VipField extends ArrayField } } } -} \ No newline at end of file +}