From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 24 Oct 2013 14:04:26 +0000 (+0200)
Subject: Firewall: rename Protocol 41 in Dropdown and ruletable ->Now "IPv6 Encapsulation... 
X-Git-Tag: v2.15-beta1~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c89c64de19f43d77e2bc720fef2b58486472878;p=people%2Fms%2Fipfire-2.x.git

Firewall: rename Protocol 41 in Dropdown and ruletable ->Now "IPv6 Encapsulation (protocol 41)" in dropdown and "IPv6 Encap" in ruletable
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index c7c9fbda7b..6e11176f27 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1757,7 +1757,11 @@ END
 			if ($_ eq $fwdfwsettings{'PROT'}) {
 				print " selected=\"selected\"";
 			}
-			print ">$_</option>";
+			if($_ eq "IPv6"){
+				print ">$Lang::tr{'fwdfw prot41'}</option>";
+			}else{
+				print ">$_</option>";
+			}
 		}
 		print<<END;
 						</select>
@@ -2467,7 +2471,11 @@ END
 			#Get Protocol
 			my $prot;
 			if ($$hash{$key}[8]){
-				push (@protocols,$$hash{$key}[8]);
+				if ($$hash{$key}[8] eq "IPv6"){
+					push (@protocols,"IPv6 Encap")
+				}else{
+					push (@protocols,$$hash{$key}[8]);
+				}
 			}elsif($$hash{$key}[14] eq 'cust_srv'){
 				&get_serviceports("service",$$hash{$key}[15]);
 			}elsif($$hash{$key}[14] eq 'cust_srvgrp'){
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ce48d69489..5abadb75b6 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -963,6 +963,7 @@
 'fwdfw pol text' => 'Firewall-Standardverhalten für Verbindungen aus lokalen Netzwerken: Alle Verbindungen können entweder zugelassen oder geblockt werden, wenn keine Ausnahmeregel zutrifft. "Blockiert" trennt ebenfalls die Kommunikation zwischen den lokalen Netzwerken.',
 'fwdfw pol text1' => 'Firewall-Standardverhalten für von der Firewall selbst initiierte Verbindungen.',
 'fwdfw pol title' => 'Standardverhalten der Firewall',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protokoll 41)',
 'fwdfw red' => 'ROT',
 'fwdfw reread' => 'Änderungen übernehmen',
 'fwdfw rule action' => 'Regelaktion:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c3e4c3eb2d..4915b5859d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -988,6 +988,7 @@
 'fwdfw pol text' => 'Sets the default firewall behaviour for connections from local networks. You may either allow all new connections or block them by default. Connections between the local networks are also blocked in the latter mode.',
 'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
 'fwdfw pol title' => 'Default firewall behaviour',
+'fwdfw prot41' => 'IPv6 Encapsulation (Protocol 41)',
 'fwdfw red' => 'RED',
 'fwdfw reread' => 'Apply changes',
 'fwdfw rule action' => 'Rule action:',