diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-09-14 10:54:08 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-09-14 10:54:08 -0300 |
| commit | 81ce28d87039d21c8b03986362d9f2ccffe6d407 (patch) | |
| tree | 9b72f0fc3a08c742786060919f1b822016fe135c /usr/local/captiveportal | |
| parent | 01ba8ec63d4c99ed8fd1e3085c9fa960aa6d3a7b (diff) | |
| download | pfsense-81ce28d87039d21c8b03986362d9f2ccffe6d407.zip pfsense-81ce28d87039d21c8b03986362d9f2ccffe6d407.tar.gz | |
Remove unecessary blockedmacs db and read it directly from config
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 b7c708c..a97c33b 100755 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -105,9 +105,6 @@ if ($macfilter || $passthrumac) { unset($tmpres); } -/* Get blocked macs */ -$blockedmacs = array_flip(captiveportal_read_blockedmacs_db()); - /* find out if we need RADIUS + RADIUSMAC or not */ if (file_exists("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db")) { $radius_enable = TRUE; @@ -139,7 +136,7 @@ setTimeout('window.close();',5000) ; EOD; captiveportal_disconnect_client($_POST['logout_id']); -} else if ($macfilter && $clientmac && isset($blockedmacs[$clientmac])) { +} else if ($macfilter && $clientmac && captiveportal_blocked_mac($clientmac)) { captiveportal_logportalauth($clientmac,$clientmac,$clientip,"Blocked MAC address"); if (!empty($cpcfg['blockedmacsurl'])) portal_reply_page($cpcfg['blockedmacsurl'], "redir"); |
