summaryrefslogtreecommitdiffstats
path: root/usr/local/www/interfaces_assign.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-08-26 14:21:47 +0000
committerErmal <eri@pfsense.org>2010-08-26 14:21:47 +0000
commit48f236320d930978ecb8b7eabb5256c368ba1de9 (patch)
treec48986c325a22046846eee15a19956adf4a9d4c3 /usr/local/www/interfaces_assign.php
parent52ab1d445a2dfb671a8ec958980ae0997dcb9923 (diff)
downloadpfsense-48f236320d930978ecb8b7eabb5256c368ba1de9.zip
pfsense-48f236320d930978ecb8b7eabb5256c368ba1de9.tar.gz
Fixes #847. Check even interface groups before allowing deletion of an interface. Also try to readd to a group an interface when configuring.
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
-rwxr-xr-xusr/local/www/interfaces_assign.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 421286c..41f0fd2 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -241,7 +241,9 @@ if ($_POST['apply']) {
if ($_GET['act'] == "del") {
$id = $_GET['id'];
- if (link_interface_to_bridge($id))
+ if (link_interface_to_group($id))
+ $input_errors[] = gettext("The interface is part of a group. Please remove it from the group to continue");
+ else if (link_interface_to_bridge($id))
$input_errors[] = gettext("The interface is part of a bridge. Please remove it from the bridge to continue");
else if (link_interface_to_gre($id))
$input_errors[] = gettext("The interface is part of a gre tunnel. Please delete the tunnel to continue");
OpenPOWER on IntegriCloud