From cd4d54611ce86776b82c57d5e11248829126e09c Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sat, 14 Dec 2024 05:37:03 +0300
Subject: [PATCH] v8.1.3: Improve form validation and update Port Scanner AJAX
 logic

Replace `==` with `===` for stricter comparisons in form validation. Modify Port Scanner to use a POST request with JSON payload and change response handling to better manage error and success states.
---
 app/static/js/nettools.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/static/js/nettools.js b/app/static/js/nettools.js
index a696c1b4..9e12414f 100644
--- a/app/static/js/nettools.js
+++ b/app/static/js/nettools.js
@@ -4,16 +4,16 @@ $( function() {
     });
     $("#nettools_telnet_form").on("click", ":submit", function (e) {
         $('#ajax-nettools').html('');
-        var frm = $('#nettools_telnet_form');
-        if ($('#nettools_telnet_server_from option:selected').val() == '------') {
+        let frm = $('#nettools_telnet_form');
+        if ($('#nettools_telnet_server_from option:selected').val() === '------') {
             toastr.warning('Choose a server From');
             return false;
         }
-        if ($('#nettools_telnet_server_to').val() == '') {
+        if ($('#nettools_telnet_server_to').val() === '') {
             toastr.warning('Choose a server To');
             return false;
         }
-        if ($('#nettools_telnet_port_to').val() == '') {
+        if ($('#nettools_telnet_port_to').val() === '') {
             toastr.warning('Enter a port To');
             return false;
         }
@@ -109,26 +109,29 @@ $( function() {
     });
     $("#nettools_portscanner_form").on("click", ":submit", function (e) {
         $('#ajax-nettools').html('');
-        if ($('#nettools_portscanner_server').val() == '') {
+        let port_server = $('#nettools_portscanner_server').val();
+        $('#ajax-nettools').html('');
+        if (port_server === '') {
             toastr.warning('Enter an address');
             return false;
         }
         $.ajax({
-            url: "/portscanner/scan/" + $('#nettools_portscanner_server').val(),
+            url: "/portscanner/scan",
+            data: JSON.stringify({'ip': port_server}),
+            type: "POST",
+            contentType: "application/json; charset=utf-8",
             success: function (data) {
-                data = data.replace(/\s+/g, ' ');
-                if (data.indexOf('danger') != '-1' || data.indexOf('unique') != '-1' || data.indexOf('error:') != '-1') {
-                    toastr.error(data);
+                if (data.status === 'failed') {
+                    toastr.error(data.error);
                 } else {
                     toastr.clear();
-                    $("#show_scans_ports_body").html(data);
-                    var close_word = $('#translate').attr('data-close');
+                    $("#show_scans_ports_body").html(data.data);
                     $("#show_scans_ports").dialog({
                         resizable: false,
                         height: "auto",
                         width: 360,
                         modal: true,
-                        title: "{{lang.words.opened|title()}} {{lang.words.ports}}",
+                        title: "Open ports",
                         buttons: [{
                             text: close_word,
                             click: function () {
@@ -145,7 +148,7 @@ $( function() {
     $("#nettools_whois_form").on("click", ":submit", function (e) {
         $('#ajax-nettools').html('');
         var frm = $('#nettools_whois_form');
-        if ($('#nettools_whois_name').val() == '') {
+        if ($('#nettools_whois_name').val() === '') {
             toastr.warning('Enter a Domain name');
             return false;
         }