From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sun, 2 May 2010 20:19:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~337
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bc3e1b292534d100ed2ee3fc29b6c56d556ba3d5;hp=bfc35ba280e0beb8b7129049ef14e18c2d32588d

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi
index 080371b375..886330d0e2 100644
--- a/html/cgi-bin/iptables.cgi
+++ b/html/cgi-bin/iptables.cgi
@@ -106,8 +106,9 @@ END
 		}
 
 		$lines++;
-	   
+
 	}
+	$chains{$chainname."end"} = $lines-1;
 	close (FILE);
 
 # now the chain hash is extracted to get the correct name of the chain
@@ -119,7 +120,7 @@ END
 # colored gui
 
 	print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
-	foreach (keys(%chains)){
+	foreach (sort(keys(%chains))){
 
 		if ( $_ =~ /end$/ ){
 			next;
@@ -229,6 +230,7 @@ END
 		$manlines++;
 	   
 	}
+	$chainsman{$chainname."end"} = $manlines-1;
 	close (FILE);
 
 # now the chain hash is extracted to get the correct name of the chain
@@ -240,7 +242,7 @@ END
 # colored gui
 
 	print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
-	foreach (keys(%chainsman)){
+	foreach (sort(keys(%chainsman))){
 
 		if ( $_ =~ /end$/ ){
 			next;
@@ -355,6 +357,7 @@ END
 		$natlines++;
 	   
 	}
+	$chainsnat{$chainname."end"} = $natlines-1;
 	close (FILE);
 
 # now the chain hash is extracted to get the correct name of the chain
@@ -366,7 +369,7 @@ END
 # colored gui
 
 	print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
-	foreach (keys(%chainsnat)){
+	foreach (sort(keys(%chainsnat))){
 
 		if ( $_ =~ /end$/ ){
 			next;