lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(mvc) change option field to use inclusion in stead of regex match

Browse Source
This commit is contained in:
Ad Schellevis 2015-05-29 11:34:46 +02:00
parent fbcec02f85
commit b8449cfcf8
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
View File

@ -29,7 +29,7 @@
*/
namespace OPNsense\Base\FieldTypes;
use Phalcon\Validation\Validator\Regex;
use Phalcon\Validation\Validator\InclusionIn;
/**
* Class OptionField
@ -89,34 +89,17 @@ class OptionField extends BaseField
}
/**
* @return array returns Text/regex validator
* @return array returns InclusionIn validator
*/
public function getValidators()
{
// build validation mask
$validationMask = '(';
$countid = 0 ;
foreach ($this->internalOptionList as $key => $value) {
if ($countid > 0) {
$validationMask .= '|';
}
if ($key == "") {
// match on empty strings
$validationMask .= "^$";
} else {
$validationMask .= $key ;
}
$countid++;
}
$validationMask .= ')';
if ($this->internalValidationMessage == null) {
$msg = "option not in list" ;
} else {
$msg = $this->internalValidationMessage;
}
if (($this->internalIsRequired == true || $this->internalValue != null) && $validationMask != null) {
return array(new Regex(array('message' => $msg,'pattern'=>trim($validationMask))));
if (($this->internalIsRequired == true || $this->internalValue != null)) {
return array(new InclusionIn(array('message' => $msg,'domain'=>array_keys($this->internalOptionList))));
} else {
// empty field and not required, skip this validation.
return array();