mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make this check more general in case someone makes a wizard that changes an opt interface's IP address and wants to use the "Reload in progress" step. Ticket #455

Browse Source
This commit is contained in:
Erik Fonnesbeck 2010-11-17 20:00:05 -07:00
parent 9c37f8cdc5
commit 6898927f4f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr/local/www/wizard.php
View File

@ -921,10 +921,14 @@ function fixup_string($string) {
$urlhost = $_SERVER['HTTP_HOST'];
// If finishing the setup wizard, check if accessing on a LAN or WAN address that changed
if($title == "Reload in progress") {
if ($urlhost == get_interface_ip("lan") && is_ipaddr($config['interfaces']['lan']['ipaddr']))
$urlhost = $config['interfaces']['lan']['ipaddr'];
else if ($urlhost == get_interface_ip() && is_ipaddr($config['interfaces']['wan']['ipaddr']))
$urlhost = $config['interfaces']['wan']['ipaddr'];
if (is_ipaddr($urlhost)) {
$host_if = find_ip_interface($urlhost);
if ($host_if) {
$host_if = convert_real_interface_to_friendly_interface_name($host_if);
if ($host_if && is_ipaddr($config['interfaces'][$host_if]['ipaddr']))
$urlhost = $config['interfaces'][$host_if]['ipaddr'];
}
}
}
if($urlhost != $_SERVER['HTTP_HOST'])
file_put_contents("{$g['tmp_path']}/setupwizard_lastreferrer", $proto . "://" . $_SERVER['HTTP_HOST'] . $urlport . $_SERVER['REQUEST_URI']);