From: Alexander Marx <amarx@ipfire.org>
Date: Tue, 30 Jul 2013 10:32:25 +0000 (+0200)
Subject: Forward Firewall: changed rule coloring. Now whole field is colored instead of just... 
X-Git-Tag: v2.15-beta1~286^2~11^2~6
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=43215686ce938ebacf037d14edba46817cf470c2

Forward Firewall: changed rule coloring. Now whole field is colored instead of just borders. Back Button in firewall groups /hostgroups showed a white site
---

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index cda2b8c51a..427d4a1319 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -64,7 +64,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.12';
+my $VERSION='0.9.9.13';
 my $color;
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
@@ -1250,36 +1250,36 @@ sub getcolor
 	if($optionsfw{'SHOWCOLORS'} eq 'on'){
 		#standard networks
 		if ($val eq 'GREEN'){
-			$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+			$tdcolor="style='background-color: $Header::colourgreen;color:white;'";
 			return;
 		}elsif ($val eq 'ORANGE'){
-			$tdcolor="style='border: 1px solid $Header::colourorange;'";
+			$tdcolor="style='background-color:  $Header::colourorange;color:white;'";
 			return;
 		}elsif ($val eq 'BLUE'){
-			$tdcolor="style='border: 1px solid $Header::colourblue;'";
+			$tdcolor="style='background-color: $Header::colourblue;color:white;'";
 			return;
 		}elsif ($val eq 'RED' ||$val eq 'RED1' ){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			$tdcolor="style='background-color: $Header::colourred;color:white;'";
 			return;
 		}elsif ($val eq 'IPFire' ){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			$tdcolor="style='background-color: $Header::colourred;color:white;'";
 			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;'";
+				$tdcolor="style='background-color: $Header::colourorange;color:white;'";
 				return;
 			}
 			if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+				$tdcolor="style='background-color: $Header::colourgreen;color:white;'";
 				return;
 			}
 			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourblue;'";
+				$tdcolor="style='background-color: $Header::colourblue;color:white;'";
 				return;
 			}
 		}elsif ($val eq 'Default IP'){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			$tdcolor="style='background-color: $Header::colourred;color:white;'";
 			return;
 		}
 		#Check if a manual IP is part of a VPN 
@@ -1288,7 +1288,7 @@ sub getcolor
 			my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'});
 			my ($c,$d) = split("/",$val);
 			if (&General::IpInSubnet($c,$a,$b)){
-				$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+				$tdcolor="style='background-color: $Header::colourovpn;color:white;'";
 				return;
 			}
 			#Check if IP is part of OpenVPN static subnet
@@ -1296,7 +1296,7 @@ sub getcolor
 				my ($a,$b) = split("/",$ccdnet{$key}[1]);
 				$b =&General::iporsubtodec($b);
 				if (&General::IpInSubnet($c,$a,$b)){
-					$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+					$tdcolor="style='background-color: $Header::colourovpn;color:white;'";
 					return;
 				}
 			}
@@ -1305,7 +1305,7 @@ sub getcolor
 				if ($ccdhost{$key}[3] eq 'net'){
 					my ($a,$b) = split("/",$ccdhost{$key}[11]);
 					if (&General::IpInSubnet($c,$a,$b)){
-						$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+						$tdcolor="style='background-color: $Header::colourovpn;color:white;'";
 						return;
 					}
 				}
@@ -1315,7 +1315,7 @@ sub getcolor
 				my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
 				$b=&General::iporsubtodec($b);
 				if (&General::IpInSubnet($c,$a,$b)){
-					$tdcolor="style='border: 1px solid $Header::colourvpn;'";
+					$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
 					return;
 				}
 			}
@@ -1323,18 +1323,18 @@ sub getcolor
 			foreach my $key (sort keys %ipsecconf){
 				my ($a,$b) = split("/",$ipsecconf{$key}[11]);
 				if (&General::IpInSubnet($c,$a,$b)){
-					$tdcolor="style='border: 1px solid $Header::colourvpn;'";
+					$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
 					return;
 				}
 			}
 		}
 		#VPN networks
 		if ($nettype eq 'ovpn_n2n_src' || $nettype eq 'ovpn_n2n_tgt' || $nettype eq 'ovpn_net_src' || $nettype eq 'ovpn_net_tgt'|| $nettype eq 'ovpn_host_src' || $nettype eq 'ovpn_host_tgt'){
-			$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+			$tdcolor="style='background-color: $Header::colourovpn;color:white;'";
 			return;
 		}
 		if ($nettype eq 'ipsec_net_src' || $nettype eq 'ipsec_net_tgt'){
-			$tdcolor="style='border: 1px solid $Header::colourvpn;'";
+			$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
 			return;
 		}
 		#custom Hosts
@@ -1349,7 +1349,7 @@ sub getcolor
 		foreach my $alias (sort keys %aliases)
 		{
 			if ($val eq $alias){
-				$tdcolor="style='border: 1px solid $Header::colourred;'";
+				$tdcolor="style='background-color:$Header::colourred;color:white;'";
 				return;
 			}
 		}
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index d7a519a379..065d19541f 100755
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -846,6 +846,12 @@ if ($fwhostsettings{'ACTION'} eq 'resethost')
 	$fwhostsettings{'type'} 	="";
 	&showmenu;
 }
+if ($fwhostsettings{'ACTION'} eq 'resetgrp')
+{
+	$fwhostsettings{'grp_name'} ="";
+	$fwhostsettings{'remark'} 	="";
+	&showmenu;
+}
 # delete
 if ($fwhostsettings{'ACTION'} eq 'delnet')
 {
@@ -1261,7 +1267,7 @@ END
 			print"<br><br><b>$Lang::tr{'fwhost attention'}:</b><br>	$Lang::tr{'fwhost macwarn'}<br><hr>";
 		}
 		print"<table border='0' width='100%'>";
-		print"<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='reset'></form></td></table>";
+		print"<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
 	&Header::closebox();
 }
 sub addservice