diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-09-09 09:43:58 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-09-12 08:44:51 -0300 |
| commit | 5eee375564b95e184b15c90ec0680d57172e496e (patch) | |
| tree | b5ce2f7a3073763aeaca0f3df24f563fda5fb612 /usr/local | |
| parent | 736c36c6745bb7823c061d06f58ae1169ef6649e (diff) | |
| download | pfsense-5eee375564b95e184b15c90ec0680d57172e496e.zip pfsense-5eee375564b95e184b15c90ec0680d57172e496e.tar.gz | |
Make captiveportal_passthrumac_delete_entry() return rules instead of execute them as other similar functions do
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 12 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_mac_edit.php | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index 08e62d5..68084a6 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -102,7 +102,11 @@ if ($_POST) { } } if ($found == true) { - captiveportal_passthrumac_delete_entry($a_passthrumacs[$idx]); + $rules = captiveportal_passthrumac_delete_entry($a_passthrumacs[$idx]); + $uniqid = uniqid("{$cpzone}_mac"); + file_put_contents("{$g['tmp_path']}/{$uniqid}_tmp", $rules); + mwexec("/sbin/ipfw -x {$cpzone} -q {$g['tmp_path']}/{$uniqid}_tmp"); + @unlink("{$g['tmp_path']}/{$uniqid}_tmp"); unset($a_passthrumacs[$idx]); write_config(); echo gettext("The entry was sucessfully deleted") . "\n"; @@ -116,7 +120,11 @@ if ($_POST) { if ($_GET['act'] == "del") { $a_passthrumacs =& $a_cp[$cpzone]['passthrumac']; if ($a_passthrumacs[$_GET['id']]) { - captiveportal_passthrumac_delete_entry($a_passthrumacs[$_GET['id']]); + $rules = captiveportal_passthrumac_delete_entry($a_passthrumacs[$_GET['id']]); + $uniqid = uniqid("{$cpzone}_mac"); + file_put_contents("{$g['tmp_path']}/{$uniqid}_tmp", $rules); + mwexec("/sbin/ipfw -x {$cpzone} -q {$g['tmp_path']}/{$uniqid}_tmp"); + @unlink("{$g['tmp_path']}/{$uniqid}_tmp"); unset($a_passthrumacs[$_GET['id']]); write_config(); header("Location: services_captiveportal_mac.php?zone={$cpzone}"); diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index b4c1ec8..095e36d 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -142,8 +142,8 @@ if ($_POST) { write_config(); if (isset($config['captiveportal'][$cpzone]['enable'])) { - captiveportal_passthrumac_delete_entry($mac); - $rules = captiveportal_passthrumac_configure_entry($mac); + $rules = captiveportal_passthrumac_delete_entry($mac); + $rules .= captiveportal_passthrumac_configure_entry($mac); $uniqid = uniqid("{$cpzone}_macedit"); file_put_contents("{$g['tmp_path']}/{$uniqid}_tmp", $rules); mwexec("/sbin/ipfw -x {$cpzone} -q {$g['tmp_path']}/{$uniqid}_tmp"); |
