#951, small fixes

2025-12-07 09:36:05 -08:00 · 2025-01-12 11:46:32 +11:00
parent 5e7bb207c8
commit 6718d054dc
28 changed files with 36 additions and 70 deletions
--- a/front/php/templates/language/ca_ca.json
+++ b/front/php/templates/language/ca_ca.json
--- a/front/php/templates/language/de_de.json
+++ b/front/php/templates/language/de_de.json
--- a/front/php/templates/language/es_es.json
+++ b/front/php/templates/language/es_es.json
--- a/front/php/templates/language/fr_fr.json
+++ b/front/php/templates/language/fr_fr.json
--- a/front/php/templates/language/nb_no.json
+++ b/front/php/templates/language/nb_no.json
--- a/front/php/templates/language/pl_pl.json
+++ b/front/php/templates/language/pl_pl.json
--- a/front/php/templates/language/ru_ru.json
+++ b/front/php/templates/language/ru_ru.json
--- a/front/php/templates/language/uk_ua.json
+++ b/front/php/templates/language/uk_ua.json
--- a/front/php/templates/language/zh_cn.json
+++ b/front/php/templates/language/zh_cn.json
--- a/front/plugins/__template/config.json
+++ b/front/plugins/__template/config.json
@@ -331,7 +331,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -340,7 +340,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
--- a/front/plugins/arp_scan/config.json
+++ b/front/plugins/arp_scan/config.json
@@ -385,7 +385,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -394,15 +394,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
-        },
-        {
-          "language_code": "es_es",
-          "string": "MAC"
-        },
-        {
-          "language_code": "de_de",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
@@ -419,14 +411,6 @@
        {
          "language_code": "en_us",
          "string": "IP"
-        },
-        {
-          "language_code": "es_es",
-          "string": "IP"
-        },
-        {
-          "language_code": "de_de",
-          "string": "IP"
        }
      ]
    },
--- a/front/plugins/avahi_scan/config.json
+++ b/front/plugins/avahi_scan/config.json
@@ -231,7 +231,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/ddns_update/config.json
+++ b/front/plugins/ddns_update/config.json
@@ -524,7 +524,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/freebox/config.json
+++ b/front/plugins/freebox/config.json
@@ -307,7 +307,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -318,7 +318,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
--- a/front/plugins/icmp_scan/config.json
+++ b/front/plugins/icmp_scan/config.json
@@ -233,7 +233,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -244,7 +244,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
--- a/front/plugins/internet_ip/config.json
+++ b/front/plugins/internet_ip/config.json
@@ -408,7 +408,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -417,7 +417,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/ipneigh/config.json
+++ b/front/plugins/ipneigh/config.json
@@ -205,7 +205,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -216,7 +216,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
--- a/front/plugins/luci_import/config.json
+++ b/front/plugins/luci_import/config.json
@@ -380,7 +380,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -389,7 +389,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "ru_ru",
--- a/front/plugins/mikrotik_scan/config.json
+++ b/front/plugins/mikrotik_scan/config.json
@@ -265,7 +265,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
--- a/front/plugins/nbtscan_scan/config.json
+++ b/front/plugins/nbtscan_scan/config.json
@@ -239,7 +239,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/nmap_dev_scan/README.md
+++ b/front/plugins/nmap_dev_scan/README.md
@@ -5,6 +5,9 @@ NMAP-scan is a command-line tool to discover and fingerprint IP hosts on the loc
 > [!NOTE]
 > The `NMAPDEV` plugin is great for detecting the availability of devices, however ARP scan might be better covering multiple VLANS and subnets as NMAP can't pickup the MAC address from other subnets (this is an NMAP limitation) which are necessary to identify a device. You can always combine different scan methods. You can find all available network scanning options (marked as `🔍 dev scanner`) in the [Plugins overview](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/README.md) readme.  

+
+This plugin is not the best for name resolution (Use e.g.: `NSLOOKUP`, `AVAHISCAN` instead), however if available a name will be displayed in the `Resolved Name` column. 
+
 ### Usage

 - Go to settings and set the `SCAN_SUBNETS` setting as per [subnets documentation](https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md).
--- a/front/plugins/nmap_dev_scan/config.json
+++ b/front/plugins/nmap_dev_scan/config.json
@@ -389,7 +389,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -398,15 +398,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
-        },
-        {
-          "language_code": "es_es",
-          "string": "MAC"
-        },
-        {
-          "language_code": "de_de",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
@@ -423,14 +415,6 @@
        {
          "language_code": "en_us",
          "string": "IP"
-        },
-        {
-          "language_code": "es_es",
-          "string": "IP"
-        },
-        {
-          "language_code": "de_de",
-          "string": "IP"
        }
      ]
    },
@@ -446,7 +430,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "Name"
+          "string": "Resolved Name"
        }
      ]
    },
--- a/front/plugins/nslookup_scan/config.json
+++ b/front/plugins/nslookup_scan/config.json
@@ -230,7 +230,7 @@
    },
    {
      "column": "Object_PrimaryID",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -239,11 +239,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
-        },
-        {
-          "language_code": "es_es",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
@@ -259,10 +255,6 @@
        {
          "language_code": "en_us",
          "string": "IP"
-        },
-        {
-          "language_code": "es_es",
-          "string": "IP"
        }
      ]
    },
--- a/front/plugins/omada_sdn_imp/config.json
+++ b/front/plugins/omada_sdn_imp/config.json
@@ -465,7 +465,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -474,7 +474,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/sync/config.json
+++ b/front/plugins/sync/config.json
@@ -449,7 +449,7 @@
    {
      "column": "Object_PrimaryID",
      "mapped_to_column": "cur_MAC",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
      "show": true,
      "type": "device_name_mac",
      "default_value": "",
@@ -458,7 +458,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        },
        {
          "language_code": "es_es",
--- a/front/plugins/wake_on_lan/config.json
+++ b/front/plugins/wake_on_lan/config.json
@@ -358,7 +358,7 @@
      "name": [
        {
          "language_code": "en_us",
-          "string": "MAC"
+          "string": "MAC (name)"
        }
      ]
    },
--- a/front/pluginsCore.php
+++ b/front/pluginsCore.php
@@ -135,7 +135,10 @@ function processColumnValue(dbColumnDef, value, index, type) {
          <span>`;
      break;
    case 'device_name_mac':
-      value = createDeviceLink(value);
+      value = `<div class="text-center"> ${value} 
+                <br/> 
+                (${createDeviceLink(value)}) 
+              </div>`;
      break;
    case 'device_mac':
      value = `<span class="anonymizeMac"><a href="/deviceDetails.php?mac=${value}" target="_blank">${value}</a><span>`;