diff options
author | jim-p <jimp@pfsense.org> | 2011-02-10 10:25:32 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-02-10 10:58:16 -0500 |
commit | 93c2c1e620aa71b9ffd29deb0aeeda3028bb413a (patch) | |
tree | 848a91eaa9a982a4f054119f14f42e2514b3331f /usr | |
parent | 0fc6be3f54db706ccc7cce8b19b12f88dec171fa (diff) | |
download | pfsense-93c2c1e620aa71b9ffd29deb0aeeda3028bb413a.zip pfsense-93c2c1e620aa71b9ffd29deb0aeeda3028bb413a.tar.gz |
Generalize pppoe server enabled check and use it elsewhere in the GUI that needed fixed. Still needs changes in filter.inc - Ticket #1243
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/firewall_nat_1to1_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_out_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index b8956af..135dd99 100755 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -284,9 +284,8 @@ function typesel_change() { if(have_ruleint_access("pptp")) $interfaces['pptp'] = "PPTP VPN"; - if ($config['pppoe']['mode'] == "server") - if(have_ruleint_access("pppoe")) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) + $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 125a34f..b62e257 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -478,9 +478,8 @@ include("fbegin.inc"); ?> if(have_ruleint_access("pptp")) $interfaces['pptp'] = "PPTP VPN"; - if ($config['pppoe']['mode'] == "server") - if(have_ruleint_access("pppoe")) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) + $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index b730476..528af1f 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -410,9 +410,8 @@ function poolopts_change() { if(have_ruleint_access("pptp")) $interfaces['pptp'] = "PPTP VPN"; - if ($config['pppoe']['mode'] == "server") - if(have_ruleint_access("pppoe")) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) + $interfaces['pppoe'] = "PPPoE VPN"; /* add ipsec interfaces */ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 8933344..89d4ac8 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -683,9 +683,8 @@ include("head.inc"); if(have_ruleint_access("pptp")) $interfaces['pptp'] = "PPTP VPN"; - if ($config['pppoe']['mode'] == "server") - if(have_ruleint_access("pppoe")) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled() && 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")) |