From 41d5d097ef65c2a1adaec19fa9c0c78e7a5bc08d Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Sun, 17 Jan 2016 18:05:13 +0100
Subject: [PATCH] add some html page formatting

---
 html/includes/print-stp-ports.inc.php | 48 +++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/html/includes/print-stp-ports.inc.php b/html/includes/print-stp-ports.inc.php
index 504a6af27d..665b946fbd 100644
--- a/html/includes/print-stp-ports.inc.php
+++ b/html/includes/print-stp-ports.inc.php
@@ -1,22 +1,56 @@
 <?php
+echo "<div style='margin: 0px;'><table class='table'>";
+echo '<tr>
+          <th><a href="'.generate_url($vars, array('sort' => "port")).'">Port</a></th>
+          <th>Priority</th>
+          <th>State</th>
+          <th>Enable</th>
+          <th>Path cost</th>
+          <th>Designated root</th>
+          <th>Designated cost</th>
+          <th>Designated bridge</th>
+          <th>Designated port</th>
+          <th><a href="'.generate_url($vars, array('sort' => "transitions")).'">Fwd trasitions</a></th>
+      </tr>';
 
-echo '<tr bgcolor="#ffffff"><th>Port</th><th>Priority</th><th>State</th><th>Enable</th><th>Path cost</th><th>Designated root</th><th>Designated cost</th><th>Designated bridge</th><th>Designated port</th><th>Fwd trasitions</th></tr>';
-//SELECT ps.*, p.ifIndex FROM `ports_stp` ps JOIN `ports` p ON ps.port_id=p.port_id WHERE ps.device_id = 67 ORDER BY ps.port_id
-foreach (dbFetchRows("SELECT * FROM `ports_stp` WHERE `device_id` = ? ORDER BY 'port_id'", array($device['device_id'])) as $stp_ports_db) {
+switch ($vars["sort"]) {
+  case 'transitions':
+    $sort = "ps.forwardTransitions DESC";
+    break;
+  default:
+    $sort = "ps.port_id ASC";
+    break;
+}
+$i='1';
+
+// FIXME Table sorting don't working, why?
+//echo "$sort";
+foreach (dbFetchRows("SELECT `ps`.*, `p`.* FROM `ports_stp` `ps` JOIN `ports` `p` ON `ps`.`port_id`=`p`.`port_id` WHERE `ps`.`device_id` = ? ORDER BY ?", array($device['device_id'], $sort)) 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']));
 
     $stp_ports = [
-        $stp_ports_db['port_id'],
+        generate_port_link($stp_ports_db, $stp_ports_db['ifName'])."<br>".$stp_ports_db['ifAlias'],
         $stp_ports_db['priority'],
         $stp_ports_db['state'],
         $stp_ports_db['enable'],
         $stp_ports_db['pathCost'],
-        $stp_ports_db['designatedRoot'],
+        //$stp_ports_db['designatedRoot'],
+        generate_device_link($root_device, $root_device['hostname'])."<br>".$stp_ports_db['designatedRoot'],
         $stp_ports_db['designatedCost'],
-        $stp_ports_db['designatedBridge'],
+        generate_device_link($bridge_device, $bridge_device['hostname'])."<br>".$stp_ports_db['designatedBridge'],
         $stp_ports_db['designatedPort'],
         $stp_ports_db['forwardTransitions']
     ];
-    echo '<tr>';
+    $i++;
+    if (!is_integer($i / 2)) {
+            $row_colour = $list_colour_b;
+    }
+    else {
+            $row_colour = $list_colour_a;
+    }
+    echo "<tr style='background-color: $row_colour;'>";
 
     foreach ($stp_ports as $value) {
        echo "<td>$value</td>";