From 60603520dfeaca4b6d2994766084a8437252144c Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Tue, 26 Jan 2016 01:40:08 +0000
Subject: [PATCH] Updated stp branch

---
 html/includes/common/stp-ports.inc.php |  3 ++-
 html/includes/table/stp-ports.inc.php  | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/html/includes/common/stp-ports.inc.php b/html/includes/common/stp-ports.inc.php
index 34b8639527..862b514d51 100644
--- a/html/includes/common/stp-ports.inc.php
+++ b/html/includes/common/stp-ports.inc.php
@@ -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"
diff --git a/html/includes/table/stp-ports.inc.php b/html/includes/table/stp-ports.inc.php
index f3e31b5fbf..3a2113b0bc 100644
--- a/html/includes/table/stp-ports.inc.php
+++ b/html/includes/table/stp-ports.inc.php
@@ -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']));