MFC 8044

Do not redirect to traffic shaper wizard on the shaper enabled status, only redirect if shaper is disabled AND there are no queues defined.

1 files changed, 10 insertions, 7 deletions

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 9538c86..7f56142 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -34,22 +34,25 @@
 
 require("guiconfig.inc");
 
+/* redirect to wizard if shaper isn't already configured */
+if(isset($config['shaper']['enable'])) {
+	$pconfig['enable'] = TRUE;
+} else {
+	if(!is_array($config['shaper']['queue']))
+		Header("Location: wizard.php?xml=traffic_shaper_wizard.xml");
+}
+
 if (!is_array($config['shaper']['rule'])) {
 	$config['shaper']['rule'] = array();
 }
+
 if (!is_array($config['shaper']['queue'])) {
 	$config['shaper']['queue'] = array();
 }
+
 $a_shaper = &$config['shaper']['rule'];
 $a_queue = &$config['shaper']['queue'];
 
-/* redirect to wizard if shaper isn't already configured */
-if(isset($config['shaper']['enable'])) {
-	$pconfig['enable'] = TRUE;
-} else {
-	Header("Location: wizard.php?xml=traffic_shaper_wizard.xml");
-}
-
 function wipe_magic () {
   global $config;