From 7e3d78f2c8ff33c0c82d56e27c5515fc785facf8 Mon Sep 17 00:00:00 2001 From: bcyrill Date: Sun, 27 Jan 2013 18:53:22 +0100 Subject: Do not include prefix in IP address --- usr/local/www/services_captiveportal_ip.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'usr/local/www') 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}"); -- cgit v1.1