From 1dabd53dce2c5ac62767fca48994b9c4a23cc8ef Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 10 Mar 2017 09:06:37 +0100
Subject: [PATCH] (plugins, interfaces) add ifgroup type, filter in
 interfaces_groups_edit.php. for https://github.com/opnsense/core/issues/1455

---
 src/etc/inc/plugins.inc.d/if_group.inc   | 1 +
 src/etc/inc/plugins.inc.d/if_openvpn.inc | 2 +-
 src/www/interfaces_groups_edit.php       | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/if_group.inc b/src/etc/inc/plugins.inc.d/if_group.inc
index c1b777854..133f92a0c 100644
--- a/src/etc/inc/plugins.inc.d/if_group.inc
+++ b/src/etc/inc/plugins.inc.d/if_group.inc
@@ -40,6 +40,7 @@ function if_group_interfaces()
             $oc['if'] = $ifgen['ifname'];
             $oc['descr'] = $ifgen['ifname'];
             $oc['virtual'] = true;
+            $oc['type'] = 'ifgroup';
             $interfaces[$ifgen['ifname']] = $oc;
         }
     }
diff --git a/src/etc/inc/plugins.inc.d/if_openvpn.inc b/src/etc/inc/plugins.inc.d/if_openvpn.inc
index 0b990bc54..fdc16b2d7 100644
--- a/src/etc/inc/plugins.inc.d/if_openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/if_openvpn.inc
@@ -79,7 +79,7 @@ function if_openvpn_interfaces()
                     $oic = array('enable' => true);
                     $oic['if'] = 'openvpn';
                     $oic['descr'] = 'OpenVPN';
-                    $oic['type'] = 'none';
+                    $oic['type'] = 'ifgroup';
                     $oic['virtual'] = true;
                     $oic['networks'] = array();
                     $interfaces['openvpn'] = $oic;
diff --git a/src/www/interfaces_groups_edit.php b/src/www/interfaces_groups_edit.php
index 6d30b6b90..56fa030d5 100644
--- a/src/www/interfaces_groups_edit.php
+++ b/src/www/interfaces_groups_edit.php
@@ -183,7 +183,11 @@ legacy_html_escape_form_data($pconfig);
                     <td>
                         <select name="members[]" multiple="multiple" class="selectpicker" data-size="5" data-live-search="true">
 <?php
-                        foreach (legacy_config_get_interfaces(array("enable" => true)) as $ifn => $ifdetail):?>
+                        foreach (legacy_config_get_interfaces(array("enable" => true)) as $ifn => $ifdetail):
+                          if (!empty($ifdetail['type']) && $ifdetail['type'] == 'ifgroup') {
+                              continue;
+                          }
+                          ?>
                             <option value="<?=$ifn;?>" <?=in_array($ifn, $pconfig['members']) ? "selected=\"selected\"" : "";?>>
                                 <?=strtoupper($ifdetail['descr']);?>
                             </option>