lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: fix value lookup in LinkAddressField #8161

Browse Source 
Do not use internalValue since it is only the default.
This commit is contained in:
Franco Fichtner 2024-12-23 14:20:11 +01:00
parent d40a4dcc5a
commit e628c48968
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
View File

@ -93,17 +93,16 @@ class LinkAddressField extends BaseField
public function getValidators()
{
$validators = parent::getValidators();
if ($this->internalValue != null) {
$validators[] = new CallbackValidator(["callback" => function ($data) {
$messages = [];
if (isset(self::$known_addresses[$data])) {
return $messages;
} elseif (!Util::isIpAddress($data)) {
$messages[] = gettext('A valid network address is required.');
}
$validators[] = new CallbackValidator(["callback" => function ($data) {
$messages = [];
if (isset(self::$known_addresses[$data])) {
return $messages;
}]);
}
} elseif (!Util::isIpAddress($data)) {
$messages[] = gettext('A valid network address is required.');
}
return $messages;
}]);
return $validators;
}
@ -113,24 +112,29 @@ class LinkAddressField extends BaseField
*/
public function getDescription()
{
if (isset(self::$known_addresses[$this->internalValue])) {
return self::$known_addresses[$this->internalValue];
$value = $this->getCurrentValue() ?? '';
if (isset(self::$known_addresses[$value])) {
return self::$known_addresses[$value];
}
return $this->internalValue;
return $value;
}
/**
* return either ipaddr or if field, only one should be used, addresses are preferred.
*/
public function __toString()
public function getCurrentValue(): ?string
{
$parent = $this->getParentNode();
foreach (['ipaddr', 'if'] as $fieldname) {
if (!empty((string)$parent->$fieldname)) {
return (string)$parent->$fieldname;
}
}
return (string)$this->internalValue;
return null;
}
/**