From c4c7e8ab53ef87ec373ff330702139f2ebda52fa Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 4 Oct 2020 10:12:18 +0200 Subject: [PATCH] src: style sweep --- .../Diagnostics/Api/TrafficController.php | 1 - .../OPNsense/Diagnostics/LogController.php | 24 +++++++++---------- .../Firewall/FieldTypes/AliasContentField.php | 3 ++- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php index 779ea03dd..7fdd444b4 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php @@ -78,6 +78,5 @@ class TrafficController extends ApiControllerBase } } return $response; - } } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php index dd2633faf..e980961f2 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LogController.php @@ -46,18 +46,18 @@ class LogController extends IndexController /* XXX manually hook up known services for now */ switch ($service) { - case 'ipsec': - $this->view->service = 'ipsec'; - break; - case 'suricata': - $this->view->service = 'ids'; - break; - case 'squid': - $this->view->service = 'proxy'; - break; - default: - /* no service API at the moment */ - break; + case 'ipsec': + $this->view->service = 'ipsec'; + break; + case 'suricata': + $this->view->service = 'ids'; + break; + case 'squid': + $this->view->service = 'proxy'; + break; + default: + /* no service API at the moment */ + break; } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php index 382de06c6..4d59d8caf 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php @@ -199,7 +199,8 @@ class AliasContentField extends BaseField $domain_alias_count++; } } - if (strpos($network, "!") === 0 && + if ( + strpos($network, "!") === 0 && (Util::isIpAddress(substr($network, 1)) || Util::isSubnet(substr($network, 1))) ) { // exclude address or network (https://www.freebsd.org/doc/handbook/firewalls-pf.html 30.3.2.4)