From 0e66ddf0882fd90264cf7c5786e478f252679bde Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Thu, 28 Jan 2016 13:07:33 +0100
Subject: [PATCH] some bugfixing

---
 html/includes/common/stp-ports.inc.php | 7 ++++---
 html/includes/print-stp.inc.php        | 6 ++++--
 html/includes/table/stp-ports.inc.php  | 2 +-
 html/pages/device/stp.inc.php          | 8 --------
 sql-schema/095.sql                     | 3 +++
 5 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 sql-schema/095.sql

diff --git a/html/includes/common/stp-ports.inc.php b/html/includes/common/stp-ports.inc.php
index 862b514d5..c77ab7603 100644
--- a/html/includes/common/stp-ports.inc.php
+++ b/html/includes/common/stp-ports.inc.php
@@ -2,7 +2,7 @@
 
 $common_output[] = '
 <div class="table-responsive">
-    <table id="stp-ports" class="table table-condensed table-hover table-striped">
+    <table id="stp-ports" class="table table-condensed table-hover">
         <thead>
             <tr>
                 <th data-column-id="port">Port</th>
@@ -14,16 +14,17 @@ $common_output[] = '
                 <th data-column-id="designatedCost">Designated cost</th>
                 <th data-column-id="designatedBridge">Designated bridge</th>
                 <th data-column-id="designatedPort">Designated port</th>
-                <th data-column-id="forwardTransitions">Fwd trasitions</th>
+                <th data-column-id="forwardTransitions">Forward transitions</th>
             </tr>
         </thead>
-    <table>
+    </table>
 </div>
 
 <script>
 
 var grid = $("#stp-ports").bootgrid( { 
     ajax: true,
+    templates: {search: ""},
     post: function () 
     {
         return {
diff --git a/html/includes/print-stp.inc.php b/html/includes/print-stp.inc.php
index e256be9c8..e2a838385 100644
--- a/html/includes/print-stp.inc.php
+++ b/html/includes/print-stp.inc.php
@@ -1,5 +1,6 @@
 <?php
 
+echo '<table class="table table-condensed table-striped table-hover">';
 $stp_raw = dbFetchRow('SELECT * FROM `stp` WHERE `device_id` = ?', array($device['device_id']));
 $stp = array (
     'Root bridge'                 => ($stp_raw['rootBridge'] == 1) ? 'Yes' : 'No',
@@ -22,8 +23,9 @@ $stp = array (
 foreach (array_keys($stp) as $key) {
     echo "
       <tr>
-        <td width=280 class=list-large>$key</td>
-        <td class=box-desc>$stp[$key]</td>
+        <td>$key</td>
+        <td>$stp[$key]</td>
       </tr>
     ";
 }
+echo '</table>';
diff --git a/html/includes/table/stp-ports.inc.php b/html/includes/table/stp-ports.inc.php
index 3a2113b0b..12f686367 100644
--- a/html/includes/table/stp-ports.inc.php
+++ b/html/includes/table/stp-ports.inc.php
@@ -6,7 +6,7 @@ $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";
+$count_sql = "SELECT COUNT(*) $sql";
 $total     = dbFetchCell($count_sql, $param);
 if (empty($total)) {
         $total = 0;
diff --git a/html/pages/device/stp.inc.php b/html/pages/device/stp.inc.php
index ad8733aa1..37ccd55fa 100644
--- a/html/pages/device/stp.inc.php
+++ b/html/pages/device/stp.inc.php
@@ -35,14 +35,8 @@ unset($sep);
 
 print_optionbar_end();
 
-echo '<table border="0" cellspacing="0" cellpadding="5" width="100%">';
-
 if ($vars['view'] == 'basic') {
-    //$i = '1';
-    foreach (dbFetchRows("SELECT * FROM `stp` WHERE `device_id` = ? ORDER BY 'stp_id'", array($device['device_id'])) as $stp) {
     include 'includes/print-stp.inc.php';
-    //    $i++;
-    }
 }    
 
 if ($vars['view'] == 'ports') {
@@ -50,6 +44,4 @@ if ($vars['view'] == 'ports') {
     echo implode('',$common_output);
 }
 
-echo '</table>';
-
 $pagetitle[] = 'STP';
diff --git a/sql-schema/095.sql b/sql-schema/095.sql
new file mode 100644
index 000000000..f6a4af91e
--- /dev/null
+++ b/sql-schema/095.sql
@@ -0,0 +1,3 @@
+CREATE TABLE IF NOT EXISTS `ports_stp` (`port_stp_id` int(11) NOT NULL,`device_id` int(11) NOT NULL,`port_id` int(11) NOT NULL,`priority` tinyint(3) unsigned NOT NULL,`state` varchar(11) NOT NULL,`enable` varchar(8) NOT NULL,`pathCost` int(10) unsigned NOT NULL,`designatedRoot` varchar(32) NOT NULL,`designatedCost` smallint(5) unsigned NOT NULL,`designatedBridge` varchar(32) NOT NULL,`designatedPort` mediumint(9) NOT NULL,`forwardTransitions` int(10) unsigned NOT NULL) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+ALTER TABLE `ports_stp` ADD PRIMARY KEY (`port_stp_id`), ADD UNIQUE KEY `device_id` (`device_id`,`port_id`);
+ALTER TABLE `ports_stp` MODIFY `port_stp_id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=1;