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

mvc: UrlField validation message cleanup

Browse Source
This commit is contained in:
Franco Fichtner 2023-09-22 11:23:01 +02:00
parent 465f7fa8bb
commit 8d8cc03ac3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UrlField.php
View File

@ -42,9 +42,12 @@ class UrlField extends BaseField
protected $internalIsContainer = false;
/**
* @var string default validation message string
* {@inheritdoc}
*/
protected $internalValidationMessage = "invalid url";
protected function defaultValidationMessage()
{
return gettext('Invalid URL.');
}
/**
* retrieve field validators for this field type
@ -54,7 +57,7 @@ class UrlField extends BaseField
{
$validators = parent::getValidators();
if ($this->internalValue != null) {
$validators[] = new UrlValidator(array('message' => $this->internalValidationMessage));
$validators[] = new UrlValidator(['message' => $this->getValidationMessage()]);
}
return $validators;
}

3
src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
View File

@ -4,8 +4,7 @@
<description>Firewall aliases</description>
<items>
<geoip>
<url type="UrlField">
</url>
<url type="UrlField"/>
</geoip>
<aliases>
<alias type=".\AliasField">

1
src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
View File

@ -387,7 +387,6 @@
</filename>
<url type="UrlField">
<Required>Y</Required>
<ValidationMessage>This does not look like a valid url.</ValidationMessage>
</url>
<username type="TextField">
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>