diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2004-12-05 19:31:44 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2004-12-05 19:31:44 +0000 |
| commit | 07bd3f83b401d8e9e9de3938e0a26c6e452660af (patch) | |
| tree | 7f6913b347dc994dc57fa524f85a5436ff151f54 /usr/local/captiveportal | |
| parent | 2ed803e736d9256aafae7a29ae0bb84aaf746c5f (diff) | |
| download | pfsense-07bd3f83b401d8e9e9de3938e0a26c6e452660af.zip pfsense-07bd3f83b401d8e9e9de3938e0a26c6e452660af.tar.gz | |
Synchornize with m0n0wall 1.2b3. These files have not really been
modified too much so a straight copy works. 9 files remain to be
patched by hand.
Diffstat (limited to 'usr/local/captiveportal')
| -rwxr-xr-x | usr/local/captiveportal/index.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php index af1e1bc..497e506 100755 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -34,7 +34,6 @@ require("util.inc"); require("config.inc"); require("radius_authentication.inc") ; require("radius_accounting.inc") ; -require("portal_log.inc") ; header("Expires: 0"); header("Cache-Control: no-store, no-cache, must-revalidate"); @@ -74,7 +73,6 @@ if ($clientmac && portal_mac_fixed($clientmac)) { $radiusservers[0]['port'], $radiusservers[0]['key']); if ($auth_val == 2) { - captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,TRUE); $sessionid = portal_allow($clientip, $clientmac, $_POST['auth_user']); if (isset($config['captiveportal']['radacct_enable']) && isset($radiusservers[0])) { $auth_val = RADIUS_ACCOUNTING_START($_POST['auth_user'], @@ -84,7 +82,6 @@ if ($clientmac && portal_mac_fixed($clientmac)) { $radiusservers[0]['key']); } } else { - captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,FALSE); readfile("{$g['varetc_path']}/captiveportal-error.html"); } } else { @@ -122,7 +119,7 @@ EOD; if (isset($config['captiveportal']['httpslogin'])) $htmltext = str_replace("\$PORTAL_ACTION\$", "https://{$config['captiveportal']['httpsname']}:8001/", $htmltext); else - $htmltext = str_replace("\$PORTAL_ACTION\$", "", $htmltext); + $htmltext = str_replace("\$PORTAL_ACTION\$", "http://{$config['interfaces'][$config['captiveportal']['interface']]['ipaddr']}:8000/", $htmltext); if (preg_match("/redirurl=(.*)/", $orig_request, $matches)) $redirurl = urldecode($matches[1]); |
