firewall: Simplify code which shows the last rule.

Also change headings of the rule sections.

diff --git a/doc/language_issues.de b/doc/language_issues.de
index a1fb60ca5d2764db7be9639ae2bb2527cadd870a..c36be8ae4e4781d168b5f50b5c5a0e68e6406b1b 100644 (file)
--- 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 4bb9ef22f9f091e8c6b684d0983a5a76621f913e..97da599200987ce0ee547f0bc41381fc26f0abf4 100644 (file)
--- 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 f04d622f5bf8d7024b490fa173c8545e365253c7..163b9f2cb4134c8d8d10bb4f823b8175dc18569f 100644 (file)
--- 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 0483c27e88ff35cf55df929aa4ab4fc56d95c931..d644104f2991808c84b955679880ae5f6b06f8b5 100644 (file)
--- 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 2ebb0a5e1629161a74cff7fc0e2c3c7807c909df..0d6fafbb4d37be2be733352a12f009a9fd0db626 100644 (file)
--- 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 f04d622f5bf8d7024b490fa173c8545e365253c7..163b9f2cb4134c8d8d10bb4f823b8175dc18569f 100644 (file)
--- 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 a58e7326515361340f35cb035101e07f0a7ae548..5f06c94b7ff4ea4f0bd275138451a31c1a05d37b 100644 (file)
--- 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 d207286dd953874f4b4034679a02a4870edd95ad..ba02f89a7d3701eb9fb51ce956a212e1eaf946ce 100644 (file)
--- 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 6bdfffb8f960677f467025a8bcc75db5457ce491..be8ec626ac679aab680f3d07005f8b88063f1455 100644 (file)
--- 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 e5a6eeed69810cc97fce2e4a34fd765e0e4dbca7..8deeb1ce71dc128951ef632bd2a63f1ade7a9cdf 100755 (executable)
--- 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;
                <form method="POST" action="">
                        <table border='0' width="100%">
                                <tr>
-                                       <td>
+                                       <td align='center'>
                                                <input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
-                                       </td>
-                                       <td align="right">
 END
 
        if (&General::firewall_needs_reload()) {
@@ -481,8 +479,9 @@ END
                        </table>
                </form>
 
-               <hr>
+               <br>
 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 "<table width='100%' cellspacing='0' border='0'>";
+
+       if (! -z $config) {
                my $count=0;
                my ($gif,$log);
                my $ruletype;
@@ -2390,11 +2397,8 @@ sub viewtablenew
                my $tooltip;
                my @tmpsrc=();
                my $coloryellow='';
-               print <<END;
-                       <b>$title1</b>
-                       <br>
 
-                       <table width='100%' cellspacing='0' border='0'>
+               print <<END;
                                <tr>
                                        <th align='right' width='3%'>
                                                #
@@ -2719,97 +2723,152 @@ END
                        }
                        print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
                }
-               print"</table>";
-               #SHOW FINAL RULE
-               print "<table width='100%'rules='cols' border='1'>";
-               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"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
-                       }else{
-                               $col="bgcolor='green'";
-                               print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
-                       }
-               }else{
-                       print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+       } elsif ($optionsfw{'SHOWTABLES'} eq 'on') {
+               print <<END;
+                       <tr>
+                               <td colspan='7' height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td>
+                       </tr>
+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;
+                       <tr>
+                               <td colspan='13'>&nbsp;</td>
+                       </tr>
+                       <tr>
+                               <td colspan='13'>
+                                       <table width="100%" border='1' rules="cols" cellspacing='0'>
+END
+
+               # GREEN
+               print <<END;
+                       <tr>
+                               <td align='center'>
+                                       <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+                               </td>
+                               <td align='center'>
+                                       <font color="$Header::colourred">$Lang::tr{'red'}</font>
+                                       ($Lang::tr{'fwdfw pol allow'})
+                               </td>
+END
+
+               if (&Header::orange_used()) {
+                       print <<END;
+                               <td align='center'>
+                                       <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+                                       ($Lang::tr{'fwdfw pol allow'})
+                               </td>
+END
                }
-               print"</table>";
-               print "<hr>";
-               print "<br><br>";
-               &Header::closebox();
-       }else{
-               if ($optionsfw{'SHOWTABLES'} eq 'on'){
-                       print "<b>$title1</b><br>";
-                       print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
-                       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 "<table width='100%' rules='cols' border='1'>";
-                               my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
-                               if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
-                                       $col="bgcolor='darkred'";
-                                       print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
-                               }else{
-                                       $col="bgcolor='green'";
-                                       print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
-                               }
-                       }else{
-                               print "<table width='100%' rules='cols' border='1'>";
-                               print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
-                       }
-                       print"</table><br><br>";
+
+               if (&Header::blue_used()) {
+                       print <<END;
+                               <td align='center'>
+                                       <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+                                       ($Lang::tr{'fwdfw pol allow'})
+                               </td>
+END
                }
-       }
-}
-&Header::closebigbox();
-&Header::closepage();
 
-sub show_defaultrules
-{
-       my $col=shift;
-       my $pol=shift;
-       #STANDARD RULES (From WIKI)
-       print"</table>";
-       if ($col eq "bgcolor='green'"){
-               print "<br><table width='100%' rules='cols' border='1' >";
-               my $blue   = "<font color=$Header::colourblue>    $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used());
-               my $orange = "<font color=$Header::colourorange>  $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used());
-               my $blue1   = "<font color=$Header::colourblue>    $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used());
-               my $orange1 = "<font color=$Header::colourorange>  $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used());
-               print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
-               print"<td align='center'>$orange1</td>" if (&Header::orange_used());
-               print"<td align='center'>$blue1</td>" if (&Header::blue_used());
                print"</tr>";
-               if (&Header::orange_used()){
-                       print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen>  $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
-                       print"<td align='center'>$blue</td>" if (&Header::blue_used());
+
+               # ORANGE
+               if (&Header::orange_used()) {
+                       print <<END;
+                               <tr>
+                                       <td align='center' width='20%'>
+                                               <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+                                       </td>
+                                       <td align='center'>
+                                               <font color="$Header::colourred">$Lang::tr{'red'}</font>
+                                               ($Lang::tr{'fwdfw pol allow'})
+                                       </td>
+                                       <td align='center'>
+                                               <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+                                               ($Lang::tr{'fwdfw pol block'})
+                                       </td>
+END
+
+                       if (&Header::blue_used()) {
+                               print <<END;
+                                       <td align='center'>
+                                               <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+                                               ($Lang::tr{'fwdfw pol block'})
+                                       </td>
+END
+                       }
+
                        print"</tr>";
                }
-               if (&Header::blue_used()){
-                       print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
-                       print"<td align='center'>$orange</td>" if (&Header::orange_used());
-                       print"<td align='center'><font color=$Header::colourgreen>  $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
+
+               if (&Header::blue_used()) {
+                       print <<END;
+                               <tr>
+                                       <td align='center'>
+                                               <font color="&Header::colourblue">$Lang::tr{'blue'}</font>
+                                       </td>
+                                       <td align='center'>
+                                               <font color="$Header::colourred">$Lang::tr{'red'}</font>
+                                               ($Lang::tr{'fwdfw pol allow'})
+                                       </td>
+END
+
+                       if (&Header::orange_used()) {
+                               print <<END;
+                                       <td align='center'>
+                                               <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+                                               ($Lang::tr{'fwdfw pol block'})
+                                       </td>
+                                       <td align='center'>
+                                               <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+                                               ($Lang::tr{'fwdfw pol block'})
+                                       </td>
+END
+                       }
+
                        print"</tr>";
                }
-               print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
-       }elsif($col eq "bgcolor='darkred'"){
-               print "<table width='100%' rules='cols' border='1' >";
-               print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+
+               print <<END;
+                                       </table>
+                               </td>
+                       </tr>
+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;
+                       <tr>
+                               <td $colour align='center' colspan='13'>
+                                       <font color='#FFFFFF'>$Lang::tr{'policy'}: $message</font>
+                               </td>
+                       </tr>
+END
        }
+
+       print "</table>";
+       print "<br>";
+
+       &Header::closebox();
 }
+
+&Header::closebigbox();
+&Header::closepage();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 002a4a5f63cf8e37f32b79fa332d361055454cea..af8851fcaa04db36194fa6ceea887408203c42f5 100644 (file)
--- 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 44e8697beafd99666d5fd61d25ccf6c15d31f78d..bdb66fa162fcb91f41d6bb07f646ae15f8246a9f 100644 (file)
--- 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',