From 144fbff2a146d9eb3921e763f6bcc7bde39bf5f9 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 14 Jun 2011 16:35:48 -0400
Subject: Show the OpenVPN instance description when listing interfaces to
 assign in the gui.

---
 usr/local/www/interfaces_assign.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'usr/local/www')

diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 714feb4..3e35b0e 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -143,6 +143,16 @@ if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) {
 	}
 }
 
+$ovpn_descrs = array();
+if (is_array($config['openvpn'])) {
+	if (is_array($config['openvpn']['openvpn-server']))
+		foreach ($config['openvpn']['openvpn-server'] as $s)
+			$ovpn_descrs[$s['vpnid']] = $s['description'];
+	if (is_array($config['openvpn']['openvpn-client']))
+		foreach ($config['openvpn']['openvpn-client'] as $c)
+			$ovpn_descrs[$c['vpnid']] = $c['description'];
+}
+
 if ($_POST['apply']) {
 	if (file_exists("/var/run/interface_mismatch_reboot_needed"))
 		system_reboot();
@@ -452,6 +462,8 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 					echo htmlspecialchars($descr);
 				} elseif ($portinfo['isqinq']) {
 					echo htmlspecialchars($portinfo['descr']);
+				} elseif (substr($portname, 0, 4) == 'ovpn') {
+					echo htmlspecialchars($portname . " (" . $ovpn_descrs[substr($portname, 5, 1)] . ")");
 				} else
 					echo htmlspecialchars($portname . " (" . $portinfo['mac'] . ")");
 			?></option>
-- 
cgit v1.1