From 3ef4f1dc3bc9f60d7a5687e2699eb4cb9a443e1f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 1 Jun 2016 10:50:12 +0200
Subject: [PATCH] (firewall_rules.php) use new pluggable interfaces and remove
 old custom hooks

---
 src/www/firewall_rules.php | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index f0d2afac7..89eb35083 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -262,35 +262,8 @@ $( document ).ready(function() {
            // create tabs per interface + floating
            $iflist_tabs = array();
            $iflist_tabs['FloatingRules'] = 'Floating';
-           if (isset($config['ifgroups']['ifgroupentry']))
-             foreach($config['ifgroups']['ifgroupentry'] as $ifgen)
-                 $iflist_tabs[$ifgen['ifname']] = $ifgen['ifname'];
-
-           foreach (get_configured_interface_with_descr() as $ifent => $ifdesc)
-               $iflist_tabs[$ifent] = $ifdesc;
-
-           if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
-               $iflist_tabs['l2tp'] = "L2TP VPN";
-
-           if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
-               $iflist_tabs['pptp'] = "PPTP VPN";
-
-           if (isset($config['pppoes']['pppoe'])) {
-             foreach ($config['pppoes']['pppoe'] as $pppoes) {
-               if (($pppoes['mode'] == 'server')) {
-                 $iflist_tabs['pppoe'] = "PPPoE Server";
-               }
-             }
-           }
-
-           /* add ipsec interfaces */
-           if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
-               $iflist_tabs['enc0'] = 'IPsec';
-           }
-
-           /* add openvpn/tun interfaces */
-           if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {
-             $iflist_tabs['openvpn'] = 'OpenVPN';
+           foreach (legacy_config_get_interfaces(array("enable" => true)) as $if => $ifdetail) {
+               $iflist_tabs[$if] = strtoupper($ifdetail['descr']);
            }
 
           $tab_array = array();