From c03d4a5e8a37c6fcbee55c5b7efa8930f9c98351 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 29 Oct 2013 18:45:40 +0100 Subject: [PATCH] firewall: Simplify code which shows the last rule. Also change headings of the rule sections. --- doc/language_issues.de | 5 +- doc/language_issues.en | 5 +- doc/language_issues.es | 6 +- doc/language_issues.fr | 6 +- doc/language_issues.nl | 6 +- doc/language_issues.pl | 6 +- doc/language_issues.ru | 6 +- doc/language_issues.tr | 6 +- doc/language_missings | 4 + html/cgi-bin/firewall.cgi | 261 +++++++++++++++++++++++--------------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 176 insertions(+), 137 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index a1fb60ca5..c36be8ae4 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -164,7 +164,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -189,6 +188,7 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw err tgt_port +WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network WARNING: translation string unused: fwdfw man port @@ -199,6 +199,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue @@ -347,7 +348,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -387,7 +387,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots diff --git a/doc/language_issues.en b/doc/language_issues.en index 4bb9ef22f..97da59920 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -187,7 +187,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -212,6 +211,7 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw err tgt_port +WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network WARNING: translation string unused: fwdfw man port @@ -222,6 +222,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost addrule WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue @@ -374,7 +375,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -414,7 +414,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots diff --git a/doc/language_issues.es b/doc/language_issues.es index f04d622f5..163b9f2cb 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -626,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -662,7 +660,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -702,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0483c27e8..d644104f2 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -382,7 +380,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -629,6 +626,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -665,7 +663,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -705,7 +702,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 2ebb0a5e1..0d6fafbb4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -188,7 +188,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -347,7 +346,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -575,6 +572,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -611,7 +609,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -651,7 +648,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f04d622f5..163b9f2cb 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -186,7 +186,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -342,7 +341,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -380,7 +378,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -626,6 +623,7 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -662,7 +660,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -702,7 +699,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a58e73265..5f06c94b7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -185,7 +185,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename WARNING: translation string unused: firewall graphs @@ -336,7 +335,6 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -376,7 +374,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -612,6 +609,7 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -648,7 +646,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -688,7 +685,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d207286dd..ba02f89a7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -188,7 +188,6 @@ WARNING: translation string unused: error external access WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write @@ -347,7 +346,6 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -387,7 +385,6 @@ WARNING: translation string unused: passwords must be at least 6 characters in l WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile -WARNING: translation string unused: policy WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots @@ -572,6 +569,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -608,7 +606,6 @@ WARNING: untranslated string: fwdfw err tgt_grp WARNING: untranslated string: fwdfw err tgt_mac WARNING: untranslated string: fwdfw err time WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw iface @@ -648,7 +645,6 @@ WARNING: untranslated string: fwdfw wd_sun WARNING: untranslated string: fwdfw wd_thu WARNING: untranslated string: fwdfw wd_tue WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwdfw xt access WARNING: untranslated string: fwhost addgrp WARNING: untranslated string: fwhost addgrpname WARNING: untranslated string: fwhost addhost diff --git a/doc/language_missings b/doc/language_missings index 6bdfffb8f..be8ec626a 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -92,6 +92,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -501,6 +502,7 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -894,6 +896,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< firewall rules < forward firewall < fw default drop < fwdfw ACCEPT @@ -1275,6 +1278,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< firewall rules < forward firewall < frequency < fw default drop diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index e5a6eeed6..8deeb1ce7 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -458,15 +458,13 @@ sub addrule { &error; - &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'}); + &Header::openbox('100%', 'left', ""); print < - -
+ - END if (&General::firewall_needs_reload()) { @@ -481,8 +479,9 @@ END
-
+
END + &Header::closebox(); &viewtablerule; } @@ -2362,27 +2361,35 @@ sub validremark return 0;} return 1; } -sub viewtablerule -{ + +sub viewtablerule { &General::readhash("/var/ipfire/ethernet/settings", \%netsettings); - &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" ); - &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} ); - &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" ); + + &viewtablenew(\%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'}); + &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'external access'}); + &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'}); } + sub viewtablenew { my $hash=shift; my $config=shift; my $title=shift; - my $title1=shift; my $go=''; + + my $show_box = (! -z $config) || ($optionsfw{'SHOWTABLES'} eq 'on'); + return if (!$show_box); + &General::get_aliases(\%aliases); &General::readhasharray("$confighost", \%customhost); &General::readhasharray("$config", $hash); &General::readhasharray("$configccdnet", \%ccdnet); &General::readhasharray("$configccdhost", \%ccdhost); - if( ! -z $config){ - &Header::openbox('100%', 'left',$title); + + &Header::openbox('100%', 'left', $title); + print ""; + + if (! -z $config) { my $count=0; my ($gif,$log); my $ruletype; @@ -2390,11 +2397,8 @@ sub viewtablenew my $tooltip; my @tmpsrc=(); my $coloryellow=''; - print <$title1 -
-
+ print < "; } - print"
# @@ -2719,97 +2723,152 @@ END } print"
"; - #SHOW FINAL RULE - print ""; - my $col; - if ($config eq '/var/ipfire/firewall/config'){ - my $pol='fwdfw '.$fwdfwsettings{'POLICY'}; - if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - }else{ - $col="bgcolor='green'"; - } - &show_defaultrules($col,$pol); - }elsif ($config eq '/var/ipfire/firewall/outgoing'){ - if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - print""; - }else{ - $col="bgcolor='green'"; - print""; - } - }else{ - print""; + } elsif ($optionsfw{'SHOWTABLES'} eq 'on') { + print < + + +END + } + + #SHOW FINAL RULE + my $policy = 'fwdfw ' . $fwdfwsettings{'POLICY'}; + my $colour = "bgcolor='green'"; + if ($fwdfwsettings{'POLICY'} eq 'MODE1') { + $colour = "bgcolor='darkred'"; + } + + my $message; + if (($config eq '/var/ipfire/firewall/config') && ($fwdfwsettings{'POLICY'} ne 'MODE1')) { + print < + + + + +END } - } -} -&Header::closebigbox(); -&Header::closepage(); -sub show_defaultrules -{ - my $col=shift; - my $pol=shift; - #STANDARD RULES (From WIKI) - print"
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol allow'}
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}
$Lang::tr{'fwhost empty'}
 
+ +END + + # GREEN + print < + + +END + + if (&Header::orange_used()) { + print < + $Lang::tr{'orange'} + ($Lang::tr{'fwdfw pol allow'}) + +END } - print"
+ $Lang::tr{'green'} + + $Lang::tr{'red'} + ($Lang::tr{'fwdfw pol allow'}) +
"; - print "
"; - print "

"; - &Header::closebox(); - }else{ - if ($optionsfw{'SHOWTABLES'} eq 'on'){ - print "$title1
"; - print"
$Lang::tr{'fwhost empty'}
"; - my $col; - if ($config eq '/var/ipfire/firewall/config'){ - my $pol='fwdfw '.$fwdfwsettings{'POLICY'}; - if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - }else{ - $col="bgcolor='green'"; - } - &show_defaultrules($col,$pol); - }elsif ($config eq '/var/ipfire/firewall/outgoing'){ - print ""; - my $pol='fwdfw '.$fwdfwsettings{'POLICY1'}; - if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ - $col="bgcolor='darkred'"; - print""; - }else{ - $col="bgcolor='green'"; - print""; - } - }else{ - print "
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol allow'}
"; - print""; - } - print"
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}


"; + + if (&Header::blue_used()) { + print < + $Lang::tr{'blue'} + ($Lang::tr{'fwdfw pol allow'}) +
"; - if ($col eq "bgcolor='green'"){ - print "
"; - my $blue = " $Lang::tr{'blue'} ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used()); - my $orange = " $Lang::tr{'orange'} ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used()); - my $blue1 = " $Lang::tr{'blue'} ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used()); - my $orange1 = " $Lang::tr{'orange'} ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used()); - print""; - print"" if (&Header::orange_used()); - print"" if (&Header::blue_used()); print""; - if (&Header::orange_used()){ - print""; - print"" if (&Header::blue_used()); + + # ORANGE + if (&Header::orange_used()) { + print < + + + +END + + if (&Header::blue_used()) { + print < + $Lang::tr{'blue'} + ($Lang::tr{'fwdfw pol block'}) + +END + } + print""; } - if (&Header::blue_used()){ - print""; - print"" if (&Header::orange_used()); - print""; + + if (&Header::blue_used()) { + print < + + +END + + if (&Header::orange_used()) { + print < + $Lang::tr{'orange'} + ($Lang::tr{'fwdfw pol block'}) + + +END + } + print""; } - print""; - }elsif($col eq "bgcolor='darkred'"){ - print "
$Lang::tr{'green'} $Lang::tr{'red'} ($Lang::tr{'fwdfw pol allow'})$orange1$blue1
$Lang::tr{'orange'} $Lang::tr{'red'} ($Lang::tr{'fwdfw pol allow'}) $Lang::tr{'green'} ($Lang::tr{'fwdfw pol block'})$blue + $Lang::tr{'orange'} + + $Lang::tr{'red'} + ($Lang::tr{'fwdfw pol allow'}) + + $Lang::tr{'green'} + ($Lang::tr{'fwdfw pol block'}) +
$Lang::tr{'blue'} $Lang::tr{'red'} ($Lang::tr{'fwdfw pol allow'})$orange $Lang::tr{'green'} ($Lang::tr{'fwdfw pol block'}) + $Lang::tr{'blue'} + + $Lang::tr{'red'} + ($Lang::tr{'fwdfw pol allow'}) + + $Lang::tr{'green'} + ($Lang::tr{'fwdfw pol block'}) +
$Lang::tr{'fwdfw final_rule'} $Lang::tr{'fwdfw pol allow'}
"; - print""; + + print < + + +END + + $message = $Lang::tr{'fwdfw pol allow'}; + + } elsif ($config eq '/var/ipfire/firewall/outgoing') { + $message = $Lang::tr{'fwdfw pol allow'}; + + } else { + $message = $Lang::tr{'fwdfw pol block'}; + $colour = "bgcolor='darkred'"; + } + + if ($message) { + print < + + +END } + + print "
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}
+ $Lang::tr{'policy'}: $message +
"; + print "
"; + + &Header::closebox(); } + +&Header::closebigbox(); +&Header::closepage(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 002a4a5f6..af8851fca 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -881,6 +881,7 @@ 'firewall logs' => 'Firewall-Logdateien', 'firewall logs ip' => 'Fw-Logdiagramme (IP)', 'firewall logs port' => 'Fw-Logdiagramme (Port)', +'firewall rules' => 'Firewallregeln', 'firewallhits' => 'Firewalltreffer', 'firmware' => 'Firmware', 'firmware upload' => 'Hochladen der Firmware/Treiber', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 44e8697be..bdb66fa16 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -906,6 +906,7 @@ 'firewall logs' => 'Firewall Logs', 'firewall logs ip' => 'Fw-Loggraphs (IP)', 'firewall logs port' => 'Fw-Loggraphs (Port)', +'firewall rules' => 'Firewall Rules', 'firewallhits' => 'firewallhits', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', -- 2.39.2