From 76f84fdf67de219cfddd91909d0ee665cfc33be9 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 10 Sep 2024 21:43:38 +0200
Subject: [PATCH] src: style and stuff

---
 plist                                                  |  8 ++++++++
 src/etc/inc/plugins.inc.d/core.inc                     |  2 +-
 .../OPNsense/Interfaces/Api/VipSettingsController.php  | 10 +++++++---
 .../OPNsense/Trust/Api/SettingsController.php          |  1 -
 .../app/controllers/OPNsense/Trust/forms/settings.xml  |  2 +-
 .../mvc/app/views/OPNsense/Trust/settings.volt         |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/plist b/plist
index 41b2c2568..2c3c9dfd4 100644
--- a/plist
+++ b/plist
@@ -451,12 +451,15 @@
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CaController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CertController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CrlController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/Api/SettingsController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/CaController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/CertController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/CrlController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/SettingsController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/forms/dialogCa.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/forms/dialogCert.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/forms/dialogCrl.xml
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Trust/forms/settings.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/AclController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/AdvancedController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/DiagnosticsController.php
@@ -799,6 +802,9 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Trust/Cert.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CAsField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CertificatesField.php
+/usr/local/opnsense/mvc/app/models/OPNsense/Trust/General.php
+/usr/local/opnsense/mvc/app/models/OPNsense/Trust/General.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/Trust/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Unbound/FieldTypes/UnboundDomainField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Unbound/FieldTypes/UnboundInterfaceField.php
@@ -904,6 +910,7 @@
 /usr/local/opnsense/mvc/app/views/OPNsense/Trust/ca.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Trust/cert.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Trust/crl.volt
+/usr/local/opnsense/mvc/app/views/OPNsense/Trust/settings.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/acl.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/advanced.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/dnsbl.volt
@@ -1228,6 +1235,7 @@
 /usr/local/opnsense/scripts/system/swapinfo.py
 /usr/local/opnsense/scripts/system/sysctl.py
 /usr/local/opnsense/scripts/system/temperature.sh
+/usr/local/opnsense/scripts/system/tls_groups.py
 /usr/local/opnsense/scripts/system/trigger_config_changed_events.py
 /usr/local/opnsense/scripts/unbound/blocklists.py
 /usr/local/opnsense/scripts/unbound/blocklists/__init__.py
diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc
index f1e75df14..1597098d4 100644
--- a/src/etc/inc/plugins.inc.d/core.inc
+++ b/src/etc/inc/plugins.inc.d/core.inc
@@ -529,4 +529,4 @@ function core_trust_crl()
     if (!empty((string)$trust->install_crls)) {
         system_trust_configure();
     }
-}
\ No newline at end of file
+}
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 a827f6baa..f1b9cb23c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/VipSettingsController.php
@@ -191,9 +191,13 @@ class VipSettingsController extends ApiMutableModelControllerBase
             foreach ($this->getModel()->vip->iterateItems() as $vip) {
                 if ((string)$vip->mode == 'ipalias' && (string)$vip->vhid == (string)$node->vhid) {
                     $vhid = (string)$node->vhid;
-                    throw new UserException(sprintf(
-                        gettext("Cannot delete CARP Virtual IP, IP Alias with VHID Group %s still exists."), $vhid),
-                        gettext("Error"));
+                    throw new UserException(
+                        sprintf(
+                            gettext("Cannot delete CARP Virtual IP, IP Alias with VHID Group %s still exists."),
+                            $vhid
+                        ),
+                        gettext("Error")
+                    );
                 }
             }
         }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/SettingsController.php
index 8f915c44f..ab472269c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/SettingsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/SettingsController.php
@@ -47,6 +47,5 @@ class SettingsController extends ApiMutableModelControllerBase
             return ['status' => 'ok'];
         }
         return ['status' => 'failed'];
-
     }
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Trust/forms/settings.xml b/src/opnsense/mvc/app/controllers/OPNsense/Trust/forms/settings.xml
index beb66730b..319e76283 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Trust/forms/settings.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Trust/forms/settings.xml
@@ -71,4 +71,4 @@
         DTLS will be disabled.
         </help>
     </field>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Trust/settings.volt b/src/opnsense/mvc/app/views/OPNsense/Trust/settings.volt
index a65c52bce..1cbfd1c8e 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Trust/settings.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Trust/settings.volt
@@ -70,4 +70,4 @@ POSSIBILITY OF SUCH DAMAGE.
             <br/><br/>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>