diff options
author | Ermal Luçi <eri@pfsense.org> | 2013-01-27 10:04:36 -0800 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2013-01-27 10:04:36 -0800 |
commit | 9ab4af9074a359ac977fbed06409e5e41cc4cddf (patch) | |
tree | 98ea79c5c0ed6f0d52a47759fc68ca3ff607b872 /usr/local | |
parent | dae707f5363fa10bae1257492579c57a0c459fdd (diff) | |
parent | 7e3d78f2c8ff33c0c82d56e27c5515fc785facf8 (diff) | |
download | pfsense-9ab4af9074a359ac977fbed06409e5e41cc4cddf.zip pfsense-9ab4af9074a359ac977fbed06409e5e41cc4cddf.tar.gz |
Merge pull request #352 from bcyrill/cp_deleteip
Do not include prefix in IP address
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 053d118..e0e39d8 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -69,18 +69,20 @@ if ($_GET['act'] == "del") { if (isset($config['captiveportal'][$cpzone]['enable'])) { if (!empty($ipent['sn'])) { $ipfw = pfSense_ipfw_getTablestats($cpzone, 3, $ipent['ip'], $ipent['sn']); - $ipent['ip'] .= "/{$ipent['sn']}"; - } else + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 3, $ipent['ip'], $ipent['sn']); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 4, $ipent['ip'], $ipent['sn']); + } else { $ipfw = pfSense_ipfw_getTablestats($cpzone, 3, $ipent['ip']); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 3, $ipent['ip']); + pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 4, $ipent['ip']); + } if (is_array($ipfw)) { captiveportal_free_dn_ruleno($ipfw['dnpipe']); pfSense_pipe_action("pipe delete {$ipfw['dnpipe']}"); pfSense_pipe_action("pipe delete " . ($ipfw['dnpipe']+1)); } - pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 3, $ipent['ip']); - pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_DEL, 4, $ipent['ip']); } - + unset($a_allowedips[$_GET['id']]); write_config(); header("Location: services_captiveportal_ip.php?zone={$cpzone}"); |