Forward Firewall: minor changes an ruletable

[people/teissler/ipfire-2.x.git] / html / cgi-bin / forwardfw.cgi

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 2343c41ff854a4124428dad00d05938566d9270c..2b1d96221e46ee4bba4f911ab1568534fef0f314 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -1832,6 +1832,7 @@ sub viewtablenew
        my $title1=shift;
        my $go='';
        &General::get_aliases(\%aliases);
+       &General::readhasharray("$confighost", \%customhost);
        &General::readhasharray("$config", $hash);
        if( ! -z $config){
                if ($title1 eq $Lang::tr{'external access'} || $title1 eq 'Outgoing'){print"<br><br>";}
@@ -1844,7 +1845,7 @@ sub viewtablenew
                my @tmpsrc=();
                my $coloryellow='';
                print"<b>$title1</b><br>";
-               print"<table width='100%' cellspacing='1'   style=' padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'>";
+               print"<table width='100%' cellspacing='0' style=' padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;'>";
                print"<tr><td align='center'><b>#</td><td ></td><td align='center'><b>$Lang::tr{'fwdfw source'}</td><td><b>Log</td><td align='center'><b>$Lang::tr{'fwdfw target'}</td><td align='center'><b>$Lang::tr{'protocol'}</b></td><td align='center'><b>$Lang::tr{'fwdfw time'}</td><td align='center' colspan='6'><b>$Lang::tr{'fwdfw action'}</td></tr>";
                foreach my $key (sort  {$a <=> $b} keys %$hash){
                        $tdcolor='';
@@ -1900,7 +1901,7 @@ sub viewtablenew
                        }
                        print"<tr bgcolor='$color' >";
                        print<<END;
-                       <td align='right' width='15'>$key</td>
+                       <td align='right' width='15'><b>$key</b></td>
 END
                        if ($$hash{$key}[0] eq 'ACCEPT'){
                                $ruletype='A';
@@ -1916,7 +1917,7 @@ END
                                $rulecolor=$color{'color16'};
                        }
                        print"<td bgcolor='$rulecolor' align='center' width='20'><span title='$tooltip'><b>$ruletype</b></span></td>";
-                       &getcolor($$hash{$key}[3],$$hash{$key}[4]);
+                       &getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
                        print"<td align='center' width='160' $tdcolor>";
                        if ($$hash{$key}[3] eq 'std_net_src'){
                                print &get_name($$hash{$key}[4]);
@@ -1939,7 +1940,7 @@ END
                        <input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
                        </td></form>
 END
-                       &getcolor($$hash{$key}[5],$$hash{$key}[6]);
+                       &getcolor($$hash{$key}[5],$$hash{$key}[6],\%customhost);
                        print<<END;
                        <td align='center' width='160' $tdcolor>
 END
@@ -2038,8 +2039,10 @@ END
                                print"<td width='25'><input type='image' img src='/images/down.gif' style='visibility:hidden;'></td></tr>";
                        }
                        #REMARK
-                       print"<tr bgcolor='$color'><td colspan='13' style='border-bottom: 1px solid black'>";
-                       print"<b>$Lang::tr{'remark'}:</b>&nbsp$$hash{$key}[16]</td></tr>";
+                       if ($optionsfw{'SHOWREMARK'} eq 'on'){
+                               print"<tr bgcolor='$color'>";
+                               print"<td>&nbsp</td><td bgcolor='$rulecolor'></td><td colspan='11'>$$hash{$key}[16]</td></tr>";
+                       }
                }
                print"</table>";
                &Header::closebox();
@@ -2050,15 +2053,26 @@ sub getcolor
 {
        my $nettype=shift;
        my $val=shift;
+       my $hash=shift;
        if($optionsfw{'SHOWCOLORS'} eq 'on'){
+               #VPN networks
                if ($nettype eq 'ovpn_n2n_src' || $nettype eq 'ovpn_n2n_tgt' || $nettype eq 'ovpn_net_src' || $nettype eq 'ovpn_net_tgt'|| $nettype eq 'ovpn_host_src' || $nettype eq 'ovpn_host_tgt'){
-                       $tdcolor="style='border: 2px solid $Header::colourovpn;'";
+                       $tdcolor="style='border: 1px solid $Header::colourovpn;'";
                        return;
                }
                if ($nettype eq 'ipsec_net_src' || $nettype eq 'ipsec_net_tgt'){
-                       $tdcolor="style='border: 2px solid $Header::colourvpn;'";
+                       $tdcolor="style='border: 1px solid $Header::colourvpn;'";
                        return;
                }
+               #custom Hosts
+               if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
+                       foreach my $key (sort keys %$hash){
+                               if ($$hash{$key}[0] eq $val){
+                                       $val=$$hash{$key}[2];
+                               }
+                       }
+               }
+               #ALIASE
                foreach my $alias (sort keys %aliases)
                {
                        if ($val eq $alias){
@@ -2066,29 +2080,30 @@ sub getcolor
                                return;
                        }
                }
+               #standard networks
                if ($val eq 'GREEN'){
-                       $tdcolor="style='border: 2px solid $Header::colourgreen;'";
+                       $tdcolor="style='border: 1px solid $Header::colourgreen;'";
                }elsif ($val eq 'ORANGE'){
-                       $tdcolor="style='border: 2px solid $Header::colourorange;'";
+                       $tdcolor="style='border: 1px solid $Header::colourorange;'";
                }elsif ($val eq 'BLUE'){
-                       $tdcolor="style='border: 2px solid $Header::colourblue;'";
+                       $tdcolor="style='border: 1px solid $Header::colourblue;'";
                }elsif ($val eq 'RED'){
-                       $tdcolor="style='border: 2px solid $Header::colourred;'";
+                       $tdcolor="style='border: 1px solid $Header::colourred;'";
                }elsif ($val eq 'IPFire' ){
-                       $tdcolor="style='border: 2px solid $Header::colourred;'";
+                       $tdcolor="style='border: 1px solid $Header::colourred;'";
                }elsif($val =~ /^(.*?)\/(.*?)$/){
                        my ($sip,$scidr) = split ("/",$val);
                        if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
-                               $tdcolor="style='border: 2px solid $Header::colourorange;'";
+                               $tdcolor="style='border: 1px solid $Header::colourorange;'";
                        }
                        if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
-                               $tdcolor="style='border: 2px solid $Header::colourgreen;'";
+                               $tdcolor="style='border: 1px solid $Header::colourgreen;'";
                        }
                        if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
-                               $tdcolor="style='border: 2px solid $Header::colourblue;'";
+                               $tdcolor="style='border: 1px solid $Header::colourblue;'";
                        }
                }elsif ($val eq 'Default IP'){
-                       $tdcolor="style='border: 2px solid red;'";
+                       $tdcolor="style='border: 1px solid red;'";
                }else{
                        $tdcolor='';
                }