Fixed #7231

This avoids the problem rather than fixing it by requiring the user to remove any queues from the if before deleting

Author: sbeaver-netgate

src/etc/inc/shaper.inc

@@ -4647,4 +4647,18 @@ $shaper_msg = gettext("Buttons at the bottom represent %s actions and are activa
 $default_shaper_msg .= sprintf($shaper_msg, gettext("queue"));
 $dn_default_shaper_msg .= sprintf($shaper_msg, gettext("limiter"));
 
+// Check to see if the specified interface has a queue configured
+function interface_has_queue($if) {
+	global $config;
+
+	if ($config['shaper']) {
+		foreach ($config['shaper']['queue'] as $queue) {
+			if ($queue['interface'] === $if) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
 ?>

src/usr/local/www/interfaces_assign.php

@@ -388,6 +388,8 @@ interface_configure($ifname, true);
 			$input_errors[] = gettext("The interface is part of a gre tunnel. Please delete the tunnel to continue");
 		} else if (link_interface_to_gif($id)) {
 			$input_errors[] = gettext("The interface is part of a gif tunnel. Please delete the tunnel to continue");
+		} else if (interface_has_queue($id)) {
+			$input_errors[] = gettext("The interface has a traffic shaper queue configured.\nPlease emove all queues on the interface to continue.\n");
 		} else {
 			unset($config['interfaces'][$id]['enable']);
 			$realid = get_real_interface($id);