summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorbcyrill <cyrill@bannwart.info>2013-01-27 18:53:22 +0100
committerbcyrill <cyrill@bannwart.info>2013-01-27 18:53:22 +0100
commit7e3d78f2c8ff33c0c82d56e27c5515fc785facf8 (patch)
tree98ea79c5c0ed6f0d52a47759fc68ca3ff607b872 /usr
parentdae707f5363fa10bae1257492579c57a0c459fdd (diff)
downloadpfsense-7e3d78f2c8ff33c0c82d56e27c5515fc785facf8.zip
pfsense-7e3d78f2c8ff33c0c82d56e27c5515fc785facf8.tar.gz
Do not include prefix in IP address
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/services_captiveportal_ip.php12
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}");
OpenPOWER on IntegriCloud