Merge branch 'release/v5.0' into devel

Signed-off-by: DL6ER <dl6er@dl6er.de>

scripts/pi-hole/js/network.js

@@ -93,30 +93,41 @@ $(document).ready(function() {
         $("td:eq(5)", row).html("Never");
       }
 
-      // Set hostname to "N/A" if not available
+      // Set hostname to "unknown" if not available
       if (!data.name || data.name.length === 0) {
-        $("td:eq(3)", row).html("N/A");
+        $("td:eq(3)", row).html("<em>unknown</em>");
       }
 
       // Set number of queries to localized string (add thousand separators)
       $("td:eq(6)", row).html(data.numQueries.toLocaleString());
 
-      var ips = data.ip;
-      var shortips = ips;
-      if (ips.length > MAXIPDISPLAY) {
-        shortips = ips.slice(0, MAXIPDISPLAY - 1);
-        shortips.push("...");
+      var ips = [];
+      var maxiter = Math.min(data.ip.length, MAXIPDISPLAY);
+      for (var index = 0; index < maxiter; index++) {
+        var ip = data.ip[index];
+        ips.push('<a href="queries.php?client=' + ip + '">' + ip + "</a>");
       }
 
-      $("td:eq(0)", row).html(shortips.join("<br>"));
+      if (data.ip.length > MAXIPDISPLAY) {
+        // We hit the maximum above, add "..." to symbolize we would
+        // have more to show here
+        ips.push("...");
+      }
+
+      $("td:eq(0)", row).html(ips.join("<br>"));
       $("td:eq(0)", row).hover(function() {
-        this.title = ips.join("\n");
+        this.title = data.ip.join("\n");
       });
 
       // MAC + Vendor field if available
       if (data.macVendor && data.macVendor.length > 0) {
         $("td:eq(1)", row).html(data.hwaddr + "<br/>" + data.macVendor);
       }
+
+      // Hide mock MAC addresses
+      if (data.hwaddr.startsWith("ip-")) {
+        $("td:eq(1)", row).text("N/A");
+      }
     },
     dom:
       "<'row'<'col-sm-12'f>>" +