From 09a49064cbec45a36cb029d941d4f9ea680481ed Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Tue, 23 Oct 2012 15:35:23 +0200
Subject: Fix limiter error

---
 usr/local/www/firewall_shaper_vinterface.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index baeafe4..02d474a 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -161,6 +161,7 @@ if ($_GET) {
 
 		if ($q) {
 			$output_form .= $q->build_form();
+			$newjavascript = $q->build_javascript();
 			unset($q);
 			$newqueue = true;
 		}
@@ -326,7 +327,7 @@ if ($can_add || $addnewaltq) {
 	$output_form .= "</a>";
 }
 $output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe=";
-$output_form .= $pipe . "&queue=";
+$output_form .= $pipe;
 if ($queue) {
 	$output_form .= "&queue=" . $queue->GetQname();
 }
-- 
cgit v1.1


From 2c7bdd05abb6608f58467e29782d1db33b072f03 Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Tue, 23 Oct 2012 15:56:36 +0200
Subject: Fix limiter error

---
 usr/local/www/firewall_shaper_vinterface.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 02d474a..c654455 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -223,6 +223,7 @@ if ($_GET) {
 
 			read_dummynet_config();
 			$output_form .= $dnpipe->build_form();
+			$newjavascript = $dnpipe->build_javascript();
 		}
 	} else if ($parentqueue) { /* Add a new queue */
 		if (!empty($dummynet_pipe_list[$qname]))
-- 
cgit v1.1


From 902f1bd875692dac9df658c87ec5d2a8f65e70f0 Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Tue, 23 Oct 2012 16:06:42 +0200
Subject: Fix limiter error

---
 usr/local/www/firewall_shaper_vinterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index c654455..8ba1fab 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -98,7 +98,7 @@ if ($_GET) {
 		if ($queue) {
 			if (is_array($config['filter']['rule'])) {
 				foreach ($config['filter']['rule'] as $rule) {
-					if ($rule['dnpipe'] == $queue->GetName() || $rule['pdnpipe'] == $queue->GetName())
+					if ($rule['dnpipe'] == $queue->GetQName() || $rule['pdnpipe'] == $queue->GetQName())
 						$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleteing.");
 				}
 			}
-- 
cgit v1.1


From 184c7952900a64ea275b035238e532c33106298f Mon Sep 17 00:00:00 2001
From: bcyrill <cyrill@bannwart.info>
Date: Tue, 23 Oct 2012 16:31:54 +0200
Subject: Fix limiter error

---
 usr/local/www/firewall_shaper_vinterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 8ba1fab..84be907 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -98,7 +98,7 @@ if ($_GET) {
 		if ($queue) {
 			if (is_array($config['filter']['rule'])) {
 				foreach ($config['filter']['rule'] as $rule) {
-					if ($rule['dnpipe'] == $queue->GetQName() || $rule['pdnpipe'] == $queue->GetQName())
+					if ($rule['dnpipe'] == $queue->GetQname() || $rule['pdnpipe'] == $queue->GetQname())
 						$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleteing.");
 				}
 			}
-- 
cgit v1.1