From 100e5a9582de509c5e4ea820a3eb2c5e29d763a0 Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 22 Sep 2015 12:40:21 +0000 Subject: [PATCH] Added distinct to query to stop duplicated devices --- html/includes/common/worldmap.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php index 0efb6ec402..b89e9a3ca3 100644 --- a/html/includes/common/worldmap.inc.php +++ b/html/includes/common/worldmap.inc.php @@ -106,14 +106,14 @@ var greenMarker = L.AwesomeMarkers.icon({ // Checking user permissions if (is_admin() || is_read()) { // Admin or global read-only - show all devices - $sql = "SELECT `device_id`,`hostname`,`os`,`status`,`lat`,`lng` FROM `devices` + $sql = "SELECT DISTINCT(`device_id`),`hostname`,`os`,`status`,`lat`,`lng` FROM `devices` LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location` WHERE `disabled`=0 AND `ignore`=0 AND `lat` != '' AND `lng` != '' ORDER BY `status` ASC, `hostname`"; } else { // Normal user - grab devices that user has permissions to - $sql = "SELECT `devices`.`device_id` as `device_id`,`hostname`,`os`,`status`,`lat`,`lng` + $sql = "SELECT DISTINCT(`devices`.`device_id`) as `device_id`,`hostname`,`os`,`status`,`lat`,`lng` FROM `devices_perms`, `devices` LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location` WHERE `disabled`=0 AND `ignore`=0 AND `lat` != '' AND `lng` != ''