summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-01-08 15:34:11 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-01-08 15:34:11 -0200
commit7807664def0a95554b4a5207638c6b447fc71b4a (patch)
treed7c93197bd0494e0d8c4be0f144d406a4f6ea7d5 /usr
parentd9ce908f28c849b5cfffea5f1512bdd486c27d79 (diff)
downloadpfsense-7807664def0a95554b4a5207638c6b447fc71b4a.zip
pfsense-7807664def0a95554b4a5207638c6b447fc71b4a.tar.gz
List VLAN interfaces on Interfaces -> (assign) -> PPPs edit. It should fix #1767
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/interfaces_ppps_edit.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index 7bcdcf2..2d8e52d 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -58,6 +58,12 @@ $iflist = get_configured_interface_with_descr();
$portlist = get_interface_list();
$portlist = array_merge($portlist, $iflist);
+if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
+ foreach ($config['vlans']['vlan'] as $vlan) {
+ $portlist[$vlan['vlanif']] = $vlan;
+ }
+}
+
$id = $_GET['id'];
if (isset($_POST['id']))
$id = $_POST['id'];
OpenPOWER on IntegriCloud