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

1 files changed, 9 insertions, 6 deletions

diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index 0c279c3..06a3885 100644
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -50,12 +50,6 @@ $cpzone = $_GET['zone'];
 if (isset($_POST['zone']))
 	$cpzone = $_POST['zone'];
 
-if ($_GET['act'] == "del" && !empty($cpzone)) {
-	captiveportal_disconnect_client($_GET['id']);
-	header("Location: status_captiveportal.php?zone={$cpzone}");
-	exit;
-}
-
 $pgtitle = array(gettext("Status: Captive portal"));
 $shortcut_section = "captiveportal";
 
@@ -66,6 +60,15 @@ $a_cp =& $config['captiveportal'];
 if (count($a_cp) == 1)
  $cpzone = current(array_keys($a_cp));
 
+if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid']))
+	$cpzoneid = $a_cp[$cpzone]['zoneid'];
+
+if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid) && isset($_GET['id'])) {
+	captiveportal_disconnect_client($_GET['id']);
+	header("Location: status_captiveportal.php?zone={$cpzone}");
+	exit;
+}
+
 include("head.inc");
 
 ?>