Make sorting more robust

cigamit · cigamit · commit 5355f400fedf · 2017-08-23T06:57:42.000-05:00
diff --git a/functions.php b/functions.php
@@ -766,7 +766,7 @@ function parsestatoutput($output, $title, $sessionid) {
 
 	$x = 1;
 	foreach ($columns as $column) {
-		$o .= "<th class='subHeaderColumn" . ($column == 'Bytes' ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";
+		$o .= "<th class='subHeaderColumn" . (preg_match('/(Bytes|Flows|Packets)/i', $column) ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";
 		$x++;
 	}
 	$o .= '</tr></thead><tbody>';
@@ -919,7 +919,7 @@ function parseprintoutput($output, $title, $sessionid) {
 	}
 
 	foreach ($columns as $column) {
-		$o .= "<th class='subHeaderColumn" . ($column == 'Bytes' ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";
+		$o .= "<th class='subHeaderColumn" . (preg_match('/(Bytes|Flows|Packets)/i', $column) ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";
 	}
 
 	$o .= '</tr></thead><tbody>';

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ function parsestatoutput($output, $title, $sessionid) {`
`766`	`766`
`767`	`767`	`$x = 1;`
`768`	`768`	`foreach ($columns as $column) {`
`769`		`- $o .= "<th class='subHeaderColumn" . ($column == 'Bytes' ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";`
	`769`	`+ $o .= "<th class='subHeaderColumn" . (preg_match('/(Bytes\|Flows\|Packets)/i', $column) ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";`
`770`	`770`	`$x++;`
`771`	`771`	`}`
`772`	`772`	`$o .= '</tr></thead><tbody>';`
`@@ -919,7 +919,7 @@ function parseprintoutput($output, $title, $sessionid) {`
`919`	`919`	`}`
`920`	`920`
`921`	`921`	`foreach ($columns as $column) {`
`922`		`- $o .= "<th class='subHeaderColumn" . ($column == 'Bytes' ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";`
	`922`	`+ $o .= "<th class='subHeaderColumn" . (preg_match('/(Bytes\|Flows\|Packets)/i', $column) ? ' {sorter: "bytes"}':'') . "' style='text-align:" . get_column_alignment($column) . "'>$column</th>";`
`923`	`923`	`}`
`924`	`924`
`925`	`925`	`$o .= '</tr></thead><tbody>';`