connections.cgi: Remove sorting

This has first of all very little benefit and the code is too messy. Why
would anyone want to sort by port? I think we might want a search here.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 7f11d1ac191a12d3b43487908243ca9788a5e04b..97761eb20c3e0a3813ccb033d9ec93086e22eee9 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -20,7 +20,6 @@
 ###############################################################################
 
 use strict;
-use experimental 'smartmatch';
 
 use Net::IPv4Addr qw( :all );
 use Switch;
@@ -36,31 +35,6 @@ require "${General::swroot}/location-functions.pl";
 
 my $colour_multicast = "#A0A0A0";
 
-# sort arguments for connection tracking table
-# the sort field. eg. 1=src IP, 2=dst IP, 3=src port, 4=dst port
-my $SORT_FIELD = 0;
-# the sort order. (a)scending orr (d)escending
-my $SORT_ORDER = 0;
-# cgi query arguments
-my %cgiin;
-# debug mode
-my $debug = 0;
-
-# retrieve query arguments
-# note: let a-z A-Z and 0-9 pass as value only
-if (length ($ENV{'QUERY_STRING'}) > 0){
-       my $name;
-       my $value;
-       my $buffer = $ENV{'QUERY_STRING'};
-       my @pairs = split(/&/, $buffer);
-       foreach my $pair (@pairs){
-               ($name, $value) = split(/=/, $pair);
-               $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " "
-               $value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass
-               $cgiin{$name} = $value;
-       }
-}
-
 &Header::showhttpheaders();
 
 my @network=();
@@ -70,40 +44,8 @@ my @colour=();
 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-# output cgi query arrguments to browser on debug
-if ( $debug ){
-       &Header::openbox('100%', 'center', 'DEBUG');
-       my $debugCount = 0;
-       foreach my $line (sort keys %cgiin) {
-               print "$line = '$cgiin{$line}'<br />\n";
-               $debugCount++;
-       }
-       print "&nbsp;Count: $debugCount\n";
-       &Header::closebox();
-}
-
-#workaround to suppress a warning when a variable is used only once
-my @dummy = ( ${Header::table1colour} );
-undef (@dummy);
-
-# check sorting arguments
-if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
-       $SORT_FIELD = $cgiin{'sort_field'};
-
-       if ( $cgiin{'sort_order'} ~~ [ 'a','d','A','D' ] ) {
-               $SORT_ORDER = lc($cgiin{'sort_order'});
-       }
-}
-
 # Read and sort the connection tracking table
-# do sorting
-if ($SORT_FIELD and $SORT_ORDER) {
-       # field sorting when sorting arguments are sane
-       open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table";
-} else {
-       # default sorting with no query arguments
-       open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
-}
+open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
 my @conntrack = <CONNTRACK>;
 close(CONNTRACK);
 
@@ -389,73 +331,9 @@ print <<END;
        <br>
 END
 
-if ($SORT_FIELD and $SORT_ORDER) {
-       my @sort_field_name = (
-               $Lang::tr{'source ip'},
-               $Lang::tr{'destination ip'},
-               $Lang::tr{'source port'},
-               $Lang::tr{'destination port'},
-               $Lang::tr{'protocol'},
-               $Lang::tr{'connection'}.' '.$Lang::tr{'status'},
-               $Lang::tr{'expires'}.' ('.$Lang::tr{'hours:minutes:seconds'}.')',
-               $Lang::tr{'download'},
-               $Lang::tr{'upload'}
-       );
-       my $sort_order_name;
-       if (lc($SORT_ORDER) eq "a") {
-               $sort_order_name = $Lang::tr{'sort ascending'};
-       } else {
-               $sort_order_name = $Lang::tr{'sort descending'};
-       }
-
-print <<END
-       <div style="font-weight:bold;margin:10px;font-size: 70%">
-               $sort_order_name: $sort_field_name[$SORT_FIELD-1]
-       </div>
-END
-;
-}
-
 # Print table header.
 print <<END;
        <table style='width:100%'>
-               <tr>
-                       <th style='text-align:center'>
-                               <a href="?sort_field=5&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=5&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-                       <th style='text-align:center' colspan='2'>
-                               <a href="?sort_field=1&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=1&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=3&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=3&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-                       <th>&nbsp;</th>
-                       <th style='text-align:center' colspan='2'>
-                               <a href="?sort_field=2&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=2&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=4&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=4&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-                       <th>&nbsp;</th>
-                       <th style='text-align:center'>
-                               <a href="?sort_field=8&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=8&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                               &nbsp;&nbsp;&nbsp;&nbsp;
-                               <a href="?sort_field=9&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=9&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-                       <th style='text-align:center'>
-                               <a href="?sort_field=6&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=6&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-                       <th style='text-align:center'>
-                               <a href="?sort_field=7&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
-                               <a href="?sort_field=7&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
-                       </th>
-               </tr>
                <tr>
                        <th style='text-align:center'>
                                $Lang::tr{'protocol'}