mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1181 from SaaldjorMike/fix-services-list-with-state

Browse Source 
Fixed issue with services list.
This commit is contained in:
Neil Lathwood
2015-06-02 17:01:17 +01:00
parent 9ea274e9a4 0bd6a9736e
commit e270db10e4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/pages/services.inc.php
View File

@@ -56,11 +56,17 @@ if ($_SESSION['userlevel'] >= '5')
$host_sql = "SELECT * FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY D.hostname ORDER BY D.hostname"; $host_sql = "SELECT * FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY D.hostname ORDER BY D.hostname";
$host_par = array($_SESSION['user_id']); $host_par = array($_SESSION['user_id']);
} }
$shift = 1;
foreach (dbFetchRows($host_sql, $host_par) as $device) foreach (dbFetchRows($host_sql, $host_par) as $device)
{ {
$device_id = $device['device_id']; $device_id = $device['device_id'];
$device_hostname = $device['hostname']; $device_hostname = $device['hostname'];
array_unshift($sql_param,$device_id); if ($shift == 1) {
array_unshift($sql_param, $device_id);
$shift = 0;
} else {
$sql_param[0] = $device_id;
}
foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ? $where", $sql_param) as $service) foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ? $where", $sql_param) as $service)
{ {
include("includes/print-service.inc.php"); include("includes/print-service.inc.php");