Add support for the "Remove Shaper " button on the backend.

1 files changed, 22 insertions, 11 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 1878b1d..a2cd4b3 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -413,6 +413,17 @@ class altq_root_queue {
 		unset_object_by_reference($this->GetLink());
 	 }
 
+	function delete_all() {
+                if (count($this->queues)) {
+                        foreach ($this->queues as $q) {
+                        	$q->delete_all();
+                        	unset_object_by_reference($q->GetLink());
+                                unset($q);
+               		}
+        	        unset($this->queues);
+                }
+        }
+
 	/*
 	 * First it spits:
 	 * altq on $interface ..............
@@ -788,6 +799,17 @@ function GetEcn() {
 		cleanup_queue_from_rules($this->GetQname());
 		unset_object_by_reference($this->GetLink());
 	}
+	
+	function delete_all() {
+                if (count($this->subqueues)) {
+                        foreach ($this->subqueues as $q) {
+                                $q->delete_all();
+                                unset_object_by_reference($q->GetLink());
+                                unset($q);
+                        }
+                        unset($this->subqueues);
+                }
+        }
 
 	 function &find_queue($interface, $qname) { 
 		if ($qname == $this->GetQname())
@@ -1728,17 +1750,6 @@ class cbq_queue extends priq_queue {
 		}
 		}
 
-	function delete_all() {
-		if (count($this->subqueues)) {
-				foreach ($this->subqueues as $q) {
-						$q->delete_all();
-			unset_object_by_reference($q->GetLink());
-						unset($q);
-				}
-				unset($subqueues);
-		}
-		}
-
 		function delete_queue() {
 			unref_on_altq_queue_list($this->GetQname());
 			if ($this->GetDefault())