From e3c589276a90cfd67070e5e3f8007fc7ead6058f Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 24 Apr 2013 11:49:11 +0200
Subject: [PATCH] Forward Firewall: if ipsec rw net is set to green subnet, the
 rules are colored green instead of purple

---
 html/cgi-bin/forwardfw.cgi | 75 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index e074047b3c..922297d050 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -77,7 +77,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.5';
+my $VERSION='0.9.9.6';
 my $color;
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
@@ -1491,6 +1491,40 @@ sub getcolor
 	my $val=shift;
 	my $hash=shift;
 	if($optionsfw{'SHOWCOLORS'} eq 'on'){
+		#standard networks
+		if ($val eq 'GREEN'){
+			$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+			return;
+		}elsif ($val eq 'ORANGE'){
+			$tdcolor="style='border: 1px solid $Header::colourorange;'";
+			return;
+		}elsif ($val eq 'BLUE'){
+			$tdcolor="style='border: 1px solid $Header::colourblue;'";
+			return;
+		}elsif ($val eq 'RED'){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}elsif ($val eq 'IPFire' ){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}elsif($val =~ /^(.*?)\/(.*?)$/){
+			my ($sip,$scidr) = split ("/",$val);
+			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourorange;'";
+				return;
+			}
+			if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+				return;
+			}
+			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourblue;'";
+				return;
+			}
+		}elsif ($val eq 'Default IP'){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}
 		#Check if a manual IP is part of a VPN 
 		if ($nettype eq 'src_addr' || $nettype eq 'tgt_addr'){
 			#Check if IP is part of OpenVPN dynamic subnet
@@ -1543,44 +1577,9 @@ sub getcolor
 				return;
 			}
 		}
-		#standard networks
-		if ($val eq 'GREEN'){
-			$tdcolor="style='border: 1px solid $Header::colourgreen;'";
-			return;
-		}elsif ($val eq 'ORANGE'){
-			$tdcolor="style='border: 1px solid $Header::colourorange;'";
-			return;
-		}elsif ($val eq 'BLUE'){
-			$tdcolor="style='border: 1px solid $Header::colourblue;'";
-			return;
-		}elsif ($val eq 'RED'){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}elsif ($val eq 'IPFire' ){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}elsif($val =~ /^(.*?)\/(.*?)$/){
-			my ($sip,$scidr) = split ("/",$val);
-			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourorange;'";
-				return;
-			}
-			if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourgreen;'";
-				return;
-			}
-			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourblue;'";
-				return;
-			}
-		}elsif ($val eq 'Default IP'){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}else{
-			$tdcolor='';
-			return;
-		}
 	}
+	$tdcolor='';
+	return;
 }
 sub hint
 {
-- 
2.39.5