From c6e3be227712c1b1073557654c0c4ab9250d8aa2 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 6 Aug 2015 18:36:26 +0000
Subject: [PATCH] Added the poller group name to the table - general if no
 poller groups created

---
 html/includes/table/poll-log.inc.php | 16 +++++++++++++---
 html/pages/poll-log.inc.php          |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/html/includes/table/poll-log.inc.php b/html/includes/table/poll-log.inc.php
index 3579759b6..0b0ce89c4 100644
--- a/html/includes/table/poll-log.inc.php
+++ b/html/includes/table/poll-log.inc.php
@@ -1,9 +1,15 @@
 <?php
 
-$sql = ' FROM `devices` AS D';
+$sql = ' FROM `devices` AS D ';
 
 if (is_admin() === false) {
-    $sql .= ", devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '".$_SESSION['user_id']."' AND D.ignore = '0'";
+    $sql .= ", devices_perms AS P ";
+}
+
+$sql .= " LEFT JOIN `poller_groups` ON `D`.`poller_group`=`poller_groups`.`id`";
+
+if (is_admin() === false) {
+    $sql .= " WHERE D.device_id = P.device_id AND P.user_id = '".$_SESSION['user_id']."' AND D.ignore = '0'";
 }
 else {
     $sql .= ' WHERE 1';
@@ -34,12 +40,16 @@ if ($rowCount != -1) {
     $sql .= " LIMIT $limit_low,$limit_high";
 }
 
-$sql = "SELECT D.device_id,D.hostname AS `hostname`, D.last_polled AS `last_polled`, D.last_polled_timetaken AS `last_polled_timetaken` $sql";
+$sql = "SELECT D.device_id,D.hostname AS `hostname`, D.last_polled AS `last_polled`, `group_name`, D.last_polled_timetaken AS `last_polled_timetaken` $sql";
 
 foreach (dbFetchRows($sql) as $device) {
+    if (empty($device['group_name'])) {
+        $device['group_name'] = 'General';
+    }
     $response[] = array(
         'hostname'              => "<a class='list-device' href='".generate_device_url($device, array('tab' => 'graphs', 'group' => 'poller'))."'>".$device['hostname'].'</a>',
         'last_polled'           => $device['last_polled'],
+        'poller_group'          => $device['group_name'],
         'last_polled_timetaken' => $device['last_polled_timetaken'],
     );
 }
diff --git a/html/pages/poll-log.inc.php b/html/pages/poll-log.inc.php
index 91ef8132e..291088bac 100644
--- a/html/pages/poll-log.inc.php
+++ b/html/pages/poll-log.inc.php
@@ -6,6 +6,7 @@ $no_refresh = true;
         <tr>
             <th data-column-id="hostname">Hostname</th>
             <th data-column-id="last_polled">Last Polled</th>
+            <th data-column-id="poller_group">Poller Group</th>
             <th data-column-id="last_polled_timetaken" data-order="desc">Polling Duration (Seconds)</th>
         </tr>
     </thead>