(mvc, model) add support for lists of networks/addresses in NetworkField,...

(mvc, model) add support for lists of networks/addresses in NetworkField, requirement for https://github.com/opnsense/core/issues/1226

src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php

@@ -52,6 +52,11 @@ class NetworkField extends BaseField
      */
     protected $internalNetMaskRequired = false;
 
+    /**
+     * @var null when multiple values could be provided at once, specify the split character
+     */
+    protected $internalFieldSeparator = null;
+
     /**
      * always lowercase / trim networks
      * @param string $value
@@ -74,6 +79,15 @@ class NetworkField extends BaseField
         }
     }
 
+    /**
+     * if multiple addresses / networks maybe provided at once, set separator.
+     * @param $value separator
+     */
+    public function setFieldSeparator($value)
+    {
+        $this->internalFieldSeparator = $value;
+    }
+
     /**
      * retrieve field validators for this field type
      * @return array returns Text/regex validator
@@ -86,6 +100,7 @@ class NetworkField extends BaseField
                 // accept any as target
                 $validators[] = new NetworkValidator(array(
                     'message' => $this->internalValidationMessage,
+                    'split' => $this->internalFieldSeparator,
                     'netMaskRequired' => $this->internalNetMaskRequired
                     ));
             }

src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php

@@ -57,9 +57,14 @@ class NetworkValidator extends Validator implements ValidatorInterface
     public function validate(\Phalcon\Validation $validator, $attribute)
     {
         $result = true;
-        $value = $validator->getValue($attribute);
         $msg = $this->getOption('message');
-
+        $fieldSplit = $this->getOption('split', null);
+        if ($fieldSplit == null) {
+            $values = array($validator->getValue($attribute));
+        } else {
+            $values = explode($fieldSplit, $validator->getValue($attribute));
+        }
+        foreach ($values as $value) {
             // parse filter options
             $filterOpt = 0;
             switch (strtolower($this->getOption('version'))) {
@@ -115,6 +120,7 @@ class NetworkValidator extends Validator implements ValidatorInterface
                 // append validation message
                 $validator->appendMessage(new Message($msg, $attribute, 'NetworkValidator'));
             }
+        }
 
         return $result;
     }