From 7c4bc839679fb860e4ee22ba027d1f50be05ffaf Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 23 Feb 2016 18:42:04 +0100 Subject: [PATCH] (mvc) small changes for https://github.com/opnsense/core/pull/789 --- .../app/models/OPNsense/Base/FieldTypes/NetworkField.php | 6 +++++- .../models/OPNsense/Base/Validators/NetworkValidator.php | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php index 405fcf488..97a9c9b77 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php @@ -67,7 +67,11 @@ class NetworkField extends BaseField */ public function setNetMaskRequired($value) { - $this->internalNetMaskRequired = (trim(strtolower($value)) == 'y' || intval($value) == 1); + if (trim(strtoupper($value)) == "Y") { + $this->internalNetMaskRequired = true; + } else { + $this->internalNetMaskRequired = false; + } } /** 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 57d102319..4b47b0fea 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php @@ -102,8 +102,7 @@ class NetworkValidator extends Validator implements ValidatorInterface } } } - } - else if($this->getOption('netMaskRequired') === true) { + } elseif ($this->getOption('netMaskRequired') === true) { $result = false; }