}
#check if we try to break rules
if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
- $errormessage.=$Lang::tr{'fwdfw err same'};
+ $errormessage=$Lang::tr{'fwdfw err same'};
}
#INPUT part
if($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
}
#check if source and target identical
if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){
- $errormessage.=$Lang::tr{'fwdfw err same'};
+ $errormessage=$Lang::tr{'fwdfw err same'};
return $errormessage;
}
#get source and targetip address if possible
$ipfireiface='Interface';
}
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')
- {
+ if ($$hash{$key}[6] eq 'RED1'){
print "$ipfireiface $Lang::tr{'red1'}";
+ }elsif ($$hash{$key}[6] ne 'RED')
+ {
+ print "$ipfireiface $$hash{$key}[6]";
}else{
- print &get_name($$hash{$key}[6]);
+ print "$$hash{$key}[6]";
}
}elsif ($$hash{$key}[5] eq 'tgt_addr'){
my ($split1,$split2) = split("/",$$hash{$key}[6]);
print $$hash{$key}[6];
}
}else{
- print "$ipfireiface $$hash{$key}[6]";
+ print "$$hash{$key}[6]";
}
$tdcolor='';
#TARGETPORT
'fwdfw wd_fri' => 'Fri',
'fwdfw wd_sat' => 'Sat',
'fwdfw wd_sun' => 'Sun',
-'fwdfw xt access' => 'Access to firewall',
+'fwdfw xt access' => 'Input',
'fwhost addgrp' => 'Add Network / Host Group:',
'fwhost addgrpname' => 'Groupname:',
'fwhost addhost' => 'Add Host:',