From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 14 Aug 2013 07:06:38 +0000 (+0200)
Subject: Forward Firewall: BUGFIX: when having more than 10 hosts/networks in a firewall-group... 
X-Git-Tag: v2.15-beta1~286^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0c2cf9e2145737cc6af6f6147f322d9ce60465f6

Forward Firewall: BUGFIX: when having more than 10 hosts/networks in a firewall-groups group, the table was not shown correctly
---

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 92c2d38b94..482ccabf5b 100755
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1494,7 +1494,7 @@ sub viewtablegrp
 	{ 
 		print "<center><b>$Lang::tr{'fwhost err emptytable'}</b>";
 	}else{
-		foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } sort { ncmp ($customgrp{$a}[2],$customgrp{$b}[2]) } keys %customgrp){
+		foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } sort { ncmp($customgrp{$a}[2],$customgrp{$b}[2]) } keys %customgrp){
 			$count++;
 			if ($helper ne $customgrp{$key}[0]){
 				$delflag='0';
@@ -1511,7 +1511,7 @@ sub viewtablegrp
 				if ($customgrp{$key}[2] eq "none"){$customgrp{$key}[2]=$Lang::tr{'fwhost err emptytable'};}
 				$grpname=$customgrp{$key}[0];
 				$remark="$customgrp{$key}[1]";
-				if($count gt 2){ print"</table>";}
+				if($count gt 1){ print"</table>";}
 				print "<br><b><u>$grpname</u></b>&nbsp; &nbsp;";
 				print " <b>$Lang::tr{'remark'}:</b>&nbsp $remark &nbsp " if ($remark ne '');
 				print "<b>$Lang::tr{'used'}:</b> $customgrp{$key}[4]x";
@@ -1554,7 +1554,6 @@ sub viewtablegrp
 			$number++;
 		}
 		print"</table>";
-		
 	}
 	&Header::closebox();
 }