Merge remote branch 'mainline/master' into 2_firewall

1 files changed, 26 insertions, 1 deletions

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 312af25..4cafc89 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -318,7 +318,32 @@ function sourcesel_change() {
                   <td width="78%" class="vtable">
 			<select name="interface" class="formselect">
 				<?php
-				$interfaces = get_configured_interface_with_descr(false, true);
+				$iflist = get_configured_interface_with_descr(false, true);
+				foreach ($iflist as $if => $ifdesc)
+					if(have_ruleint_access($if))
+						$interfaces[$if] = $ifdesc;
+
+				if ($config['l2tp']['mode'] == "server")
+					if(have_ruleint_access("l2tp"))
+						$interfaces['l2tp'] = "L2TP VPN";
+
+				if ($config['pptpd']['mode'] == "server")
+					if(have_ruleint_access("pptp"))
+						$interfaces['pptp'] = "PPTP VPN";
+
+				if ($config['pppoe']['mode'] == "server")
+					if(have_ruleint_access("pppoe"))
+						$interfaces['pppoe'] = "PPPoE VPN";
+
+				/* add ipsec interfaces */
+				if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+					if(have_ruleint_access("enc0"))
+						$interfaces["enc0"] = "IPsec";
+
+				/* add openvpn/tun interfaces */
+				if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"])
+					$interfaces["openvpn"] = "OpenVPN";
+
 				foreach ($interfaces as $iface => $ifacename): ?>
 				<option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>>
 				<?=htmlspecialchars($ifacename);?>