webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 04:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward Firewall: changed layout of "apply-button" (after rules where changed. When using single hosts in rules, the prefix is no longer shown in the ruletable. Default settings for firewall-options changed

Browse Source
This commit is contained in:
Alexander Marx
2013-06-26 10:29:02 +02:00
committed by Michael Tremer
parent 8442c93764
commit 4f3bd0ca20
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
html/cgi-bin/forwardfw.cgi
View File

@@ -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'>";
@@ -2157,8 +2157,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
{
@@ -2256,6 +2256,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];
}
@@ -2302,6 +2309,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];
}

2
html/cgi-bin/fwhosts.cgi
View File

@@ -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;

4
lfs/configroot
View File

@@ -124,8 +124,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