X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Ffirewall.cgi;h=6f4e10b02256ea6d4c4f56ed571eae1d397fc80e;hb=1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be;hp=ee13033614ac874db302dee9935670e0b3db8421;hpb=057652c5e548c5e0b0e4e07559c21b7916335af9;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index ee1303361..6f4e10b02 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -609,6 +609,19 @@ sub checktarget
 		$errormessage.=$Lang::tr{'fwdfw err notgtip'};
 		return $errormessage;
 	}
+	#check for mac in targetgroup
+	if ($fwdfwsettings{'grp2'} eq 'cust_grp_tgt'){
+		&General::readhasharray("$configgrp", \%customgrp);
+		&General::readhasharray("$confighost", \%customhost);
+		foreach my $grpkey (sort keys %customgrp){
+			foreach my $hostkey (sort keys %customhost){
+				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
+					$hint=$Lang::tr{'fwdfw hint mac'};
+					return $hint;
+				}
+			}
+		}
+	}
 	#check empty fields
 	if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";}
 	#check tgt services
@@ -1403,24 +1416,7 @@ sub hint
 		print "<class name='base'>$hint\n";
 		print "&nbsp;</class>\n";
 		&Header::closebox();
-		print"<hr>";
-	}
-}
-sub inc_counter
-{
-	my $config=shift;
-	my %hash=%{(shift)};
-	my $val=shift;
-	my $pos;
-
-	&General::readhasharray($config, \%hash);
-	foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) }  keys %hash){
-		if($hash{$key}[0] eq $val){
-			$pos=$#{$hash{$key}};
-			$hash{$key}[$pos] = $hash{$key}[$pos]+1;
-		}
 	}
-	&General::writehasharray($config, \%hash);
 }
 sub newrule
 {
@@ -2720,7 +2716,7 @@ END
 				<td colspan='13'>&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan='13'>
+				<td colspan='13' style="padding-left:0px;">
 					<table width="100%" border='1' rules="cols" cellspacing='0'>
 END