diff options
author | Seth Mos <seth.mos@dds.nl> | 2011-02-11 09:13:00 +0100 |
---|---|---|
committer | Seth Mos <seth.mos@dds.nl> | 2011-02-11 09:13:00 +0100 |
commit | 1d564143770e22559ca137fa298105300953699a (patch) | |
tree | 3826cdd9c3da95bbba14105ddc714549ced9ec39 /usr/local/www | |
parent | 07dfd12159413d2bcb91c5e17952284e9b128ab7 (diff) | |
parent | 554d3bc22d54076a437bc9e71bcfd8036ebe7d38 (diff) | |
download | pfsense-1d564143770e22559ca137fa298105300953699a.zip pfsense-1d564143770e22559ca137fa298105300953699a.tar.gz |
Merge remote branch 'upstream/master'
Diffstat (limited to 'usr/local/www')
-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.php | 34 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_out_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 5 |
5 files changed, 26 insertions, 28 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.php b/usr/local/www/firewall_nat_out.php index ae901d3..3e2c402 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -145,22 +145,24 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") { } } /* PPPoE subnet */ - if($config['pppoe']['mode'] == "server") { - if (is_ipaddr($config['pppoe']['localip'])) { - if($config['pppoe']['pppoe_subnet'] <> "") - $ossubnet = $config['pppoe']['pppoe_subnet']; - else - $ossubnet = "32"; - $osn = gen_subnet($config['pppoe']['localip'], $ossubnet); - $natent = array(); - $natent['source']['network'] = "{$osn}/{$ossubnet}"; - $natent['sourceport'] = ""; - $natent['descr'] = gettext("Auto created rule for PPPoE server"); - $natent['target'] = ""; - $natent['interface'] = $if2; - $natent['destination']['any'] = true; - $natent['natport'] = ""; - $a_out[] = $natent; + if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) { + foreach ($config['pppoes']['pppoe'] as $pppoes) { + if (($pppoes['mode'] == "server") && is_ipaddr($pppoes['localip'])) { + if($pppoes['pppoe_subnet'] <> "") + $ossubnet = $pppoes['pppoe_subnet']; + else + $ossubnet = "32"; + $osn = gen_subnet($pppoes['localip'], $ossubnet); + $natent = array(); + $natent['source']['network'] = "{$osn}/{$ossubnet}"; + $natent['sourceport'] = ""; + $natent['descr'] = gettext("Auto created rule for PPPoE server"); + $natent['target'] = ""; + $natent['interface'] = $if2; + $natent['destination']['any'] = true; + $natent['natport'] = ""; + $a_out[] = $natent; + } } } /* L2TP subnet */ 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 a6809f2..38f256e 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -690,9 +690,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")) |