From 2f0caa43192a3d0221fa923b80b38e3ccf4f3d87 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sun, 20 Sep 2015 15:26:54 +0200 Subject: show openvpn interfaces while reassigning the interfaces for a restored config backup - RELENG_2_2 --- usr/local/www/interfaces_assign.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index afb8e9e..3d11ba3 100644 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -184,12 +184,20 @@ 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) + if (is_array($config['openvpn']['openvpn-server'])) { + foreach ($config['openvpn']['openvpn-server'] as $s) { + $portname = "ovpns{$s['vpnid']}"; + $portlist[$portname] = $s; $ovpn_descrs[$s['vpnid']] = $s['description']; - if (is_array($config['openvpn']['openvpn-client'])) - foreach ($config['openvpn']['openvpn-client'] as $c) + } + } + if (is_array($config['openvpn']['openvpn-client'])) { + foreach ($config['openvpn']['openvpn-client'] as $c) { + $portname = "ovpnc{$c['vpnid']}"; + $portlist[$portname] = $c; $ovpn_descrs[$c['vpnid']] = $c['description']; + } + } } if (isset($_POST['add_x']) && isset($_POST['if_add'])) { -- cgit v1.1