From 2fef2a80b04bc669f90db3984b013d8eaad66ba6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 7 Jan 2025 08:20:25 +0100 Subject: [PATCH] src: style sweep --- .../OPNsense/Core/Api/TunablesController.php | 2 +- .../OPNsense/Core/FieldTypes/TunableField.php | 2 +- .../app/models/OPNsense/Firewall/Filter.php | 19 +++++++++++-------- .../mvc/app/models/OPNsense/Kea/KeaDhcpv4.php | 2 +- .../scripts/system/sysctl_defaults.php | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/TunablesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/TunablesController.php index 7f08eb433..f13e72d35 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/TunablesController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/TunablesController.php @@ -74,7 +74,7 @@ class TunablesController extends ApiMutableModelControllerBase Config::getInstance()->lock(); $factory_config = Config::getInstance()->toArrayFromFile('/usr/local/etc/config.xml', []); $mdl = $this->getModel()->Default(); - if (!empty($factory_config['sysctl']) && !empty($factory_config['sysctl']['item'])){ + if (!empty($factory_config['sysctl']) && !empty($factory_config['sysctl']['item'])) { foreach ($factory_config['sysctl']['item'] as $item) { $node = $mdl->item->Add(); foreach ($item as $key => $val) { diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php b/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php index 57c5b90ec..eed2980f8 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Core/FieldTypes/TunableField.php @@ -49,7 +49,7 @@ class TunableField extends ArrayField protected static function getStaticChildren() { $result = []; - foreach (self::$static_entries as $key => $item){ + foreach (self::$static_entries as $key => $item) { /* md5($key) ensures static keys identifiable as static options */ $result[md5($key)] = [ 'tunable' => $key, diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php index 171d58bf5..a8dae895c 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php @@ -114,16 +114,18 @@ class Filter extends BaseModel ) ) { $messages->appendMessage(new Message( - gettext("Inverting interfaces is only allowed for ". + gettext("Inverting interfaces is only allowed for " . "single targets to avoid mis-interpretations"), $rule->interfacenot->__reference )); } if ($rule->statetype == 'none') { - foreach ([ + foreach ( + [ 'statetimeout', 'max', 'max-src-states', 'max-src-nodes', 'adaptivestart', 'adaptiveend', 'max-src-conn' - ] as $fieldname) { + ] as $fieldname + ) { if (!empty((string)$rule->$fieldname)) { $messages->appendMessage(new Message( gettext("Invalid option when statetype is none."), @@ -133,10 +135,12 @@ class Filter extends BaseModel } } if (!in_array($rule->protocol, ['TCP', 'TCP/UDP'])) { - foreach ([ + foreach ( + [ 'statetimeout', 'max-src-conn', 'tcpflags1', 'tcpflags2', 'max-src-conn-rate', 'max-src-conn-rates', 'overload' - ] as $fieldname) { + ] as $fieldname + ) { if (!empty((string)$rule->$fieldname)) { $messages->appendMessage(new Message( gettext("Invalid option for other than TCP protocol choices."), @@ -155,7 +159,7 @@ class Filter extends BaseModel if (!empty((string)$rule->tcpflags1) && empty((string)$rule->tcpflags2)) { $messages->appendMessage(new Message( - gettext("If you specify TCP flags that should be set ". + gettext("If you specify TCP flags that should be set " . "you should specify out of which flags as well."), $rule->tcpflags2->__reference )); @@ -198,12 +202,11 @@ class Filter extends BaseModel if ((string)$rule->{'set-prio'} == '' && (string)$rule->{'set-prio-low'} != '') { $messages->appendMessage(new Message( - gettext("Set priority for low latency and acknowledgements ". + gettext("Set priority for low latency and acknowledgements " . "requires a set priority for normal packets."), $rule->{'set-prio-low'}->__reference )); } - } } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php index 45fa55cab..f1fef6ff8 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php +++ b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php @@ -142,7 +142,7 @@ class KeaDhcpv4 extends BaseModel 'id' => $subnet_id++, 'subnet' => (string)$subnet->subnet, 'next-server' => (string)$subnet->next_server, - 'match-client-id'=> !empty((string)$subnet->{'match-client-id'}), + 'match-client-id' => !empty((string)$subnet->{'match-client-id'}), 'option-data' => [], 'pools' => [], 'reservations' => [] diff --git a/src/opnsense/scripts/system/sysctl_defaults.php b/src/opnsense/scripts/system/sysctl_defaults.php index a52f13aaa..b32905cbb 100755 --- a/src/opnsense/scripts/system/sysctl_defaults.php +++ b/src/opnsense/scripts/system/sysctl_defaults.php @@ -30,4 +30,4 @@ require_once("config.inc"); require_once("system.inc"); -echo json_encode(system_sysctl_defaults()); \ No newline at end of file +echo json_encode(system_sysctl_defaults());