From 88bcd1d262bf67e573e9234e6f5129d2d1a7b297 Mon Sep 17 00:00:00 2001 From: Scott Dale Date: Tue, 24 Jul 2007 02:33:09 +0000 Subject: show ipsec tab properly when mobile clients is enabled and no tunnel exists --- usr/local/www/firewall_rules.php | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'usr') diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index a150dc9..0bb4ad9 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -46,29 +46,19 @@ if ($_POST['if']) $iflist = array("lan" => "LAN", "wan" => "WAN"); +for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { + $iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; +} + if ($config['pptpd']['mode'] == "server") $iflist['pptp'] = "PPTP VPN"; if ($config['pppoe']['mode'] == "server") $iflist['pppoe'] = "PPPoE VPN"; -/* add ipsec filter gif interfaces */ -if (is_array($config['ipsec']['tunnel']) && isset($config['ipsec']['enable']) - or $config['ipsec']['mobileclients']) { - $a_ipsec = &$config['ipsec']['tunnel']; - if(is_array($a_ipsec)) { - $iflist["enc0"] = "IPsec"; - $i = 0; foreach ($a_ipsec as $ipsecent) { - if(isset($ipsecent['creategif'])) { - $iflist["gif{$i}"] = "{$ipsecent['descr']}"; - $i++; - } - } - } -} - -for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { - $iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; +/* add ipsec interfaces */ +if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])){ + $iflist["enc0"] = "IPSEC"; } if (!$if || !isset($iflist[$if])) -- cgit v1.1