From 73b1d444ee513a5ac676a2fdb8bb79622a89c81f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 10 Mar 2017 09:19:53 +0100
Subject: [PATCH] interfaces: small simplification for #1455

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

diff --git a/src/etc/inc/plugins.inc.d/if_group.inc b/src/etc/inc/plugins.inc.d/if_group.inc
index 133f92a0c..5e8ec2d1b 100644
--- a/src/etc/inc/plugins.inc.d/if_group.inc
+++ b/src/etc/inc/plugins.inc.d/if_group.inc
@@ -40,7 +40,7 @@ function if_group_interfaces()
             $oc['if'] = $ifgen['ifname'];
             $oc['descr'] = $ifgen['ifname'];
             $oc['virtual'] = true;
-            $oc['type'] = 'ifgroup';
+            $oc['type'] = 'group';
             $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 fdc16b2d7..3119b1b00 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'] = 'ifgroup';
+                    $oic['type'] = 'group';
                     $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 56fa030d5..c5e085998 100644
--- a/src/www/interfaces_groups_edit.php
+++ b/src/www/interfaces_groups_edit.php
@@ -184,7 +184,7 @@ legacy_html_escape_form_data($pconfig);
                         <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):
-                          if (!empty($ifdetail['type']) && $ifdetail['type'] == 'ifgroup') {
+                          if (!empty($ifdetail['type']) && $ifdetail['type'] == 'group') {
                               continue;
                           }
                           ?>