Merge remote-tracking branch 'amarx/beta3' into next

This commit is contained in:
Michael Tremer
2014-03-04 14:54:06 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1571,7 +1571,7 @@ sub newrule
my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
#------SOURCE-------------------------------------------------------
print "<form method='post'>";

View File

@@ -2014,7 +2014,7 @@ sub checkname
}
sub checkgroup
{
&General::readhasharray("$configsrvgrp", \%customservicegrp );
&General::readhasharray("$configgrp", \%customgrp );
my $name=shift;
foreach my $key (keys %customservicegrp) {
if($customservicegrp{$key}[0] eq $name){