diff options
author | Ermal <eri@pfsense.org> | 2013-01-23 16:24:17 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-01-23 16:24:17 +0000 |
commit | 287f7e26199a323f0f4cd08f9e0a94073b7d5112 (patch) | |
tree | b7673e61252a842ab7a589dea9b0ae53ac85e538 /usr/local/www/services_captiveportal_ip_edit.php | |
parent | fa7b825f901c24d6de91ce980a651eddb5f15abb (diff) | |
download | pfsense-287f7e26199a323f0f4cd08f9e0a94073b7d5112.zip pfsense-287f7e26199a323f0f4cd08f9e0a94073b7d5112.tar.gz |
Convert all captiveportal code to not use ipfw_set_context since its not needed anymore. Also add code to validate cpzone on webgui pages before being used
Diffstat (limited to 'usr/local/www/services_captiveportal_ip_edit.php')
-rwxr-xr-x | usr/local/www/services_captiveportal_ip_edit.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 0130e35..fa2f1ff 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -64,7 +64,7 @@ $cpzone = $_GET['zone']; if (isset($_POST['zone'])) $cpzone = $_POST['zone']; -if (empty($cpzone)) { +if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) { header("Location: services_captiveportal_zones.php"); exit; } @@ -145,7 +145,6 @@ if ($_POST) { write_config(); if (isset($a_cp[$cpzone]['enable']) && is_module_loaded("ipfw.ko")) { - captiveportal_ipfw_set_context($cpzone); if (is_ipaddr($oldip)) { if (!empty($oldmask)) $ipfw = pfSense_ipfw_getTablestats($cpzone, 3, $oldip, $oldmask); @@ -162,8 +161,7 @@ if ($_POST) { $rules .= captiveportal_allowedip_configure_entry($ip); $uniqid = uniqid("{$cpzone}_allowed"); @file_put_contents("{$g['tmp_path']}/{$uniqid}_tmp", $rules); - captiveportal_ipfw_set_context($cpzone); - mwexec("/sbin/ipfw -q {$g['tmp_path']}/{$uniqid}_tmp"); + mwexec("/sbin/ipfw -x {$cpzone} -q {$g['tmp_path']}/{$uniqid}_tmp"); @unlink("{$g['tmp_path']}/{$uniqid}_tmp"); } |