Remove direct calls to /sbin/ifconfig destroy by pfSense_interface_destroy()

8 files changed, 8 insertions, 8 deletions

diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index a0180b7..f717fe7 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -1645,7 +1645,7 @@ function check_wireless_mode() {
 		if (!interface_wireless_clone("{$wlanif}_", $wancfg)) {
 			$input_errors[] = sprintf(gettext("Unable to change mode to %s. The maximum number of wireless clones supported in this mode may have been reached."), $wlan_modes[$wancfg['wireless']['mode']]);
 		} else {
-			mwexec("/sbin/ifconfig " . escapeshellarg($wlanif) . "_ destroy");
+			pfSense_interface_destroy("{$wlanif}_");
 		}
 		$wancfg['wireless']['mode'] = $old_wireless_mode;
 	}
diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php
index 456e4af..640e628 100644
--- a/src/usr/local/www/interfaces_bridge.php
+++ b/src/usr/local/www/interfaces_bridge.php
@@ -92,7 +92,7 @@ if ($_GET['act'] == "del") {
 		if (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) {
 			log_error("Bridge interface does not exist, skipping ifconfig destroy.");
 		} else {
-			mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
+			pfSense_interface_destroy($a_bridges[$_GET['id']]['bridgeif']);
 		}
 
 		unset($a_bridges[$_GET['id']]);
diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php
index d47e6cc..3e00d20 100644
--- a/src/usr/local/www/interfaces_gif.php
+++ b/src/usr/local/www/interfaces_gif.php
@@ -88,7 +88,7 @@ if ($_GET['act'] == "del") {
 	} else if (gif_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This gif TUNNEL cannot be deleted because it is still being used as an interface.");
 	} else {
-		mwexec("/sbin/ifconfig " . $a_gifs[$_GET['id']]['gifif'] . " destroy");
+		pfSense_interface_destroy($a_gifs[$_GET['id']]['gifif']);
 		unset($a_gifs[$_GET['id']]);
 
 		write_config();
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 053c3a5..47830ac 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -89,7 +89,7 @@ if ($_GET['act'] == "del") {
 	} else if (gre_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This GRE tunnel cannot be deleted because it is still being used as an interface.");
 	} else {
-		mwexec("/sbin/ifconfig " . $a_gres[$_GET['id']]['greif'] . " destroy");
+		pfSense_interface_destroy($a_gres[$_GET['id']]['greif']);
 		unset($a_gres[$_GET['id']]);
 
 		write_config();
diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php
index f5864b9..ef3de5d 100644
--- a/src/usr/local/www/interfaces_lagg.php
+++ b/src/usr/local/www/interfaces_lagg.php
@@ -95,7 +95,7 @@ if ($_GET['act'] == "del") {
 	} else if (lagg_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This LAGG interface cannot be deleted because it is still being used.");
 	} else {
-		mwexec_bg("/sbin/ifconfig " . $a_laggs[$_GET['id']]['laggif'] . " destroy");
+		pfSense_interface_destroy($a_laggs[$_GET['id']]['laggif']);
 		unset($a_laggs[$_GET['id']]);
 
 		write_config();
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index 1e6f7d3..31a4bf5 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -99,7 +99,7 @@ if ($_GET['act'] == "del") {
 		}
 		mwexec("/usr/sbin/ngctl shutdown {$qinq['vlanif']}qinq:");
 		mwexec("/usr/sbin/ngctl shutdown {$qinq['vlanif']}:");
-		mwexec("/sbin/ifconfig {$qinq['vlanif']} destroy");
+		pfSense_interface_destroy($qinq['vlanif']);
 		unset($a_qinqs[$id]);
 
 		write_config();
diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php
index 8ba4d86..4d7cd10 100644
--- a/src/usr/local/www/interfaces_wireless.php
+++ b/src/usr/local/www/interfaces_wireless.php
@@ -89,7 +89,7 @@ if ($_GET['act'] == "del") {
 	if (clone_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This wireless clone cannot be deleted because it is assigned as an interface.");
 	} else {
-		mwexec("/sbin/ifconfig " . $a_clones[$_GET['id']]['cloneif'] . " destroy");
+		pfSense_interface_destroy($a_clones[$_GET['id']]['cloneif']);
 		unset($a_clones[$_GET['id']]);
 
 		write_config();
diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php
index c8527af..8b2d93d 100644
--- a/src/usr/local/www/interfaces_wireless_edit.php
+++ b/src/usr/local/www/interfaces_wireless_edit.php
@@ -157,7 +157,7 @@ if ($_POST) {
 			} else {
 				if (isset($id) && $a_clones[$id]) {
 					if ($clone['if'] != $a_clones[$id]['if']) {
-						mwexec("/sbin/ifconfig " . $a_clones[$id]['cloneif'] . " destroy");
+						pfSense_interface_destroy($a_clones[$id]['cloneif']);
 					}
 					$input_errors[] = sprintf(gettext("Created with id %s"), $id);
 					$a_clones[$id] = $clone;