diff options
| author | Ermal <eri@pfsense.org> | 2011-09-12 22:30:37 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-09-12 22:30:37 +0000 |
| commit | 55a14b686d8f35d03b87efdbddacb656a04f5bed (patch) | |
| tree | 432c31112d8df7ce634f3792dd037b725a6b71da | |
| parent | 75bb4bc3849cda6af49ee51cc495353dcb5ad489 (diff) | |
| download | pfsense-55a14b686d8f35d03b87efdbddacb656a04f5bed.zip pfsense-55a14b686d8f35d03b87efdbddacb656a04f5bed.tar.gz | |
Another try at prventing panic on reconfig of ppp type wans. Ticket #1696
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index 01d1e5c..5cb794b 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -420,19 +420,18 @@ } $type = $_POST['selectedtype']; - if (!is_array($config['ppps']['ppp'])) - $config['ppps']['ppp'] = array(); - if (count($config['ppps']['ppp'])) { - foreach ($config['ppps']['ppp'] as $pppid => $ppp) { - if ($ppp['ptpid'] == "0") { - if ((substr($config['interfaces']['wan']['if'],0,5) == "pppoe") || (substr($config['interfaces']['wan']['if'],0,4) == "pptp")) { - $oldif = explode(",", $ppp['ports']); - $config['interfaces']['wan']['if'] = $oldif[0]; - } - if ($type == "pppoe" || $type == "pptp") - unset($config['ppps']['ppp'][$pppid]); - } - } + $wanif = ""; + if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) { + foreach ($config['ppps']['ppp'] as $pppid => $ppp) { + if ($realif == $ppp['if']) { + $ifaces = explode(",", $ppp['ports']); + $wanif = $ifaces[0]; + } + } + } + if (!empty($wanif)) { + $config['interfaces']['wan']['if'] = $wanif; + unset($config['ppps']['ppp'][$pppid]); } if ($type == "pppoe" || $type == "pptp") { |
