summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-12-24 19:14:21 +0100
committerErmal LUÇI <eri@pfsense.org>2014-12-24 19:14:21 +0100
commit82a2fd790b4ee22a051b84595713dc8633e98bdf (patch)
tree1cd6dc1bf47d39234363117b9d8a204c61998f24
parentb9276845369b186dd1226a20b7402b2e61b31faf (diff)
downloadpfsense-82a2fd790b4ee22a051b84595713dc8633e98bdf.zip
pfsense-82a2fd790b4ee22a051b84595713dc8633e98bdf.tar.gz
Correct even other areas of CP using pfSense_ipfw_getTablestats function.
-rw-r--r--usr/local/www/services_captiveportal_hostname.php2
-rw-r--r--usr/local/www/services_captiveportal_ip.php2
-rw-r--r--usr/local/www/services_captiveportal_ip_edit.php2
3 files changed, 3 insertions, 3 deletions
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)) {
OpenPOWER on IntegriCloud