From 82a2fd790b4ee22a051b84595713dc8633e98bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Wed, 24 Dec 2014 19:14:21 +0100 Subject: Correct even other areas of CP using pfSense_ipfw_getTablestats function. --- usr/local/www/services_captiveportal_hostname.php | 2 +- usr/local/www/services_captiveportal_ip.php | 2 +- usr/local/www/services_captiveportal_ip_edit.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'usr') diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php index 964c2ba..8918a25 100644 --- a/usr/local/www/services_captiveportal_hostname.php +++ b/usr/local/www/services_captiveportal_hostname.php @@ -79,7 +79,7 @@ if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { $ip = gethostbyname($ipent['hostname']); $sn = (is_ipaddrv6($ip)) ? 128 : 32; if(is_ipaddr($ip)) { - $ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $ip); + $ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $ip); if (is_array($ipfw)) { captiveportal_free_dn_ruleno($ipfw['dnpipe']); pfSense_pipe_action("pipe delete {$ipfw['dnpipe']}"); diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index f08e861..28ec44b 100644 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -73,7 +73,7 @@ if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { if (isset($config['captiveportal'][$cpzone]['enable'])) { $mask = (!empty($ipent['sn'])) ? $ipent['sn'] : 32; - $ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $ipent['ip'], $mask); + $ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $ipent['ip']); pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 3, $ipent['ip'], $mask); pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 4, $ipent['ip'], $mask); diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index bce5329..4038e2a 100644 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -152,7 +152,7 @@ if ($_POST) { $cpzoneid = $a_cp[$cpzone]['zoneid']; unset($ipfw); if (isset($oldip) && isset($oldmask)) { - $ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $oldip, $oldmask); + $ipfw = pfSense_ipfw_getTablestats($cpzoneid, IP_FW_TABLE_XLISTENTRY, 3, $oldip); $rules .= "table 3 delete {$oldip}/{$oldmask}\n"; $rules .= "table 4 delete {$oldip}/{$oldmask}\n"; if (is_array($ipfw)) { -- cgit v1.1