From 4acc838e4dc19e87affeb4f5a22d9a7dfe0470f6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 15 Jul 2023 13:16:46 +0200 Subject: [PATCH] src: style sweep --- .../OPNsense/DHCPv4/Api/LeasesController.php | 2 +- .../OPNsense/DHCPv6/Api/LeasesController.php | 2 +- .../app/library/OPNsense/Firewall/Util.php | 2 +- .../OPNsense/Base/FieldTypes/ArrayField.php | 1 - .../Firewall/FieldTypes/GroupField.php | 1 - .../Firewall/FieldTypes/GroupNameField.php | 1 - .../Firewall/FieldTypes/InterfaceField.php | 2 +- .../OPNsense/IPsec/FieldTypes/SPDField.php | 1 - .../OPNsense/IPsec/FieldTypes/VTIField.php | 2 +- src/opnsense/scripts/dhcp/cleanup_leases6.php | 2 +- .../conf/actions.d/actions_dhcpd6.conf | 100 +++++++++--------- 11 files changed, 56 insertions(+), 60 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php index 50b0d2689..1aed412db 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php @@ -113,7 +113,7 @@ class LeasesController extends ApiControllerBase /* include manufacturer info */ $leases[$idx]['man'] = ''; if ($lease['mac'] != '') { - $mac_hi = strtoupper(substr(str_replace(':', '', $lease['mac']),0, 6)); + $mac_hi = strtoupper(substr(str_replace(':', '', $lease['mac']), 0, 6)); $leases[$idx]['man'] = $mac_man[$mac_hi]; } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php index c4614740e..166a39eef 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php @@ -118,7 +118,7 @@ class LeasesController extends ApiControllerBase foreach ($config->dhcpdv6->children() as $dhcpif => $dhcpifconf) { $if = $config->interfaces->$dhcpif; if (!empty((string)$if->ipaddrv6) && !empty((string)$if->subnetv6)) { - $if_ranges[$dhcpif] = (string)$if->ipaddrv6.'/'.(string)$if->subnetv6; + $if_ranges[$dhcpif] = (string)$if->ipaddrv6 . '/' . (string)$if->subnetv6; } } diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php index 6d6ba016a..fa407e729 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php @@ -354,7 +354,7 @@ class Util private static function isIPv6InCIDR($ip, $cidr) { - $inet_to_bits = function($ip) { + $inet_to_bits = function ($ip) { $split = str_split($ip); $bin_ip = ''; foreach ($split as $char) { diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php index 30e9ed335..ac19367cc 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php @@ -247,5 +247,4 @@ class ArrayField extends BaseField yield $key => $node; } } - } diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php index ff0580f4a..01393826c 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php @@ -33,7 +33,6 @@ namespace OPNsense\Firewall\FieldTypes; use OPNsense\Base\FieldTypes\ArrayField; use OPNsense\Base\FieldTypes\TextField; - class GroupField extends ArrayField { protected static $internalStaticChildren = []; diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php index 95e125fcf..262e357fe 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php @@ -32,7 +32,6 @@ use OPNsense\Base\FieldTypes\BaseField; use OPNsense\Base\Validators\CallbackValidator; use OPNsense\Core\Config; - /** * Class GroupNameField * @package OPNsense\Base\FieldTypes diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php index 55c10da08..2c6fad42c 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php @@ -52,4 +52,4 @@ class InterfaceField extends BaseListField $this->internalOptionList = self::$parent_interfaces; return parent::actionPostLoadingEvent(); } -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/SPDField.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/SPDField.php index 7c4c2b01d..4bac11282 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/SPDField.php +++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/SPDField.php @@ -37,7 +37,6 @@ use OPNsense\Core\Config; class SPDField extends ArrayField { - protected static $internalStaticChildren = []; /** diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/VTIField.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/VTIField.php index da4ebb3ee..cfdb0fc7f 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/VTIField.php +++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/FieldTypes/VTIField.php @@ -63,7 +63,7 @@ class VTIField extends ArrayField foreach ($this->iterateItems() as $key => $node) { $type_node = new TextField(); $type_node->setInternalIsVirtual(); - $type_node->setValue(strpos($key, 'ipsec') === 0 ? 'legacy' : 'vti' ); + $type_node->setValue(strpos($key, 'ipsec') === 0 ? 'legacy' : 'vti'); $node->addChildNode('origin', $type_node); } } diff --git a/src/opnsense/scripts/dhcp/cleanup_leases6.php b/src/opnsense/scripts/dhcp/cleanup_leases6.php index 44432f19e..c8a9447ab 100755 --- a/src/opnsense/scripts/dhcp/cleanup_leases6.php +++ b/src/opnsense/scripts/dhcp/cleanup_leases6.php @@ -61,7 +61,7 @@ if (isset($opts['s'])) { $removed_leases = 0; $fin = @fopen($dhcp_lease_file, "r+"); -$fout = @fopen($dhcp_lease_file.".new", "w"); +$fout = @fopen($dhcp_lease_file . ".new", "w"); if ($fin && flock($fin, LOCK_EX)) { $iaaddr = ""; $content_to_flush = array(); diff --git a/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf b/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf index 473d164e5..a6e24ab56 100644 --- a/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf +++ b/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf @@ -1,50 +1,50 @@ -[list.leases] -command:/usr/local/opnsense/scripts/dhcp/get_leases6.py -parameters:--inactive %s -type:script_output -message:list dhcpv6 leases %s - -[list.static] -command:/usr/local/sbin/pluginctl -r static_mapping 6 -parameters:%s -type:script_output -message: list dhcpv6 static mappings %s - -[update.prefixes] -command:/usr/local/opnsense/scripts/dhcp/prefixes.php -parameters: -type:script -message:update IPv6 prefixes - -[start] -command:/usr/local/sbin/pluginctl -s dhcpd6 start -parameters: -type:script -message:Starting dhcpd6 -description:Start DHCPd6 - -[stop] -command:/usr/local/sbin/pluginctl -s dhcpd6 stop -parameters: -type:script -message:Stopping dhcpd6 -description:Stop DHCPd6 - -[restart] -command:/usr/local/sbin/pluginctl -s dhcpd6 restart -parameters:%s -type:script -message:Restarting %s dhcpd6 -description:Restart DHCPd6 - -[status] -command:/usr/local/sbin/pluginctl -s dhcpd6 status -parameters: -type:script_output -message:Request DHCPd6 status - -[remove.lease] -command:/usr/local/opnsense/scripts/dhcp/cleanup_leases6.php -parameters:-d=%s -s -type:script_output -message:remove lease for %s +[list.leases] +command:/usr/local/opnsense/scripts/dhcp/get_leases6.py +parameters:--inactive %s +type:script_output +message:list dhcpv6 leases %s + +[list.static] +command:/usr/local/sbin/pluginctl -r static_mapping 6 +parameters:%s +type:script_output +message: list dhcpv6 static mappings %s + +[update.prefixes] +command:/usr/local/opnsense/scripts/dhcp/prefixes.php +parameters: +type:script +message:update IPv6 prefixes + +[start] +command:/usr/local/sbin/pluginctl -s dhcpd6 start +parameters: +type:script +message:Starting dhcpd6 +description:Start DHCPd6 + +[stop] +command:/usr/local/sbin/pluginctl -s dhcpd6 stop +parameters: +type:script +message:Stopping dhcpd6 +description:Stop DHCPd6 + +[restart] +command:/usr/local/sbin/pluginctl -s dhcpd6 restart +parameters:%s +type:script +message:Restarting %s dhcpd6 +description:Restart DHCPd6 + +[status] +command:/usr/local/sbin/pluginctl -s dhcpd6 status +parameters: +type:script_output +message:Request DHCPd6 status + +[remove.lease] +command:/usr/local/opnsense/scripts/dhcp/cleanup_leases6.php +parameters:-d=%s -s +type:script_output +message:remove lease for %s