From: Alexander Marx Date: Thu, 21 Feb 2013 20:53:52 +0000 (+0100) Subject: Forward Firewall: bugfix converter->default forward mode is now set correctly X-Git-Tag: v2.15-beta1~290^2~11^2~170 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12a43202a6fb6a9b80664ebcf01792928c57c016;p=people%2Fms%2Fipfire-2.x.git Forward Firewall: bugfix converter->default forward mode is now set correctly some layout changes --- diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw index 5980651a85..22c9272ba4 100755 --- a/config/forwardfw/convert-outgoingfw +++ b/config/forwardfw/convert-outgoingfw @@ -251,10 +251,10 @@ sub process_rules my ($type,$action,$active,$grp1,$source,$grp2,$useport,$port,$prot,$grp3,$target,$remark,$log,$time,$time_mon,$time_tue,$time_wed,$time_thu,$time_fri,$time_sat,$time_sun,$time_from,$time_to); print"uzlputz modus ist $outsettings{'POLICY'} \n"; &General::readhash($fwdfwsettings,\%fwdsettings); - if ($outsettings{'POLICY'} eq 'MODE0'){ - $fwdfwsettings{'POLICY'}='MODE2'; + if ($outsettings{'POLICY'} eq 'MODE1'){ + $fwdfwsettings{'POLICY'}='MODE1'; }else{ - $fwdsettings{'POLICY'}=$outsettings{'POLICY'}; + $fwdsettings{'POLICY'}='MODE2'; } &General::writehash($fwdfwsettings,\%fwdsettings); if ($outsettings{'POLICY'} eq 'MODE1'){ diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi index 814f6ecc4c..bb6c42eb7f 100755 --- a/html/cgi-bin/forwardfw.cgi +++ b/html/cgi-bin/forwardfw.cgi @@ -584,7 +584,7 @@ sub base if ($fwdfwsettings{'POLICY1'} eq 'MODE2'){ $selected{'POLICY1'}{'MODE2'} = 'selected'; } else { $selected{'POLICY1'}{'MODE2'} = ''; } &hint; &addrule; - print "


"; + print "

"; &Header::openbox('100%', 'center', $Lang::tr{'fwdfw pol title'}); print < @@ -610,10 +610,10 @@ END - +
END - print "$Lang::tr{'outgoing firewall reset'}: "; + print "$Lang::tr{'outgoing firewall reset'}: "; print "
"; &Header::closebox(); } @@ -1269,7 +1269,7 @@ END $fwdfwsettings{'SRC_PORT'}=~ s/\|/,/g; print< - $Lang::tr{'fwhost icmptype'} END &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes); print""; @@ -1397,7 +1397,7 @@ END } print< - $Lang::tr{'fwhost cust srvgrp'}:$Lang::tr{'fwhost cust srvgrp'}: - $Lang::tr{'fwhost icmptype'} END &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes); print""; @@ -1847,6 +1847,7 @@ sub viewtablenew print""; print""; foreach my $key (sort {$a <=> $b} keys %$hash){ + $tdcolor=''; @tmpsrc=(); #check if vpn hosts/nets have been deleted if($$hash{$key}[3] =~ /ipsec/i || $$hash{$key}[3] =~ /ovpn/i){ @@ -1881,8 +1882,8 @@ sub viewtablenew $$hash{$key}[2]=''; } } - $$hash{$key}[3]=''; - $$hash{$key}[5]=''; + #$$hash{$key}[3]=''; + #$$hash{$key}[5]=''; } $$hash{'ACTIVE'}=$$hash{$key}[2]; $count++; @@ -1915,7 +1916,7 @@ END $rulecolor=$color{'color16'}; } print""; - &getcolor($$hash{$key}[4]); + &getcolor($$hash{$key}[3],$$hash{$key}[4]); print" END - &getcolor($$hash{$key}[6]); + &getcolor($$hash{$key}[5],$$hash{$key}[6]); print< END @@ -1947,6 +1948,7 @@ END }else{ print $$hash{$key}[6]; } + $tdcolor=''; &gettgtport(\%$hash,$key); print""; #Get Protocol @@ -2041,12 +2043,22 @@ END } print"
#$Lang::tr{'fwdfw source'}Log$Lang::tr{'fwdfw target'}$Lang::tr{'protocol'}$Lang::tr{'remark'}$Lang::tr{'fwdfw action'}
$ruletype"; if ($$hash{$key}[3] eq 'std_net_src'){ print &get_name($$hash{$key}[4]); @@ -1938,7 +1939,7 @@ END
"; &Header::closebox(); + print "
"; } } sub getcolor { + my $nettype=shift; my $val=shift; if($optionsfw{'SHOWCOLORS'} eq 'on'){ + 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;'"; + return; + } + if ($nettype eq 'ipsec_net_src' || $nettype eq 'ipsec_net_tgt'){ + $tdcolor="style='border: 2px solid $Header::colourvpn;'"; + return; + } foreach my $alias (sort keys %aliases) { if ($val eq $alias){ @@ -2055,26 +2067,23 @@ sub getcolor } } if ($val eq 'GREEN'){ - $tdcolor="style='border: 2px solid green;'"; + $tdcolor="style='border: 2px solid $Header::colourgreen;'"; }elsif ($val eq 'ORANGE'){ - $tdcolor="style='border: 2px solid orange;'"; + $tdcolor="style='border: 2px solid $Header::colourorange;'"; }elsif ($val eq 'BLUE'){ - $tdcolor="style='border: 2px solid blue;'"; + $tdcolor="style='border: 2px solid $Header::colourblue;'"; }elsif ($val eq 'IPFire' ){ - $tdcolor="style='border: 2px solid red;'"; + $tdcolor="style='border: 2px 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 orange;'"; + $tdcolor="style='border: 2px solid $Header::colourorange;'"; } if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){ - $tdcolor="style='border: 2px solid green;'"; + $tdcolor="style='border: 2px solid $Header::colourgreen;'"; } if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){ - $tdcolor="style='border: 2px solid blue;'"; - } - if ( &General::IpInSubnet($sip,$netsettings{'RED_ADDRESS'},$netsettings{'RED_NETMASK'})){ - $tdcolor="style='border: 2px solid red;'"; + $tdcolor="style='border: 2px solid $Header::colourblue;'"; } }elsif ($val eq 'Default IP'){ $tdcolor="style='border: 2px solid red;'";