From fabb4b0321514813bbb0307671c8605c7c1b36e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Fri, 19 Jun 2015 17:33:19 +0200 Subject: Ticket #4746 Correctly set global variables to be used by hostnames cod epaths --- etc/inc/captiveportal.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 87a4a74..5ed4b3f 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1117,7 +1117,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'])) { @@ -1134,7 +1134,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"); @unlink("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"); -- cgit v1.1