# | $Lang::tr{'fwdfw source'} | Log | $Lang::tr{'fwdfw target'} | $Lang::tr{'protocol'} | $Lang::tr{'fwdfw time'} | $Lang::tr{'fwdfw action'} |
# | $Lang::tr{'fwdfw source'} | Log | $Lang::tr{'fwdfw target'} | $Lang::tr{'fwdfw action'} | $Lang::tr{'fwdfw time'} | $Lang::tr{'protocol'} foreach my $key (sort {$a <=> $b} keys %$hash){ $tdcolor=''; @tmpsrc=(); @@ -2401,7 +2401,7 @@ sub viewtablenew } print"|||||||
$key   | END if ($$hash{$key}[0] eq 'ACCEPT'){ $ruletype='A'; @@ -2416,7 +2416,7 @@ END $tooltip='REJECT'; $rulecolor=$color{'color16'}; } - print"$ruletype | "; + print"$ruletype | "; &getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost); print"";
if ($$hash{$key}[3] eq 'std_net_src'){
@@ -2428,7 +2428,7 @@ END
&getsrcport(\%$hash,$key);
#Is this a SNAT rule?
if ($$hash{$key}[31] eq 'snat'){
- print" SNAT -> $$hash{$key}[29]"; + print" -> $$hash{$key}[29]"; if ($$hash{$key}[30] ne ''){ print": $$hash{$key}[30]"; } @@ -2458,7 +2458,7 @@ END $$hash{$key}[30]=~ tr/|/,/; print": $$hash{$key}[30]"; } - print" DNAT->"; + print" ->"; } if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' && $$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){ if ($$hash{$key}[6] eq 'RED1') @@ -2489,22 +2489,7 @@ END my $protz=join(",",@protocols); print" | $protz | "; @protocols=(); - if ($$hash{$key}[18] eq 'ON'){ - my @days=(); - if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});} - if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});} - if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});} - if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});} - if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});} - if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});} - if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});} - my $weekdays=join(",",@days); - if (@days){ - print"$weekdays   $$hash{$key}[26] - $$hash{$key}[27] | "; - } - }else{ - print"24/7 | "; - } + if($$hash{$key}[2] eq 'ON'){ $gif="/images/on.gif" @@ -2562,11 +2547,28 @@ END print"||||||
  |   $$hash{$key}[16] |   |   $$hash{$key}[16] | "; + #TIMEFRAME + if ($$hash{$key}[18] eq 'ON'){ + my @days=(); + if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});} + if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});} + if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});} + if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});} + if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});} + if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});} + if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});} + my $weekdays=join(",",@days); + if (@days){ + print"$weekdays   $$hash{$key}[26] - $$hash{$key}[27] | "; + } + }else{ + print"24/7 | "; + } } - print"|||||||