opnsense/plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-04-12 19:41:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

dns/ddclient: reduce code and fix #5287

Browse Source
This commit is contained in:
Franco Fichtner
2026-03-04 08:35:24 +01:00
parent 1728943cca
commit cc2149dedf
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2021-2023 Deciso B.V.
* Copyright (C) 2021-2026 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,7 @@ class DynDNS extends BaseModel
{
$messages = parent::performValidation($validateFullModel);
$validate_servers = [];
foreach ($this->getFlatNodes() as $key => $node) {
$tagName = $node->getInternalXMLTagName();
$parentNode = $node->getParentNode();
@@ -51,27 +52,24 @@ class DynDNS extends BaseModel
}
}
}
foreach ($validate_servers as $key => $node) {
if ((string)$node->service == 'powerdns') {
if (empty($srv) || filter_var($srv, FILTER_VALIDATE_URL) === false) {
$messages->appendMessage(
new Message(
gettext("A valid URI is required."),
$key . ".server"
)
);
}
}
if ((string)$node->service != 'custom') {
$validate_url = false;
if ($node->service->isEqual('powerdns')) {
$validate_url = true;
} elseif (!$node->service->isEqual('custom')) {
continue;
}
$srv = (string)$node->server;
if (in_array((string)$node->protocol, ['get', 'post', 'put'])) {
if (in_array((string)$node->protocol, ['get', 'post', 'put']) || $validate_url) {
if (empty($srv) || filter_var($srv, FILTER_VALIDATE_URL) === false) {
$messages->appendMessage(
new Message(
gettext("A valid URI is required."),
$key . ".server"
gettext('A valid URI is required.'),
$key . '.server'
)
);
}
@@ -79,13 +77,14 @@ class DynDNS extends BaseModel
if (empty($srv) || filter_var($srv, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) === false) {
$messages->appendMessage(
new Message(
gettext("A valid domain is required."),
$key . ".server"
gettext('A valid domain is required.'),
$key . '.server'
)
);
}
}
}
return $messages;
}
}