diff options
| author | Ermal <eri@pfsense.org> | 2012-01-23 10:02:45 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-01-23 10:02:45 +0000 |
| commit | 48a01262c84aff43b130b59bae8453a925601730 (patch) | |
| tree | f7480d5cea72e20790d9de72237918082fe905f7 /usr/local/captiveportal | |
| parent | f314bad6789e05cecfb14242e13be077248ebf13 (diff) | |
| download | pfsense-48a01262c84aff43b130b59bae8453a925601730.zip pfsense-48a01262c84aff43b130b59bae8453a925601730.tar.gz | |
Correct getNasIP in 2.0.x branch to be correct. There is no multi-zone support in 2.0.x
Diffstat (limited to 'usr/local/captiveportal')
| -rw-r--r-- | usr/local/captiveportal/radius_accounting.inc | 10 | ||||
| -rw-r--r-- | usr/local/captiveportal/radius_authentication.inc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc index 72c8a67..6407ad0 100644 --- a/usr/local/captiveportal/radius_accounting.inc +++ b/usr/local/captiveportal/radius_accounting.inc @@ -51,15 +51,15 @@ if (!function_exists('getNasIP')) { function getNasIP() { - global $config, $cpzone; + global $config; - if (empty($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) { + if (empty($config['captiveportal']['radiussrcip_attribute'])) { $nasIp = get_interface_ip(); } else { - if (is_ipaddr($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) - $nasIp = $config['captiveportal'][$cpzone]['radiussrcip_attribute']; + if (is_ipaddr($config['captiveportal']['radiussrcip_attribute'])) + $nasIp = $config['captiveportal']['radiussrcip_attribute']; else - $nasIp = get_interface_ip($config['captiveportal'][$cpzone]['radiussrcip_attribute']); + $nasIp = get_interface_ip($config['captiveportal']['radiussrcip_attribute']); } if(!is_ipaddr($nasIp)) diff --git a/usr/local/captiveportal/radius_authentication.inc b/usr/local/captiveportal/radius_authentication.inc index f03315f..2c7dc08 100644 --- a/usr/local/captiveportal/radius_authentication.inc +++ b/usr/local/captiveportal/radius_authentication.inc @@ -50,15 +50,15 @@ if (!function_exists('getNasIP')) { function getNasIP() { - global $config, $cpzone; + global $config; - if (empty($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) { + if (empty($config['captiveportal']['radiussrcip_attribute'])) { $nasIp = get_interface_ip(); } else { - if (is_ipaddr($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) - $nasIp = $config['captiveportal'][$cpzone]['radiussrcip_attribute']; + if (is_ipaddr($config['captiveportal']['radiussrcip_attribute'])) + $nasIp = $config['captiveportal']['radiussrcip_attribute']; else - $nasIp = get_interface_ip($config['captiveportal'][$cpzone]['radiussrcip_attribute']); + $nasIp = get_interface_ip($config['captiveportal']['radiussrcip_attribute']); } if(!is_ipaddr($nasIp)) |
