diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-12-03 18:08:14 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-12-03 18:08:14 +0000 |
| commit | c54d236c00a12dc978dbb717e83a35103cd0c3a2 (patch) | |
| tree | 640e9987e7dd697bd3b30ff83d969e98d08dafdc /etc/inc/captiveportal.inc | |
| parent | 3043dec792ab93bf3a6f53784872b6abaa9dca9d (diff) | |
| download | pfsense-c54d236c00a12dc978dbb717e83a35103cd0c3a2.zip pfsense-c54d236c00a12dc978dbb717e83a35103cd0c3a2.tar.gz | |
Correctly detect captive portal on optional interfaces
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 58da0c0..36c86c5 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -278,11 +278,10 @@ function captiveportal_rules_generate() { http://cvstrac.pfsense.com/tktview?tn=651 */ $iflist = array("lan" => "LAN", "wan" => "WAN"); - $captive_portal_interface = strtoupper($config['captiveportal']['interface']); + $captive_portal_interface = strtoupper($cpifn); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; + $iflist['opt' . $i] = "OPT{$i}"; foreach ($iflist as $ifent => $ifname) { - //echo "{$ifname} -> {$config['captiveportal']['interface']}\n"; if($captive_portal_interface == strtoupper($ifname)) continue; $int = convert_friendly_interface_to_real_interface_name($ifname); |
