[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7fa1b16e5d84108da9b218a28cb224961e523d35

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7fa1b16e5d84108da9b218a28cb224961e523d35

[git]

[-- Attachment #1: Type: text/plain, Size: 2099 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  7fa1b16e5d84108da9b218a28cb224961e523d35 (commit)
      from  f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7fa1b16e5d84108da9b218a28cb224961e523d35
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed May 7 12:09:28 2014 +0200

    Firewall: Fix slow generation of host table in firewall groups

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/fwhosts.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index c5e1c28..eeb83ac 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1632,7 +1632,7 @@ sub getcolor
 		}
 
 		#Now check if IP is part of ORANGE,BLUE or GREEN
-		if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+		if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
 			$tdcolor="<font style='color: $Header::colourorange;'>$c</font>";
 			return $tdcolor;
 		}
@@ -1640,7 +1640,7 @@ sub getcolor
 			$tdcolor="<font style='color: $Header::colourgreen;'>$c</font>";
 			return $tdcolor;
 		}
-		if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+		if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
 			$tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
 			return $tdcolor;
 		}


hooks/post-receive
--
IPFire 2.x development tree