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_mac.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_mac.php')
| -rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index be4edae..69bd76f 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -48,7 +48,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; } @@ -108,11 +108,10 @@ if ($_POST) { $pipeno = captiveportal_get_dn_passthru_ruleno($_POST['delmac']); if ($pipeno) captiveportal_free_dn_ruleno($pipeno); - captiveportal_ipfw_set_context($cpzone); if (!empty($pipeno)) - mwexec("/sbin/ipfw -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno . "; /sbin/ipfw -q pipe delete {$pipeno}; /sbin/ipfw -q pipe delete " . (++$pipeno)); + mwexec("/sbin/ipfw -x {$cpzone} -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno . "; /sbin/ipfw -q pipe delete {$pipeno}; /sbin/ipfw -q pipe delete " . (++$pipeno)); else - mwexec("/sbin/ipfw -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno); + mwexec("/sbin/ipfw -x {$cpzone} -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno); } unset($a_passthrumacs[$idx]); write_config(); @@ -133,11 +132,10 @@ if ($_GET['act'] == "del") { $pipeno = captiveportal_get_dn_passthru_ruleno($a_passthrumacs[$_GET['id']]['mac']); if ($pipeno) captiveportal_free_dn_ruleno($pipeno); - captiveportal_ipfw_set_context($cpzone); if (!empty($pipeno)) - mwexec("/sbin/ipfw -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno . "; /sbin/ipfw -q pipe delete {$pipeno}; /sbin/ipfw -q pipe delete " . (++$pipeno)); + mwexec("/sbin/ipfw -x {$cpzone} -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno . "; /sbin/ipfw -q pipe delete {$pipeno}; /sbin/ipfw -q pipe delete " . (++$pipeno)); else - mwexec("/sbin/ipfw -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno); + mwexec("/sbin/ipfw -x {$cpzone} -q delete {$ruleno}; /sbin/ipfw -q delete " . ++$ruleno); } unset($a_passthrumacs[$_GET['id']]); write_config(); |
