From ee34fbb6fabfcb24eae585b5adb160789e20b881 Mon Sep 17 00:00:00 2001 From: Stephan de Wit Date: Mon, 6 Mar 2023 16:22:35 +0100 Subject: [PATCH] Util: rename to isSubnetStrict for clarity --- src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php | 2 +- .../app/models/OPNsense/Base/Validators/NetworkValidator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php index 446f2caba..1b9a2864a 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php @@ -99,7 +99,7 @@ class Util * @param string $network network * @return boolean */ - public static function isStrict($network) + public static function isSubnetStrict($network) { if (self::isSubnet($network)) { list($net, $mask) = explode('/', $network); diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php index 26a9eefc7..6c2e74b8b 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php @@ -111,7 +111,7 @@ class NetworkValidator extends BaseValidator } } - if ($this->getOption('strict') === true && !Util::isStrict($cidr)) { + if ($this->getOption('strict') === true && !Util::isSubnetStrict($cidr)) { $result = false; } }