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

Updated stp branch

Browse Source
This commit is contained in:
Neil Lathwood
2016-01-26 01:40:08 +00:00
parent 1de495ac0f
commit 60603520df
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/includes/common/stp-ports.inc.php
View File

@@ -27,7 +27,8 @@ var grid = $("#stp-ports").bootgrid( {
post: function ()
{
return {
id: "stp-ports"
id: "stp-ports",
device_id: ' . $device['device_id'] . ',
};
},
url: "ajax_table.php"

11
html/includes/table/stp-ports.inc.php
View File

@@ -1,8 +1,10 @@
<?php
$param[] = $device['device_id'];
$device_id = mres($_POST['device_id']);
$sql = " `FROM `ports_stp` `ps` JOIN `ports` `p` ON `ps`.`port_id`=`p`.`port_id` WHERE `ps`.`device_id` = ?";
$param[] = $device_id;
$sql = " FROM `ports_stp` `ps` JOIN `ports` `p` ON `ps`.`port_id`=`p`.`port_id` WHERE `ps`.`device_id` = ?";
$count_sql = "SELECT COUNT(ports_stp_id) $sql";
$total = dbFetchCell($count_sql, $param);
@@ -11,7 +13,7 @@ if (empty($total)) {
}
if (!isset($sort) || empty($sort)) {
$sort = 'port_id DESC';
$sort = 'ps.port_id DESC';
}
$sql .= " ORDER BY $sort";
@@ -27,7 +29,8 @@ if ($rowCount != -1) {
$sql = "SELECT `ps`.*, `p`.* $sql";
foreach (dbFetchRows($sql, array($device['device_id'])) as $stp_ports_db) {
logfile($sql);
foreach (dbFetchRows($sql, array($device_id)) as $stp_ports_db) {
$bridge_device = dbFetchRow("SELECT `devices`.*, `stp`.`device_id`, `stp`.`bridgeAddress` FROM `devices` JOIN `stp` ON `devices`.`device_id`=`stp`.`device_id` WHERE `stp`.`bridgeAddress` = ?", array($stp_ports_db['designatedBridge']));
$root_device = dbFetchRow("SELECT `devices`.*, `stp`.`device_id`, `stp`.`bridgeAddress` FROM `devices` JOIN `stp` ON `devices`.`device_id`=`stp`.`device_id` WHERE `stp`.`bridgeAddress` = ?", array($stp_ports_db['designatedRoot']));