diff options
| author | Warren Baker <warren@decoy.co.za> | 2012-05-25 12:11:43 +0200 |
|---|---|---|
| committer | Warren Baker <warren@decoy.co.za> | 2012-05-25 12:11:43 +0200 |
| commit | ac10faad42081ccfe48a37aa9814bc4684ffb701 (patch) | |
| tree | efa4230307975e85c1fc7936213093425a89160a /usr/local/captiveportal | |
| parent | 1b9aff455311a1b1ba820f4732b029eb4a4efec1 (diff) | |
| download | pfsense-ac10faad42081ccfe48a37aa9814bc4684ffb701.zip pfsense-ac10faad42081ccfe48a37aa9814bc4684ffb701.tar.gz | |
Ensure there is a '.' between hostname and domain. Partially fixes #2454
Diffstat (limited to 'usr/local/captiveportal')
| -rwxr-xr-x | usr/local/captiveportal/index.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php index 1fecf26..1a0affc 100755 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -63,13 +63,13 @@ $listenporthttps = $cpcfg['listenporthttps'] ? $cpcfg['listenporthttps'] : ($cpc $listenporthttp = $cpcfg['listenporthttp'] ? $cpcfg['listenporthttp'] : $cpcfg['zoneid']; if (isset($config['captiveportal'][$cpzone]['httpslogin'])) - $ourhostname = $config['captiveportal'][$cpzone]['httpsname'] . ":" . $listenporthttps; + $ourhostname = $config['captiveportal'][$cpzone]['httpsname'] . ":" . $listenporthttps; else { - $ifip = portal_ip_from_client_ip($clientip); - if (!$ifip) - $ourhostname = $config['system']['hostname'] . $config['system']['domain'] . ":{$listenporthttp}"; - else - $ourhostname = "{$ifip}:{$listenporthttp}"; + $ifip = portal_ip_from_client_ip($clientip); + if (!$ifip) + $ourhostname = "{$config['system']['hostname']}.{$config['system']['domain']}:{$listenporthttp}"; + else + $ourhostname = "{$ifip}:{$listenporthttp}"; } if ($orig_host != $ourhostname) { |
