Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout

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

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 538df60cc8772c4a74f9f0e34bbe1c9b2626a415..c17bfaf8ea9809b64fefa70bdecc6c72ffabd9c9 100755 (executable)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -659,6 +659,8 @@ sub checktarget
                                                        if (&General::validport($_)){
                                                                push (@values,$_);
                                                        }else{
+                                                               $errormessage=$Lang::tr{'fwdfw err tgt_port'};
+                                                               return $errormessage;
                                                        }
                                                }
                                        }
@@ -1349,6 +1351,7 @@ sub getcolor
                        #Check if IP is part of a IPsec N2N network
                        foreach my $key (sort keys %ipsecconf){
                                my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+                               $b=&General::iporsubtodec($b);
                                if (&General::IpInSubnet($c,$a,$b)){
                                        $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
                                        return;
@@ -1553,6 +1556,11 @@ sub newrule
                        }
                }       
        }
+       # Split manual source and target address and delete the subnet
+       my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+       if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
+       my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
+       if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
        &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
        &Header::closebox();
        &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
@@ -2295,7 +2303,7 @@ sub viewtablenew
        &General::readhasharray("$configccdhost", \%ccdhost);
 
        &Header::openbox('100%', 'left', $title);
-       print "<table width='100%' cellspacing='0' border='0'>";
+       print "<table width='100%' cellspacing='0' class='tbl'>";
 
        if (! -z $config) {
                my $count=0;