From 3a669df20b0795b2e487fc033f86eacea7e6fdf4 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Sat, 20 Feb 2010 21:37:56 -0700
Subject: Fix the check for whether the bridge is assigned.

---
 usr/local/www/interfaces_bridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www/interfaces_bridge.php')

diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index 2806005..8cb8bda 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -46,12 +46,12 @@ if (!is_array($config['bridges']['bridged']))
 
 $a_bridges = &$config['bridges']['bridged'] ;
 
-function bridge_inuse($num) {
+function bridge_inuse($bridgeif) {
 	global $config;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
-		if ($config['interfaces'][$if]['if'] == $a_bridges[$num]['bridgeif'])
+		if ($config['interfaces'][$if]['if'] == $bridgeif)
 			return true;
 	}
 
@@ -60,7 +60,7 @@ function bridge_inuse($num) {
 
 if ($_GET['act'] == "del") {
 	/* check if still in use */
-	if (bridge_inuse($_GET['id'])) {
+	if (bridge_inuse($a_bridges[$_GET['id']]['bridgeif'])) {
 		$input_errors[] = "This bridge TUNNEL cannot be deleted because it is still being used as an interface.";
 	} else {
 		mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
-- 
cgit v1.1


From 9c17db74d46dec0e92e554c18156718620692afc Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Wed, 24 Feb 2010 12:12:23 -0700
Subject: Revert "Fix the check for whether the bridge is assigned."

This reverts commit 3a669df20b0795b2e487fc033f86eacea7e6fdf4.
---
 usr/local/www/interfaces_bridge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www/interfaces_bridge.php')

diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index 8cb8bda..2806005 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -46,12 +46,12 @@ if (!is_array($config['bridges']['bridged']))
 
 $a_bridges = &$config['bridges']['bridged'] ;
 
-function bridge_inuse($bridgeif) {
+function bridge_inuse($num) {
 	global $config;
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
-		if ($config['interfaces'][$if]['if'] == $bridgeif)
+		if ($config['interfaces'][$if]['if'] == $a_bridges[$num]['bridgeif'])
 			return true;
 	}
 
@@ -60,7 +60,7 @@ function bridge_inuse($bridgeif) {
 
 if ($_GET['act'] == "del") {
 	/* check if still in use */
-	if (bridge_inuse($a_bridges[$_GET['id']]['bridgeif'])) {
+	if (bridge_inuse($_GET['id'])) {
 		$input_errors[] = "This bridge TUNNEL cannot be deleted because it is still being used as an interface.";
 	} else {
 		mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
-- 
cgit v1.1


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

---
 usr/local/www/interfaces_bridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www/interfaces_bridge.php')

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


From fd22be34f6a6768190cc3d8e064a43e2ea7319b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Fri, 26 Feb 2010 18:49:26 +0000
Subject: Ticket #367. On double click go to the repective edit page.

---
 usr/local/www/interfaces_bridge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www/interfaces_bridge.php')

diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index 4bf81a7..5bab038 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -110,7 +110,7 @@ include("head.inc");
 				</tr>
 			  <?php $i = 0; $ifdescrs = get_configured_interface_with_descr();
 					foreach ($a_bridges as $bridge): ?>
-                <tr>
+                <tr  ondblclick="document.location='interfaces_bridge_edit.php?id=<?=$i;?>'">
                   <td class="listlr">
 					<?=htmlspecialchars(strtoupper($bridge['bridgeif']));?>
                   </td>
-- 
cgit v1.1