Merge pull request #346 from pi-hole/tweak/display_IPs

Display IP addresses in Top Clients and Forward Destinations
pi-hole · Jan 8, 2017 · 0cee148 · 0cee148
2 parents b2279ad + 1e694b3
commit 0cee148
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
@@ -132,22 +132,25 @@ function escapeHtml(text) {
 function updateTopClientsChart() {
     $.getJSON("api.php?summaryRaw&getQuerySources", function(data) {
         var clienttable =  $("#client-frequency").find("tbody:last");
-        var domain, percentage, domainname;
+        var domain, percentage, domainname, domainip;
         for (domain in data.top_sources) {
 
             if ({}.hasOwnProperty.call(data.top_sources, domain)){
                 // Sanitize domain
                 domain = escapeHtml(domain);
                 if(domain.indexOf("|") > -1)
                 {
-                    domainname = domain.substr(0, domain.indexOf("|"));
+                    var idx = domain.indexOf("|");
+                    domainname = domain.substr(0, idx);
+                    domainip = domain.substr(idx+1, domain.length-idx);
                 }
                 else
                 {
                     domainname = domain;
+                    domainip = domain;
                 }
 
-                var url = "<a href=\"queries.php?client="+domain+"\">"+domainname+"</a>";
+                var url = "<a href=\"queries.php?client="+domain+"\" title=\""+domainip+"\">"+domainname+"</a>";
                 percentage = data.top_sources[domain] / data.dns_queries_today * 100;
                 clienttable.append("<tr> <td>" + url +
                     "</td> <td>" + data.top_sources[domain] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"%\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
@@ -172,7 +175,8 @@ function updateForwardDestinations() {
             c.push(colors.shift());
             if(key.indexOf("|") > -1)
             {
-                key = key.substr(0, key.indexOf("|"));
+                var idx = key.indexOf("|");
+                key = key.substr(0, idx)+" ("+key.substr(idx+1, key.length-idx)+")";
             }
             forwardDestinationChart.data.labels.push(key);
         });