diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-06-02 07:21:30 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-06-02 07:21:30 +0545 |
| commit | 42a556911dd1be232ab5bb0edddc9b7dd2bde86b (patch) | |
| tree | b8ef6e4c4d8ff966adcd599af6adac9d7e5f8bd5 /usr/local/www/wizards | |
| parent | b4576c903af27013ce79a64511a2059942a5b471 (diff) | |
| download | pfsense-42a556911dd1be232ab5bb0edddc9b7dd2bde86b.zip pfsense-42a556911dd1be232ab5bb0edddc9b7dd2bde86b.tar.gz | |
Supply current WAN gateway name to wizard
As the name of the WAN gateway is not always WANGW.
Should fix redmine #4713
Diffstat (limited to 'usr/local/www/wizards')
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index 95582fd..da6c6d4 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -410,9 +410,14 @@ </fields> <stepbeforeformdisplay> <![CDATA[ + if (empty($config['interfaces']['wan']['gateway'])) { + $wangw_name = "WANGW"; + } else { + $wangw_name = $config['interfaces']['wan']['gateway']; + } if (is_array($config['gateways']['gateway_item'])) foreach ($config['gateways']['gateway_item'] as $gw) - if ($gw['name'] == 'WANGW' || (!empty($config['wizardtemp']['wangateway']) && $gw['gateway'] == $config['wizardtemp']['wangateway'])) + if ($gw['name'] == $wangw_name || (!empty($config['wizardtemp']['wangateway']) && $gw['gateway'] == $config['wizardtemp']['wangateway'])) $config['wizardtemp']['wangateway'] = $gw['gateway']; ]]> </stepbeforeformdisplay> |
