diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-13 14:48:42 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-13 14:50:23 -0200 |
| commit | b4e0f02b89fa6b8e8b22f31ee4486df171ae5337 (patch) | |
| tree | 82bfb5ba7a3e076f0063b673e0b9d04f28a5b78f /usr/local/www/services_captiveportal_ip.php | |
| parent | 0cd7c91a29a88c3ac859be9ee9563e1737924128 (diff) | |
| download | pfsense-b4e0f02b89fa6b8e8b22f31ee4486df171ae5337.zip pfsense-b4e0f02b89fa6b8e8b22f31ee4486df171ae5337.tar.gz | |
Make sure $cpzoneid is defined and use it to call pfSense_ipfw_Tableaction() and pfSense_ipfw_getTablestats(). Also fix fieldnames for captiveportal_hostnames. It should fix #4001
Diffstat (limited to 'usr/local/www/services_captiveportal_ip.php')
| -rw-r--r-- | usr/local/www/services_captiveportal_ip.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 1ca876d..f08e861 100644 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -59,10 +59,13 @@ if (!is_array($config['captiveportal'])) $config['captiveportal'] = array(); $a_cp =& $config['captiveportal']; +if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) + $cpzoneid = $a_cp[$cpzone]['zoneid']; + $pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']); $shortcut_section = "captiveportal"; -if ($_GET['act'] == "del") { +if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { $a_allowedips =& $config['captiveportal'][$cpzone]['allowedip']; if ($a_allowedips[$_GET['id']]) { $ipent = $a_allowedips[$_GET['id']]; @@ -70,9 +73,9 @@ if ($_GET['act'] == "del") { if (isset($config['captiveportal'][$cpzone]['enable'])) { $mask = (!empty($ipent['sn'])) ? $ipent['sn'] : 32; - $ipfw = pfSense_ipfw_getTablestats($cpzone, 3, $ipent['ip'], $mask); - pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_XDEL, 3, $ipent['ip'], $mask); - pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_XDEL, 4, $ipent['ip'], $mask); + $ipfw = pfSense_ipfw_getTablestats($cpzoneid, 3, $ipent['ip'], $mask); + pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 3, $ipent['ip'], $mask); + pfSense_ipfw_Tableaction($cpzoneid, IP_FW_TABLE_XDEL, 4, $ipent['ip'], $mask); if (is_array($ipfw)) { captiveportal_free_dn_ruleno($ipfw['dnpipe']); |
