summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-03-28 20:00:06 -0500
committerChris Buechler <cmb@pfsense.org>2016-03-28 20:17:43 -0500
commita1ec93a67caddbf3bc4231c456e22c47153d0bf4 (patch)
treef043b71f6b1222d34f618fbc39e3eb3745679053 /src/etc
parentfbe6a2ce782a09a043c871215d0b8c4812fc7778 (diff)
downloadpfsense-a1ec93a67caddbf3bc4231c456e22c47153d0bf4.zip
pfsense-a1ec93a67caddbf3bc4231c456e22c47153d0bf4.tar.gz
Specify the zone in the PORTAL_ACTION URL. Ticket #6037
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/captiveportal.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 0f3d02a..0b620b1 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -1956,8 +1956,8 @@ function portal_reply_page($redirurl, $type = null, $message = null, $clientmac
/* substitute other variables */
$ourhostname = portal_hostname_from_client_ip($clientip);
$protocol = (isset($cpcfg['httpslogin'])) ? 'https://' : 'http://';
- $htmltext = str_replace("\$PORTAL_ACTION\$", "{$protocol}{$ourhostname}/", $htmltext);
- $htmltext = str_replace("#PORTAL_ACTION#", "{$protocol}{$ourhostname}/", $htmltext);
+ $htmltext = str_replace("\$PORTAL_ACTION\$", "{$protocol}{$ourhostname}/index.php?zone={$cpcfg['zone']}", $htmltext);
+ $htmltext = str_replace("#PORTAL_ACTION#", "{$protocol}{$ourhostname}/index.php?zone={$cpcfg['zone']}", $htmltext);
$htmltext = str_replace("\$PORTAL_ZONE\$", htmlspecialchars($cpzone), $htmltext);
$htmltext = str_replace("\$PORTAL_REDIRURL\$", htmlspecialchars($redirurl), $htmltext);
OpenPOWER on IntegriCloud