diff options
| author | Ermal <eri@pfsense.org> | 2014-03-24 19:58:14 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-03-24 19:58:14 +0000 |
| commit | 375eba1448558befccb54fe3c25f5c984a75d684 (patch) | |
| tree | aa343e8dc47bef1cbde5bf4ed3da583bb134cc7a /etc/inc/captiveportal.inc | |
| parent | dae77fe374ebaf1f97d2835ef0f52daff3b26be9 (diff) | |
| download | pfsense-375eba1448558befccb54fe3c25f5c984a75d684.zip pfsense-375eba1448558befccb54fe3c25f5c984a75d684.tar.gz | |
Fix this for master
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 7972ac3..3906e16 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1478,7 +1478,7 @@ function captiveportal_get_dn_passthru_ruleno($value) { if (file_exists("{$g['vardb_path']}/captiveportaldn.rules")) { $rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportaldn.rules")); unset($output); - $_gb = exec("/sbin/ipfw -x {$cpzone} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/awk '{print $5}' | /usr/bin/head -n 1", $output); + $_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/awk '{print $5}' | /usr/bin/head -n 1", $output); $ruleno = intval($output[0]); if (!$rules[$ruleno]) $ruleno = NULL; @@ -1566,7 +1566,7 @@ function captiveportal_get_ipfw_passthru_ruleno($value) { if (file_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules")) { $rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportal_{$cpzone}.rules")); unset($output); - $_gb = exec("/sbin/ipfw -x {$cpzone} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/awk '{print $1}' | /usr/bin/head -n 1", $output); + $_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/awk '{print $1}' | /usr/bin/head -n 1", $output); $ruleno = intval($output[0]); if (!$rules[$ruleno]) $ruleno = NULL; |
