diff options
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 | ||||
| -rw-r--r-- | usr/local/www/services_captiveportal_hostname_edit.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 1d95971..074b0dc 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1175,7 +1175,7 @@ function captiveportal_allowedip_configure_entry($ipent, $ishostname = false) { } function captiveportal_allowedhostname_configure() { - global $config, $g, $cpzone; + global $config, $g, $cpzone, $cpzoneid; $rules = ""; if (is_array($config['captiveportal'][$cpzone]['allowedhostname'])) { @@ -1192,7 +1192,7 @@ function captiveportal_allowedhostname_configure() { if (isvalidpid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid")) { sigkillbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid", "HUP"); } else { - mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid -i 300 -c {$cp_filterdns_filename} -y {$cpzone} -d 1"); + mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid -i 300 -c {$cp_filterdns_filename} -y {$cpzoneid} -d 1"); } } else { killbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"); diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index dc33739..674e220 100644 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -57,6 +57,8 @@ require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); +global $cpzone, $cpzoneid; + $pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Edit allowed Hostname")); $shortcut_section = "captiveportal"; @@ -64,6 +66,7 @@ $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { $cpzone = $_POST['zone']; } +$cpzoneid = $config['captiveportal'][$cpzone]['zoneid']; if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) { header("Location: services_captiveportal_zones.php"); @@ -154,8 +157,7 @@ if ($_POST) { $rules = captiveportal_allowedhostname_configure(); @file_put_contents("{$g['tmp_path']}/hostname_rules", $rules); - $cpzoneid = $a_cp[$cpzone]['zoneid']; - mwexec("/sbin/ipfw -x {$cpzoneid} {$g['tmp_path']}/hostname_rules"); + mwexec("/sbin/ipfw -x {$cpzoneid} {$g['tmp_path']}/hostname_rules", true); unset($rules); header("Location: services_captiveportal_hostname.php?zone={$cpzone}"); |
