From 5eee375564b95e184b15c90ec0680d57172e496e Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 9 Sep 2013 09:43:58 -0300 Subject: Make captiveportal_passthrumac_delete_entry() return rules instead of execute them as other similar functions do --- etc/inc/captiveportal.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'etc') diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index da55c89..d76f5a0 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -959,31 +959,29 @@ function captiveportal_passthrumac_configure_entry($macent) { } function captiveportal_passthrumac_delete_entry($macent) { - global $cpzone; + $rules = ""; $ruleno = captiveportal_get_ipfw_passthru_ruleno($macent['mac']); if (!$ruleno) - return false; + return $rules; - $cmd = "/sbin/ipfw -x {$cpzone} delete {$ruleno}"; + $rules .= "delete {$ruleno}\n"; captiveportal_free_ipfw_ruleno($ruleno, ($macent['action'] == 'block')); if ($macent['action'] == 'pass') { - $cmd .= "; /sbin/ipfw -x {$cpzone} delete " . ++$ruleno; + $rules .= "delete " . ++$ruleno . "\n"; $pipeno = captiveportal_get_dn_passthru_ruleno($macent['mac']); if (!empty($pipeno)) { captiveportal_free_dn_ruleno($pipeno); - $cmd .= "; /sbin/ipfw -x {$cpzone} pipe delete " . $pipeno; - $cmd .= "; /sbin/ipfw -x {$cpzone} pipe delete " . ++$pipeno; + $rules .= "pipe delete " . $pipeno . "\n"; + $rules .= "pipe delete " . ++$pipeno . "\n"; } } - mwexec($cmd); - - return true; + return $rules; } function captiveportal_passthrumac_configure($lock = false) { -- cgit v1.1