From: Dominik Hassler <hadfl.oss@gmail.com>
Date: Wed, 9 Jul 2014 21:53:37 +0000 (+0200)
Subject: - connections.cgi: static ip address pools colour
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7220d6e5a39c76c010b44a40408b6408987c9cb;p=people%2Fms%2Fipfire-2.x.git

- connections.cgi: static ip address pools colour
---

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index c7220f62d1..f1ed2125a2 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -238,6 +238,23 @@ if (-e "${General::swroot}/ovpn/settings") {
 	}
 }
 
+# Add OpenVPN net for custom OVPNs
+if (-e "${General::swroot}/ovpn/ccd.conf") {
+	open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");	
+	my @ovpnsub = <OVPNSUB>;
+	close(OVPNSUB);
+
+	foreach (@ovpnsub) {
+		my ($network, $mask) = split '/', (split ',', $_)[2];
+		
+		$mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
+
+		push(@network, $network);
+		push(@masklen, $mask);
+		push(@colour, ${Header::colourovpn});
+	}
+}
+
 open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);