$Lang::tr{'fwdfw use srv'} $Lang::tr{'fwhost cust service'}
+ $Lang::tr{'fwdfw use srv'} $Lang::tr{'fwhost cust service'}
END
&General::readhasharray("$configsrv", \%customservice);
- foreach my $key (sort { uc($customservice{$a}[0]) cmp uc($customservice{$b}[0]) } keys %customservice){
+ foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
print"$customservice{$key}[0] ";
}
print<
- $Lang::tr{'fwhost cust srvgrp'}:
+ $Lang::tr{'fwhost cust srvgrp'}
END
&General::readhasharray("$configsrvgrp", \%customservicegrp);
my $helper;
- foreach my $key (sort { uc($customservicegrp{$a}[0]) cmp uc($customservicegrp{$b}[0]) } keys %customservicegrp){
+ foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
if ($helper ne $customservicegrp{$key}[0]){
print"
- $Lang::tr{'fwdfw man port'}
+ $Lang::tr{'fwdfw man port'}
END
foreach ("TCP","UDP","GRE","ESP","AH","ICMP")
{
@@ -1725,12 +1652,12 @@ END
}
$fwdfwsettings{'TGT_PORT'} =~ s/\|/,/g;
print<
+
$Lang::tr{'fwhost icmptype'}
END
&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
print"All ICMP-Types ";
- foreach my $key (sort { uc($icmptypes{$a}[0]) cmp uc($icmptypes{$b}[0]) }keys %icmptypes){
+ foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
if($fwdfwsettings{'ICMP_TGT'} eq "$icmptypes{$key}[0]"){
print"$icmptypes{$key}[0] ($icmptypes{$key}[1]) ";
}else{
@@ -1747,30 +1674,29 @@ END
&Header::openbox('100%', 'left', 'NAT');
print<
- $Lang::tr{'fwdfw use nat'}
- $Lang::tr{'fwdfw dnat'}
+ $Lang::tr{'fwdfw use nat'}
+ $Lang::tr{'fwdfw dnat'}
END
- print"IPFire: ";
+ print"Firewall: ";
print "$Lang::tr{'all'} ";
print "Default IP ";
foreach my $alias (sort keys %aliases)
{
print "$alias ";
}
- print" ";
- print"Port: ";
+ print" ";
+ $fwdfwsettings{'dnatport'}=~ tr/|/,/;
+ print"Port: ";
print" ";
#SNAT
- print"$Lang::tr{'fwdfw snat'} ";
- print"IPFire: ";
- print "Default IP ";
+ print"$Lang::tr{'fwdfw snat'} ";
+ print"Firewall: ";
foreach my $alias (sort keys %aliases)
{
print "$alias ";
}
foreach my $network (sort keys %defaultNetworks)
{
- next if($defaultNetworks{$network}{'NAME'} eq "RED");
next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
next if($defaultNetworks{$network}{'NAME'} eq "ALL");
next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
@@ -1778,7 +1704,7 @@ END
print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
print ">$network";
}
- print"