summaryrefslogtreecommitdiffstats
path: root/usr/local/captiveportal
diff options
context:
space:
mode:
authorDarren Embry <dse@webonastick.com>2012-05-03 12:34:12 -0400
committerDarren Embry <dse@webonastick.com>2012-05-03 12:34:12 -0400
commit470d24a39d8a4cdaf7a85aeb71d7a7d802d76879 (patch)
treeae9f13c5b357e28b7de1cb89e6fcb8edc38d2c7b /usr/local/captiveportal
parent6b2d4b5a05c347f2c56a815c4ae7f4053b082597 (diff)
downloadpfsense-470d24a39d8a4cdaf7a85aeb71d7a7d802d76879.zip
pfsense-470d24a39d8a4cdaf7a85aeb71d7a7d802d76879.tar.gz
implement #2407: create config option for captive portal listening port
Diffstat (limited to 'usr/local/captiveportal')
-rwxr-xr-xusr/local/captiveportal/index.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 3048b67..82514d8 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -59,14 +59,17 @@ if (!$clientip) {
exit;
}
+$listenporthttps = $cpcfg['listenporthttps'] ? $cpcfg['listenporthttps'] : ($cpcfg['zoneid'] + 1);
+$listenporthttp = $cpcfg['listenporthttp'] ? $cpcfg['listenporthttp'] : $cpcfg['zoneid'];
+
if (isset($config['captiveportal'][$cpzone]['httpslogin']))
- $ourhostname = $config['captiveportal'][$cpzone]['httpsname'] . ":" . ($cpcfg['zoneid'] + 1);
+ $ourhostname = $config['captiveportal'][$cpzone]['httpsname'] . ":" . $listenporthttps;
else {
$ifip = portal_ip_from_client_ip($clientip);
if (!$ifip)
- $ourhostname = $config['system']['hostname'] . $config['system']['domain'] . ":{$cpcfg['zoneid']}";
+ $ourhostname = $config['system']['hostname'] . $config['system']['domain'] . ":{$listenporthttp}";
else
- $ourhostname = "{$ifip}:{$cpcfg['zoneid']}";
+ $ourhostname = "{$ifip}:{$listenporthttp}";
}
if ($orig_host != $ourhostname) {
OpenPOWER on IntegriCloud