From 48a01262c84aff43b130b59bae8453a925601730 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Mon, 23 Jan 2012 10:02:45 +0000
Subject: Correct getNasIP in 2.0.x branch to be correct. There is no
 multi-zone support in 2.0.x

---
 usr/local/captiveportal/radius_accounting.inc     | 10 +++++-----
 usr/local/captiveportal/radius_authentication.inc | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr/local/captiveportal')

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))
-- 
cgit v1.1