From a843b04f400a1a5731a09a8d6abfdf12e640f8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Thu, 27 Mar 2008 17:08:16 +0000
Subject: * Unbreak By Queues view (it even allows full interface cloning now)
 * Allow queues to be created safely * Fix a typo on tab links for the traffic
 shaper tabs

---
 usr/local/www/firewall_shaper.php        |  4 +--
 usr/local/www/firewall_shaper_queues.php | 46 ++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 16 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index f8e0dea..debc8de 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -316,8 +316,8 @@ if ($queue) {
 
 $tree = "<ul class=\"tree\" >";
 if (is_array($altq_list_queues)) {
-        foreach ($altq_list_queues as $altq) {
-                $tree .= $altq->build_tree();
+        foreach ($altq_list_queues as $tmpaltq) {
+                $tree .= $tmpaltq->build_tree();
         }
 $tree .=  get_interface_list_to_show();
 }
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index b21ab26..8fea98e 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -72,19 +72,37 @@ if ($_GET) {
 			 * XXX: WARNING: This returns the first it finds.
 			 * Maybe the user expects something else?!
 			 */
-			foreach ($altq_list_queues as $altq) {
-				$qtmp =& $altq->find_queue("", $qname);
-				if ($qtmp) {
-					$aq =& $altq_list_queues[$interface];
-					if ($aq) {
-						//$link =& get_reference_to_me_in_config(&$link);
-						$aq->copy_queue($interface, &$qtmp);
-						write_config();
-                        			touch($d_shaperconfdirty_path);
-						break;
-					}
-				}
-			}
+                        foreach ($altq_list_queues as $altq) {
+                                $qtmp =& $altq->find_queue("", $qname);
+                                if ($qtmp) {
+                                        $copycfg = array();
+                                        $qtmp->copy_queue($interface, &$copycfg);
+                                        $aq =& $altq_list_queues[$interface];
+                                        if ($aq) {
+                                                $tmp1 =& $qtmp->find_parentqueue($interface, $qname);
+                                                if ($tmp1)
+                                                        $tmp =& $aq->find_queue($interface, $tmp1->GetQname());
+
+                                                if ($tmp)
+                                                        $link =& get_reference_to_me_in_config($tmp->GetLink());
+                                                else
+                                                        $link =& get_reference_to_me_in_config($aq->GetLink());
+                                                $link['queue'][] = $copycfg;
+                                        } else {
+                                                $newroot = array();
+                                                $newroot['name'] = $interface;
+                                                $newroot['interface'] = $interface;
+                                                $newroot['scheduler'] = $altq->GetScheduler();
+                                                $newroot['queue'] = array();
+                                                $newroot['queue'][] = $copycfg;
+                                                $config['shaper']['queue'][] = $newroot;
+                                        }
+                                        write_config();
+                                        touch($d_shaperconfdirty_path);
+                                        break;
+                                }
+                        }
+
 			header("Location: firewall_shaper_queues.php?queue=".$qname."&action=show");
 			exit;
 		break;
@@ -149,7 +167,7 @@ include("head.inc");
 <?php
 	$tab_array = array();
 	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
-	$tab_array[1] = array("By Queue", true, "firewall_shaper_queues.ph");
+	$tab_array[1] = array("By Queue", true, "firewall_shaper_queues.php");
 	$tab_array[2] = array("Wizards", false, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
-- 
cgit v1.1