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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2664 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  b7265a986650019e19f37ffe729062005a4a6ea6 (commit)
       via  1be052f99558509e6cd808290ee77b63524ff938 (commit)
      from  4e631b66beccf0dd89c467c86a64025c2e9dbccc (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 b7265a986650019e19f37ffe729062005a4a6ea6
Merge: 1be052f 4e631b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue May 6 13:21:40 2014 +0200

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

commit 1be052f99558509e6cd808290ee77b63524ff938
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue May 6 12:40:05 2014 +0200

    Firewall: When using custom hosts and not having BLUE or ORANGE, the Ruletable took very long to display every Line
    
    With this commit the page is shown quickly because there's now a check
    if ORANGE or BLUE exist before we test if a host might be in that
    subnet.

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

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

Difference in files:
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 48e3a8d..cf94c8f 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1334,7 +1334,7 @@ sub getcolor
 			return;
 		}elsif($val =~ /^(.*?)\/(.*?)$/){
 			my ($sip,$scidr) = split ("/",$val);
-			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+			if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
 				$tdcolor="style='background-color: $Header::colourorange;color:white;'";
 				return;
 			}
@@ -1342,7 +1342,7 @@ sub getcolor
 				$tdcolor="style='background-color: $Header::colourgreen;color:white;'";
 				return;
 			}
-			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+			if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
 				$tdcolor="style='background-color: $Header::colourblue;color:white;'";
 				return;
 			}


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