If user is deleting a bridge, destroy it.

4 files changed, 28 insertions, 0 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 4265783..2872587 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -182,6 +182,13 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
+		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
+			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge'];
+			if($bridge) {
+				destroy_bridge($bridge);
+			}
+		}
+	
 		unset($wancfg['ipaddr']);
 		unset($wancfg['subnet']);
 		unset($config['system']['gateway']);
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index 8f9f119..736b947 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -106,6 +106,13 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		
+		if($lancfg['bridge'] <> "" and $_POST['bridge'] == "") {
+			$bridge = discover_bridge($lancfg['if'], $lancfg['bridge'];
+			if($bridge) {
+				destroy_bridge($bridge);
+			}
+		}
+		
 		$lancfg['bridge'] = $_POST['bridge'];
 		
 		if (($lancfg['ipaddr'] != $_POST['ipaddr']) || ($lancfg['subnet'] != $_POST['subnet'])) {
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index 972752c..3afb0e7 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -165,6 +165,13 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
+		if($optcfg['bridge'] <> "" and $_POST['bridge'] == "") {
+			$bridge = discover_bridge($optcfg['if'], $optcfg['bridge'];
+			if($bridge) {
+				destroy_bridge($bridge);
+			}
+		}
+
 		unset($optcfg['dhcphostname']);
 
 		$optcfg['descr'] = remove_bad_chars($_POST['descr']);
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 4265783..2872587 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -182,6 +182,13 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
+		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
+			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge'];
+			if($bridge) {
+				destroy_bridge($bridge);
+			}
+		}
+	
 		unset($wancfg['ipaddr']);
 		unset($wancfg['subnet']);
 		unset($config['system']['gateway']);