From 9a3d88e8c9b7b845582e1a738437ad5d5d062db8 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 27 Mar 2024 11:07:55 +0100 Subject: [PATCH] fix domains speciallogfile ajax-check/note; improve ajax ip check in admin_ipsandports Signed-off-by: Michael Kaufmann --- admin_ipsandports.php | 6 ++++-- templates/Froxlor/assets/js/jquery/domains.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/admin_ipsandports.php b/admin_ipsandports.php index e8f796b3c..c660bc21c 100644 --- a/admin_ipsandports.php +++ b/admin_ipsandports.php @@ -142,8 +142,10 @@ } } elseif ($action == 'jqCheckIP') { $ip = $_POST['ip'] ?? ""; - if ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE | FILTER_FLAG_NO_PRIV_RANGE) == false) { - // returns notice if private network detected so we can display it + if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) { + echo json_encode('
'.lng('error.invalidip', [$ip]).'
'); + } elseif (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE | FILTER_FLAG_NO_PRIV_RANGE)) { + // returns notice if private network detected, so we can display it echo json_encode(lng('admin.ipsandports.ipnote')); } else { echo 0; diff --git a/templates/Froxlor/assets/js/jquery/domains.js b/templates/Froxlor/assets/js/jquery/domains.js index 682608653..a9b7458d2 100644 --- a/templates/Froxlor/assets/js/jquery/domains.js +++ b/templates/Froxlor/assets/js/jquery/domains.js @@ -48,6 +48,7 @@ export default function () { id: $('input[name=id]').val(), newval: +$('#speciallogfile').is(':checked') }, dataType: "json", + async: false, beforeSend: function (request) { request.setRequestHeader('X-CSRF-TOKEN', document.querySelector('meta[name="csrf-token"]').getAttribute('content')); },