This broke a variety of things. Revert "Deprecated and non-static method messages"

This reverts commit 91b9a02fb131746c67fdf9f34282f123a13f1b13.

2 files changed, 96 insertions, 96 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index 2924038..82a2b82 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -671,7 +671,7 @@ function apply_all_choosen_items() {
 	for ($i = 0; $i < $steps; $i++) {
 
 		$tmppath = array();
-		$altq = new altq_root_queue();
+		$altq =& new altq_root_queue();
 
 		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
 		$interfacelist[] = $config['ezshaper']['step2']["conn{$i}interface"];
@@ -768,9 +768,9 @@ function apply_all_choosen_items() {
 
 			if ($sched != "PRIQ") {
 				if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qInternet";
 				//$tmpcf['priority'] = 6;
@@ -799,11 +799,11 @@ function apply_all_choosen_items() {
 			}
 
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qACK";
 			$tmpcf['priority'] = 6;
@@ -829,11 +829,11 @@ function apply_all_choosen_items() {
 			$qtmp->wconfig();
 
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			if ($p2pcatchall)
 				$tmpcf['name'] = "qOthersDefault";
@@ -861,11 +861,11 @@ function apply_all_choosen_items() {
 
 			if ($p2p) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qP2P";
 				$tmpcf['priority'] = 1;
@@ -911,11 +911,11 @@ function apply_all_choosen_items() {
 
 			if ($voip) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qVoIP";
 				$tmpcf['priority'] = 7;
@@ -951,11 +951,11 @@ function apply_all_choosen_items() {
 
 			if ($games) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qGames";
 				$tmpcf['priority'] = 5;
@@ -982,11 +982,11 @@ function apply_all_choosen_items() {
 
 			if ($otherpriority) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersHigh";
 				$tmpcf['priority'] = 4;
@@ -1012,11 +1012,11 @@ function apply_all_choosen_items() {
 
 
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersLow";
 				$tmpcf['priority'] = 2;
@@ -1057,7 +1057,7 @@ function apply_all_choosen_items() {
 			$downbw = floatval($config['ezshaper']['step2']["conn{$i}download"]) * $downfactor;
 
 			$tmppath = array();
-			$altq = new altq_root_queue();
+			$altq =& new altq_root_queue();
 
 			$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
 			$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
@@ -1152,11 +1152,11 @@ function apply_all_choosen_items() {
 
 		if (!$p2pcatchall) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qLink";
 			$tmpcf['priority'] = 2;
@@ -1182,9 +1182,9 @@ function apply_all_choosen_items() {
 
 		if ($sched != "PRIQ") {
 			if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qInternet";
 			//$tmpcf['priority'] = 6;
@@ -1212,11 +1212,11 @@ function apply_all_choosen_items() {
 		}
 
 		if ($sched == "PRIQ")
-			$q = new priq_queue();
+			$q =& new priq_queue();
 		else if ($sched == "CBQ")
-			$q = new cbq_queue();
+			$q =& new cbq_queue();
 		else if ($sched == "HFSC")
-			$q = new hfsc_queue();
+			$q =& new hfsc_queue();
 		$tmpcf = array();
 		$tmpcf['name'] = "qACK";
 		$tmpcf['priority'] = 6;
@@ -1242,11 +1242,11 @@ function apply_all_choosen_items() {
 
 		if ($p2p) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qP2P";
 			$tmpcf['priority'] = 1;
@@ -1292,11 +1292,11 @@ function apply_all_choosen_items() {
 
 		if ($voip) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qVoIP";
 			$tmpcf['priority'] = 7;
@@ -1332,11 +1332,11 @@ function apply_all_choosen_items() {
 
 		if ($games) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qGames";
 			$tmpcf['priority'] = 5;
@@ -1363,11 +1363,11 @@ function apply_all_choosen_items() {
 
 		if ($otherpriority) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qOthersHigh";
 			$tmpcf['priority'] = 4;
@@ -1392,11 +1392,11 @@ function apply_all_choosen_items() {
 			$qtmp->wconfig();
 
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qOthersLow";
 			$tmpcf['priority'] = 3;
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
index c4b8c2d..c3e0e28 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -719,7 +719,7 @@ function apply_all_choosen_items() {
 	for ($i = 0; $i < $steps; $i++) {
 
 		$tmppath = array();
-		$altq = new altq_root_queue();
+		$altq =& new altq_root_queue();
 
 		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
 		$interfacelist[] = $config['ezshaper']['step2']["conn{$i}interface"];
@@ -817,9 +817,9 @@ function apply_all_choosen_items() {
 
 		if ($sched != "PRIQ") {
 			if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qInternet";
 			//$tmpcf['priority'] = 6;
@@ -851,11 +851,11 @@ function apply_all_choosen_items() {
 		}
 
 		if ($sched == "PRIQ")
-			$q = new priq_queue();
+			$q =& new priq_queue();
 		else if ($sched == "CBQ")
-			$q = new cbq_queue();
+			$q =& new cbq_queue();
 		else if ($sched == "HFSC")
-			$q = new hfsc_queue();
+			$q =& new hfsc_queue();
 		$tmpcf = array();
 		$tmpcf['name'] = "qACK";
 		$tmpcf['priority'] = 6;
@@ -881,11 +881,11 @@ function apply_all_choosen_items() {
 		$qtmp->wconfig();
 
 		if ($sched == "PRIQ")
-			$q = new priq_queue();
+			$q =& new priq_queue();
 		else if ($sched == "CBQ")
-			$q = new cbq_queue();
+			$q =& new cbq_queue();
 		else if ($sched == "HFSC")
-			$q = new hfsc_queue();
+			$q =& new hfsc_queue();
 		$tmpcf = array();
 		if ($p2pcatchall)
 			$tmpcf['name'] = "qOthersDefault";
@@ -913,11 +913,11 @@ function apply_all_choosen_items() {
 
 			if ($p2p) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qP2P";
 				$tmpcf['priority'] = 1;
@@ -963,11 +963,11 @@ function apply_all_choosen_items() {
 
 			if ($voip) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qVoIP";
 				$tmpcf['priority'] = 7;
@@ -1003,11 +1003,11 @@ function apply_all_choosen_items() {
 
 			if ($games) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qGames";
 				$tmpcf['priority'] = 5;
@@ -1034,11 +1034,11 @@ function apply_all_choosen_items() {
 
 			if ($otherpriority) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersHigh";
 				$tmpcf['priority'] = 4;
@@ -1064,11 +1064,11 @@ function apply_all_choosen_items() {
 
 
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersLow";
 				$tmpcf['priority'] = 2;
@@ -1118,7 +1118,7 @@ function apply_all_choosen_items() {
 	for ($i = 0; $i < $localint; $i++) {
 
 		$tmppath = array();
-		$altq = new altq_root_queue();
+		$altq =& new altq_root_queue();
 
 		$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
@@ -1215,11 +1215,11 @@ function apply_all_choosen_items() {
 
 		if (!$p2pcatchall) {
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qLink";
 			$tmpcf['priority'] = 2;
@@ -1245,9 +1245,9 @@ function apply_all_choosen_items() {
 
 		if ($sched != "PRIQ") {
 			if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-				$q = new hfsc_queue();
+				$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qInternet";
 			//$tmpcf['priority'] = 6;
@@ -1275,11 +1275,11 @@ function apply_all_choosen_items() {
 		}
 
 			if ($sched == "PRIQ")
-				$q = new priq_queue();
+				$q =& new priq_queue();
 			else if ($sched == "CBQ")
-				$q = new cbq_queue();
+				$q =& new cbq_queue();
 			else if ($sched == "HFSC")
-			$q = new hfsc_queue();
+			$q =& new hfsc_queue();
 			$tmpcf = array();
 			$tmpcf['name'] = "qACK";
 			$tmpcf['priority'] = 6;
@@ -1306,11 +1306,11 @@ function apply_all_choosen_items() {
 
 			if ($p2p) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qP2P";
 				$tmpcf['priority'] = 1;
@@ -1356,11 +1356,11 @@ function apply_all_choosen_items() {
 
 			if ($voip) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qVoIP";
 				$tmpcf['priority'] = 7;
@@ -1396,11 +1396,11 @@ function apply_all_choosen_items() {
 
 			if ($games) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qGames";
 				$tmpcf['priority'] = 5;
@@ -1427,11 +1427,11 @@ function apply_all_choosen_items() {
 
 			if ($otherpriority) {
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersHigh";
 				$tmpcf['priority'] = 4;
@@ -1457,11 +1457,11 @@ function apply_all_choosen_items() {
 
 
 				if ($sched == "PRIQ")
-					$q = new priq_queue();
+					$q =& new priq_queue();
 				else if ($sched == "CBQ")
-					$q = new cbq_queue();
+					$q =& new cbq_queue();
 				else if ($sched == "HFSC")
-					$q = new hfsc_queue();
+					$q =& new hfsc_queue();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersLow";
 				$tmpcf['priority'] = 3;