From bcc253cccf848371b05fd05612fc965200bcfcd8 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Thu, 28 Jan 2016 15:09:05 +0100
Subject: [PATCH] fix sorting

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

diff --git a/html/includes/common/stp-ports.inc.php b/html/includes/common/stp-ports.inc.php
index c77ab7603..8cee0a7e2 100644
--- a/html/includes/common/stp-ports.inc.php
+++ b/html/includes/common/stp-ports.inc.php
@@ -5,7 +5,7 @@ $common_output[] = '
     <table id="stp-ports" class="table table-condensed table-hover">
         <thead>
             <tr>
-                <th data-column-id="port">Port</th>
+                <th data-column-id="port_id">Port</th>
                 <th data-column-id="priority">Priority</th>
                 <th data-column-id="state">State</th>
                 <th data-column-id="enable">Enable</th>
diff --git a/html/includes/table/stp-ports.inc.php b/html/includes/table/stp-ports.inc.php
index 12f686367..1b6ff7583 100644
--- a/html/includes/table/stp-ports.inc.php
+++ b/html/includes/table/stp-ports.inc.php
@@ -1,5 +1,6 @@
 <?php
 
+logfile(print_r($_POST, true));
 $device_id = mres($_POST['device_id']);
 
 $param[] = $device_id;
@@ -13,10 +14,10 @@ if (empty($total)) {
 }
 
 if (!isset($sort) || empty($sort)) {
-        $sort = 'ps.port_id DESC';
+        $sort = 'port_id DESC';
 }
 
-$sql .= " ORDER BY $sort";
+$sql .= " ORDER BY ps.$sort";
 
 if (isset($current)) {
         $limit_low  = (($current * $rowCount) - ($rowCount));
@@ -36,7 +37,7 @@ foreach (dbFetchRows($sql, array($device_id)) as $stp_ports_db) {
     $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']));
 
     $response[] = array (
-        'port'               => generate_port_link($stp_ports_db, $stp_ports_db['ifName'])."<br>".$stp_ports_db['ifAlias'],
+        'port_id'            => generate_port_link($stp_ports_db, $stp_ports_db['ifName'])."<br>".$stp_ports_db['ifAlias'],
         'priority'           => $stp_ports_db['priority'],
         'state'              => $stp_ports_db['state'],
         'enable'             => $stp_ports_db['enable'],