From fc80323d35d291770e356d50656163e234ae1475 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Wed, 24 Feb 2010 12:24:35 -0700
Subject: [PATCH 2/2] Fix scope problem in *_inuse functions on some of the interfaces_*.php pages.

---
 usr/local/www/interfaces_bridge.php |    2 +-
 usr/local/www/interfaces_gif.php    |    2 +-
 usr/local/www/interfaces_gre.php    |    2 +-
 usr/local/www/interfaces_qinq.php   |    2 +-
 usr/local/www/interfaces_vlan.php   |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index 2806005..4bf81a7 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -47,7 +47,7 @@ if (!is_array($config['bridges']['bridged']))
 $a_bridges = &$config['bridges']['bridged'] ;
 
 function bridge_inuse($num) {
-	global $config;
+	global $config, $a_bridges;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
diff --git a/usr/local/www/interfaces_gif.php b/usr/local/www/interfaces_gif.php
index 7fe6abd..2b4008d 100644
--- a/usr/local/www/interfaces_gif.php
+++ b/usr/local/www/interfaces_gif.php
@@ -47,7 +47,7 @@ if (!is_array($config['gifs']['gif']))
 $a_gifs = &$config['gifs']['gif'] ;
 
 function gif_inuse($num) {
-	global $config;
+	global $config, $a_gifs;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php
index 9aca049..76c035c 100644
--- a/usr/local/www/interfaces_gre.php
+++ b/usr/local/www/interfaces_gre.php
@@ -47,7 +47,7 @@ if (!is_array($config['gres']['gre']))
 $a_gres = &$config['gres']['gre'] ;
 
 function gre_inuse($num) {
-	global $config;
+	global $config, $a_gres;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php
index 84be902..68303c6 100755
--- a/usr/local/www/interfaces_qinq.php
+++ b/usr/local/www/interfaces_qinq.php
@@ -46,7 +46,7 @@ if (!is_array($config['qinqs']['qinqentry']))
 $a_qinqs = &$config['qinqs']['qinqentry'];
 
 function qinq_inuse($num) {
-	global $config, $g;
+	global $config, $a_qinqs;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php
index 5c71fab..fad4e55 100755
--- a/usr/local/www/interfaces_vlan.php
+++ b/usr/local/www/interfaces_vlan.php
@@ -48,7 +48,7 @@ if (!is_array($config['vlans']['vlan']))
 $a_vlans = &$config['vlans']['vlan'] ;
 
 function vlan_inuse($num) {
-	global $config, $g;
+	global $config, $a_vlans;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
-- 
1.6.2.2.1669.g7eaf8