From: Steffen Klammer <steffen.klammer@staderschulen.de>
Date: Fri, 16 Oct 2020 08:08:52 +0000 (+0200)
Subject: modified proxy.cgi to make it possible that all subnets declared in "network access... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=badd010f86a816fa0c5eb951225bb9796b463ef2;p=people%2Fms%2Fipfire-2.x.git

modified proxy.cgi to make it possible that all subnets declared in "network access control" will be translated from cidr to subnet notation in proxy.pac

Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index fdf9bddaf1..a63e1c2dfb 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3004,7 +3004,8 @@ END
 					)
 				{
 					chomp $temp[1];
-					print FILE " ||\n     (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\"))";
+					my $tempmask = &Network::convert_prefix2netmask($temp[1]);
+					print FILE " ||\n     (isInNet(myIpAddress(), \"$temp[0]\", \"$tempmask\"))";
 				}
 			}