From: Alexander Marx <amarx@ipfire.org>
Date: Sun, 10 Nov 2013 08:28:02 +0000 (+0100)
Subject: Firewall: fixed colors of target column when using standard networks
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d8afe3e2c0690899e2efa6742b13a619c4f92298;ds=sidebyside

Firewall: fixed colors of target column when using standard networks

When using RED, OpenVPN-Dyn or IPsec RW as target, the column was not
colored.
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 3e4e3b0eb..80989ce58 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1376,6 +1376,12 @@ sub getcolor
 		}elsif ($val eq 'IPFire' ){
 			$tdcolor="style='background-color: $Header::colourred;color:white;'";
 			return;
+		}elsif ($val eq 'OpenVPN-Dyn' ){
+			$tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+			return;
+		}elsif ($val eq 'IPsec RW' ){
+			$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+			return;
 		}elsif($val =~ /^(.*?)\/(.*?)$/){
 			my ($sip,$scidr) = split ("/",$val);
 			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
@@ -2600,7 +2606,7 @@ END
 			if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire'  || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
 				if ($$hash{$key}[6] eq 'RED1'){
 					print "$ipfireiface $Lang::tr{'red1'}";
-				}elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL')
+				}elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL' || $$hash{$key}[6] eq 'RED')
 				{
 					print "$ipfireiface ".&get_name($$hash{$key}[6]);
 				}else{