Forward Firewall: changed layout of "apply-button" (after rules where changed. When...

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 28672784b8e24cd88963f3afffc97a2c32ce0733..db09e5c60adb324050acd73e217e188f10a15755 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -438,7 +438,7 @@ sub addrule
 {
        &error;
        if (-f "${General::swroot}/forward/reread"){
-               print "<table border='0'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: red; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div</td></tr></table></form><hr><br>";
+               print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div</td></tr></table></form><hr><br>";
        }
        &Header::openbox('100%', 'left',  $Lang::tr{'fwdfw menu'});
        print "<form method='post'>";
@@ -2155,8 +2155,8 @@ sub viewtablerule
        &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
        &viewtablenew(\%confignatfw,$confignat,"$Lang::tr{'fwdfw rules'}","Portforward / SNAT" );
        &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
-       &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
        &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
+       &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
 }
 sub viewtablenew
 {
@@ -2254,6 +2254,13 @@ END
                        print"<td align='center' width='160' $tdcolor>";
                        if ($$hash{$key}[3] eq 'std_net_src'){
                                print &get_name($$hash{$key}[4]);
+                       }elsif ($$hash{$key}[3] eq 'src_addr'){
+                               my ($split1,$split2) = split("/",$$hash{$key}[4]);
+                               if ($split2 eq '32'){
+                                       print $split1;
+                               }else{
+                                       print $$hash{$key}[4];
+                               }
                        }else{
                                print $$hash{$key}[4];
                        }
@@ -2300,6 +2307,13 @@ END
                                }else{
                                        print &get_name($$hash{$key}[6]);
                                }
+                       }elsif ($$hash{$key}[5] eq 'tgt_addr'){
+                               my ($split1,$split2) = split("/",$$hash{$key}[6]);
+                               if ($split2 eq '32'){
+                                       print $split1;
+                               }else{
+                                       print $$hash{$key}[6];
+                               }
                        }else{
                                print $$hash{$key}[6];
                        }

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 444b3660eb73841497ddd7bc73c965a60c57f4d2..4aee444b9ac8c9c69ac83cfce58dca89bf97e05c 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1061,7 +1061,7 @@ if($fwhostsettings{'ACTION'} eq '')
 sub showmenu
 {
        if (-f "${General::swroot}/forward/reread"){
-               print "<table border='0'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: red; font-weight: bold; font-size: 14pt;'>$Lang::tr{'fwhost reread'}</td></tr></table></form><hr><br>";
+               print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</td></tr></table></form><hr><br>";
        }
        &Header::openbox('100%', 'left',$Lang::tr{'fwhost menu'});
        print<<END;

diff --git a/lfs/configroot b/lfs/configroot
index c0a56e44aff8d1a8152957fbbd5cebaa99100cd9..8a45ad79c27fe2fdd4ad0595e16428c025b60da8 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -123,8 +123,8 @@ $(TARGET) :
        echo  "DROPPORTSCAN=on"         >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "DROPOUTGOING=on"         >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "SHOWREMARK=on"           >> $(CONFIG_ROOT)/optionsfw/settings
-       echo  "SHOWCOLORS=off"          >> $(CONFIG_ROOT)/optionsfw/settings
-       echo  "SHOWTABLES=on"           >> $(CONFIG_ROOT)/optionsfw/settings
+       echo  "SHOWCOLORS=on"           >> $(CONFIG_ROOT)/optionsfw/settings
+       echo  "SHOWTABLES=off"          >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "SHOWDROPDOWN=off"        >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "POLICY=MODE2"            >> $(CONFIG_ROOT)/forward/settings
        echo  "POLICY1=MODE2"           >> $(CONFIG_ROOT)/forward/settings