Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / html / cgi-bin / connections.cgi

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 10ac8748c0895a6ef4d6c330262148df5b1fb213..771728d883de93ff337ffefa849101c6d45ace57 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -57,7 +57,7 @@ if (length ($ENV{'QUERY_STRING'}) > 0){
                ($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; 
+               $cgiin{$name} = $value;
        }
 }
 
@@ -96,8 +96,8 @@ if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
 }
 
 # Read and sort the connection tracking table
-# do sorting 
-if ($SORT_FIELD and $SORT_ORDER) { 
+# 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 {
@@ -247,13 +247,13 @@ if (-e "${General::swroot}/ovpn/settings") {
 
 # Add OpenVPN net for custom OVPNs
 if (-e "${General::swroot}/ovpn/ccd.conf") {
-       open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");      
+       open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");
        my @ovpnsub = <OVPNSUB>;
        close(OVPNSUB);
 
        foreach (@ovpnsub) {
                my ($network, $mask) = split '/', (split ',', $_)[2];
-               
+
                $mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
 
                push(@network, $network);
@@ -589,7 +589,7 @@ foreach my $line (@conntrack) {
                }
 
                $sport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
-               $sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>";
+               $sport_extra .= "<a href='https://isc.sans.edu/port.html?port=$sport_ret' target='top' title='$sserv_ret'>";
                $sport_extra .= " <span style='color:#FFFFFF;'>$sport_ret</span>";
                $sport_extra .= "</a>";
        }
@@ -602,7 +602,7 @@ foreach my $line (@conntrack) {
                }
 
                $dport_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
-               $dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>";
+               $dport_extra .= "<a href='https://isc.sans.edu/port.html?port=$dport_ret' target='top' title='$dserv_ret'>";
                $dport_extra .= " <span style='color:#FFFFFF;'>$dport_ret</span>";
                $dport_extra .= "</a>";
        }
@@ -617,7 +617,7 @@ foreach my $line (@conntrack) {
                        $sip_extra
                </td>
                <td style='text-align:center; background-color:$sip_colour;'>
-                       <a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'>
+                       <a href='https://isc.sans.edu/port.html?port=$sport' target='top' title='$sserv'>
                                <span style='color:#FFFFFF;'>$sport</span>
                        </a>
                        $sport_extra
@@ -632,7 +632,7 @@ foreach my $line (@conntrack) {
                        $dip_extra
                </td>
                <td style='text-align:center; background-color:$dip_colour;'>
-                       <a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'>
+                       <a href='https://isc.sans.edu/port.html?port=$dport' target='top' title='$dserv'>
                                <span style='color:#FFFFFF;'>$dport</span>
                        </a>
                        $dport_extra