diff options
| author | Ermal <eri@pfsense.org> | 2014-02-24 14:38:14 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-02-24 14:38:14 +0000 |
| commit | 846bedf994079102c29cd140b41b2d1deb466a13 (patch) | |
| tree | 68aae75180c234d4cab26f20002481cb39e4b317 /etc | |
| parent | 8cee3e441e9df542c256fc7bd204a4eaf26a9450 (diff) | |
| download | pfsense-846bedf994079102c29cd140b41b2d1deb466a13.zip pfsense-846bedf994079102c29cd140b41b2d1deb466a13.tar.gz | |
Properly compile the query to insert the values. Pointy-hat: myself. While here respect the redirurl when passed to portal_allow and use proper function to do redirection.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index cad4903..982879c 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1955,7 +1955,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut $bpassword = base64_encode($password); $insertquery = "INSERT INTO captiveportal (allow_time, pipeno, ip, mac, username, sessionid, bpassword, session_timeout, idle_timeout, session_terminate_time, interim_interval, radiusctx) "; $insertquery .= "VALUES ({$allow_time}, {$pipeno}, '{$clientip}', '{$clientmac}', '{$safe_username}', '{$sessionid}', '{$bpassword}', "; - $insertquery .= "{$session_timeout}, {$idle_timeout}, {$session_terminate_time}, {$interim_interval}, {$radiusctx})"; + $insertquery .= "{$session_timeout}, {$idle_timeout}, {$session_terminate_time}, {$interim_interval}, '{$radiusctx}')"; /* store information to database */ captiveportal_write_db($insertquery); @@ -1977,10 +1977,10 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut /* redirect user to desired destination */ if (!empty($attributes['url_redirection'])) $my_redirurl = $attributes['url_redirection']; + else if (!empty($redirurl)) + $my_redirurl = $redirurl; else if (!empty($config['captiveportal'][$cpzone]['redirurl'])) $my_redirurl = $config['captiveportal'][$cpzone]['redirurl']; - else - $my_redirurl = $redirurl; if(isset($config['captiveportal'][$cpzone]['logoutwin_enable']) && !$passthrumac) { $ourhostname = portal_hostname_from_client_ip($clientip); @@ -1995,7 +1995,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut include("{$g['varetc_path']}/captiveportal-{$cpzone}-logout.html"); } else { - header("Location: " . $my_redirurl); + portal_reply_page($redirurl, "redir", "Just redirect the user."); } return $sessionid; |
