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

Ensure there is a '.' between hostname and domain. Partially fixes #2454

Browse Source
This commit is contained in:
Warren Baker 2012-05-25 12:11:43 +02:00
parent 1b9aff4553
commit ac10faad42
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr/local/captiveportal/index.php
View File

@ -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) {