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

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	config/rootfiles/core/41/filelists/files
This commit is contained in:
Arne Fitzenreiter
2010-10-14 08:33:27 +02:00
parent d4c6ba21eb 4c4a347552
commit 799cc0f3a9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/outgoingfw/outgoingfw.pl
View File

@@ -187,7 +187,7 @@ foreach $configentry (sort @configs)
foreach $SOURCE (@SOURCE) {
$SOURCE =~ s/\s//gi;
if ( $SOURCE eq "" ){next;}
if ( $SOURCE eq "" || $configline[1] eq "" ){next;}
if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){
$SOURCE =~ s/[^a-zA-Z0-9]/:/gi;

8
html/cgi-bin/outgoingfw.cgi
View File

@@ -408,8 +408,12 @@ END
if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
print <<END
<tr bgcolor='$color{'color20'}'>
if ( $outfwsettings{'ENABLED'} eq "on" ){
print "<tr bgcolor='$color{'color20'}'>";
} else {
print "<tr bgcolor='$color{'color18'}'>";
}
print <<END
<td align='center'>$outfwsettings{'PROT'}
<td align='center'>$outfwsettings{'SNET'}
<td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}