From fa92cc5e244e945e57a5c6d3b4cc5e4e37c29485 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Sat, 28 Jan 2017 00:58:43 +0000
Subject: [PATCH] fix: top-devices widget now will honour for ip to sysName
 config #5388 (#5643)

---
 html/includes/common/top-devices.inc.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/includes/common/top-devices.inc.php b/html/includes/common/top-devices.inc.php
index 97dc2c4743..1a457480d8 100644
--- a/html/includes/common/top-devices.inc.php
+++ b/html/includes/common/top-devices.inc.php
@@ -175,13 +175,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
         }
     } elseif ($top_query === 'uptime') {
         if (is_admin() || is_read()) {
-            $query = 'SELECT `uptime`, `hostname`, `last_polled`, `device_id` 
+            $query = 'SELECT `uptime`, `hostname`, `last_polled`, `device_id`, `sysName` 
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
                       ORDER BY `uptime` ' . $sort_order . ' 
                       LIMIT :count';
         } else {
-            $query = 'SELECT `uptime`, `hostname`, `last_polled`, `d`.`device_id` 
+            $query = 'SELECT `uptime`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
                       FROM `devices` as `d`, `devices_perms` AS `P`
                       WHERE  `P`.`user_id` = :user
                       AND `P`.`device_id` = `d`.`device_id`
@@ -191,13 +191,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
         }
     } elseif ($top_query === 'ping') {
         if (is_admin() || is_read()) {
-            $query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `device_id` 
+            $query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
                       ORDER BY `last_ping_timetaken` ' . $sort_order . ' 
                       LIMIT :count';
         } else {
-            $query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `d`.`device_id` 
+            $query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
                       FROM `devices` as `d`, `devices_perms` AS `P` 
                       WHERE `P`.`user_id` = :user 
                       AND `P`.`device_id` = `d`.`device_id` 
@@ -207,25 +207,25 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
         }
     } elseif ($top_query === 'cpu') {
         if (is_admin() || is_read()) {
-            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload` 
+            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`, `d`.`sysName`
                       FROM `processors` AS `procs`, `devices` AS `d` 
                       WHERE `d`.`device_id` = `procs`.`device_id` 
                       AND unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
-                      GROUP BY `d`.`device_id` 
+                      GROUP BY `d`.`device_id`, `d`.`hostname`, `d`.`last_polled`, `d`.`sysName`
                       ORDER BY `cpuload` ' . $sort_order . ' 
                       LIMIT :count';
         } else {
-            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload` 
+            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`, `d`.`sysName`
                       FROM `processors` AS procs, `devices` AS `d`, `devices_perms` AS `P`
 					  WHERE `P`.`user_id` = :user AND `P`.`device_id` = `procs`.`device_id` 
                       AND unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval
-                      GROUP BY `procs`.`device_id` 
+                      GROUP BY `procs`.`device_id`, `d`.`hostname`, `d`.`last_polled`, `d`.`sysName`
                       ORDER BY `cpuload` ' . $sort_order . '
                       LIMIT :count';
         }
     } elseif ($top_query === 'ram') {
         if (is_admin() || is_read()) {
-            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc` 
+            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`, `d`.`sysName`
                       FROM `mempools` as `mem`, `devices` as `d`
                       WHERE `d`.`device_id` = `mem`.`device_id`
                       AND `mempool_descr` IN (\'Physical memory\',\'Memory\')
@@ -233,7 +233,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       ORDER BY `mempool_perc` ' . $sort_order . '
                       LIMIT :count';
         } else {
-            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc` 
+            $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`, `d`.`sysName`
                       FROM `mempools` as `mem`, `devices` as `d`, `devices_perms` AS `P`
                       WHERE `P`.`user_id` = :user AND `P`.`device_id` = `mem`.`device_id`
                       AND `mempool_descr` IN (\'Physical memory\',\'Memory\')
@@ -243,13 +243,13 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
         }
     } elseif ($top_query === 'poller') {
         if (is_admin() || is_read()) {
-            $query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `device_id` 
+            $query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
                       ORDER BY `last_polled_timetaken` ' . $sort_order . ' 
                       LIMIT :count';
         } else {
-            $query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `d`.`device_id` 
+            $query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `d`.`device_id`, `d`.`sysName`
                       FROM `devices` as `d`, `devices_perms` AS `P` 
                       WHERE `P`.`user_id` = :user 
                       AND `P`.`device_id` = `d`.`device_id`